radicale: update to 3.0.6

create transitional dummy for radicale2

Closes: #24945 [via git-merge-pr]

srcpkgs/radicale/INSTALL.msg

@@ -1,20 +1,4 @@
-You are installing the legacy version of radicale (1.x)!
+CAUTION: Radicale 3.x is not backwards compatible with Radicale 1.x.
-Please install the radicale2 package for the latest (2.x) version.
+If you are upgrading from Radicale 1.x, please consult upstream
-
+documentation for information about migrating existing data to the
-If you need to migrate data, take the following steps:
+format used by this version.
-
-- Disable the radicale 1.x service ("radicale")
-- Back up the radicale 1.x collections currently in /var/lib/radicale
-- Remove the old collections so they do not conflict with radicale 2.x
-- Export the backup radicale 1.x collections in the 2.x format to /var/lib/radicale
-  (see the radicale 1.x --export-storage CLI argument)
-- Remove the radicale 1.x package ("radicale")
-- Install radicale 2.x package ("radicale2")
-- Enable the radicale 2.x service ("radicale")
-- Confirm that the radicale 2.x service is functioning correctly and reliably
-- Remove the backup radicale 1.x collections
-
-Consider using the following resources for further guidance:
-
-- Official radicale migration guide: https://radicale.org/1to2/.
-- Void Linux Handbook, "Managing Services" section: https://docs.voidlinux.org/config/services/managing.html

srcpkgs/radicale/files/radicale/run

@@ -1,3 +1,3 @@
 #!/bin/sh
 exec 2>&1
-exec chpst -u radicale radicale -f -C /etc/radicale/config
+exec chpst -u radicale radicale -C /etc/radicale/config

srcpkgs/radicale/template

@@ -1,22 +1,24 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=1.1.6
+version=3.0.6
-revision=4
+revision=1
-archs=noarch
 wrksrc="Radicale-${version}"
 build_style=python3-module
-pycompile_module="radicale"
+hostmakedepends="python3-setuptools"
-hostmakedepends="python3 python3-setuptools"
+depends="python3-pam python3-requests python3-dulwich python3-vobject
-depends="python3-pam python3-requests python3-dulwich"
+ python3-dateutil python3-passlib python3-bcrypt python3-defusedxml
+ apache-htpasswd"
 short_desc="Complete calendar and contact storing and manipulating solution"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
+maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-or-later"
 homepage="https://radicale.org"
-distfiles="${PYPI_SITE}/R/Radicale/Radicale-${version}.tar.gz"
+changelog="https://github.com/Kozea/Radicale/blob/${version}/NEWS.md"
-checksum=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b
+distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz"
-
+checksum=69cfbcc66f8dc13fb82c82ed9561a9aad30462a6bb09b45a64ad39401bf61b98
 conf_files="
  /etc/radicale/config
+ /etc/radicale/rights
+ /etc/radicale/users
  /etc/sv/radicale/log/run"
 make_dirs="
  /etc/radicale 755 root root
@@ -25,10 +27,21 @@ make_dirs="
  /var/lib/radicale 750 radicale radicale"
 system_accounts="radicale"
 radicale_homedir="/var/lib/radicale"
+radicale_descr="Radicale user"
+replaces="radicale2<3.0.6"
 
 post_install() {
 	vinstall config 644 etc/radicale/
-	vinstall radicale.fcgi 644 usr/share/radicale
+	vinstall rights 640 etc/radicale/
+	vinstall /dev/null 640 etc/radicale users
+	vinstall config 644 usr/share/examples/radicale
 	vinstall radicale.wsgi 644 usr/share/radicale
 	vsv radicale
+	vdoc README.md
+}
+
+radicale2_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
 }

srcpkgs/radicale/update

@@ -1 +0,0 @@
-ignore="[2].*"

srcpkgs/radicale2

@@ -0,0 +1 @@
+radicale

srcpkgs/radicale2/INSTALL.msg

@@ -1,4 +0,0 @@
-You are installing the 2.x version of radicale.
-If you need to migrate data, use the radicale 1.x package.
-For more information, refer to the official radicale migration guide:
-<https://radicale.org/1to2/>

srcpkgs/radicale2/files/radicale/log/run

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec svlogd /var/log/radicale

srcpkgs/radicale2/files/radicale/run

@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec chpst -u radicale radicale -f -C /etc/radicale/config

srcpkgs/radicale2/template

@@ -1,36 +0,0 @@
-# Template file for 'radicale2'
-pkgname=radicale2
-version=2.1.12
-revision=1
-archs=noarch
-wrksrc="Radicale-${version}"
-build_style=python3-module
-hostmakedepends="python3 python3-setuptools"
-depends="python3-pam python3-requests python3-dulwich python3-vobject
- python3-dateutil python3-passlib python3-bcrypt apache-htpasswd"
-# added passlib and bcrypt, since its seems to be the safest option.
-short_desc="Complete calendar and contact storing and manipulating solution"
-maintainer="teldra <teldra@rotce.de>"
-license="GPL-3.0-or-later"
-homepage="https://radicale.org"
-distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz"
-checksum=ddba493443434de499f28818758cba92320362986dba852dc2c10c6daa5d20e1
-conflicts="radicale"
-provides="radicale-${version}_${revision}"
-conf_files="
- /etc/radicale/config
- /etc/sv/radicale/log/run"
-make_dirs="
- /etc/radicale 755 root root
- /usr/share/radicale/ 755 root root
- /var/log/radicale/ 700 root root
- /var/lib/radicale 750 radicale radicale"
-system_accounts="radicale"
-radicale_homedir="/var/lib/radicale"
-
-post_install() {
-	vinstall config 644 etc/radicale/
-	vinstall radicale.fcgi 644 usr/share/radicale
-	vinstall radicale.wsgi 644 usr/share/radicale
-	vsv radicale
-}

srcpkgs/radicale2/update

@@ -1 +0,0 @@
-ignore="[3].*"