From a877b90536856276f26d89cca6e8e41bba3f048c Mon Sep 17 00:00:00 2001 From: teldra Date: Wed, 16 Sep 2020 18:54:25 +0200 Subject: [PATCH] radicale: update to 3.0.6 create transitional dummy for radicale2 only etesync-dav needs to be updated in this pr: https://github.com/void-linux/void-packages/pull/23908 --- srcpkgs/radicale/INSTALL.msg | 23 ++++++++----- srcpkgs/radicale/files/radicale/run | 2 +- srcpkgs/radicale/template | 42 ++++++++++++++++-------- srcpkgs/radicale/update | 1 - srcpkgs/radicale2 | 1 + srcpkgs/radicale2/INSTALL.msg | 4 --- srcpkgs/radicale2/files/radicale/log/run | 2 -- srcpkgs/radicale2/files/radicale/run | 3 -- srcpkgs/radicale2/template | 36 -------------------- srcpkgs/radicale2/update | 1 - 10 files changed, 46 insertions(+), 69 deletions(-) delete mode 100644 srcpkgs/radicale/update create mode 120000 srcpkgs/radicale2 delete mode 100644 srcpkgs/radicale2/INSTALL.msg delete mode 100755 srcpkgs/radicale2/files/radicale/log/run delete mode 100755 srcpkgs/radicale2/files/radicale/run delete mode 100644 srcpkgs/radicale2/template delete mode 100644 srcpkgs/radicale2/update diff --git a/srcpkgs/radicale/INSTALL.msg b/srcpkgs/radicale/INSTALL.msg index 260d1bb0b69..026bfe21d44 100644 --- a/srcpkgs/radicale/INSTALL.msg +++ b/srcpkgs/radicale/INSTALL.msg @@ -1,12 +1,20 @@ -You are installing the legacy version of radicale (1.x)! -Please install the radicale2 package for the latest (2.x) version. +radicale has been upgraded from 1.x to 3.x. +The radicale2 package is now a transitional package that points to radicale. -If you need to migrate data, take the following steps: +To remove radicale2 and transition to the radicale package: +- xbps-pkgdb -m manual radicale +- xbps-remove radicale2 +Migration of data from 2.x to 3.x is not necessary. +Perhaps configurationfile must be adapted: +https://github.com/Kozea/Radicale/blob/master/NEWS.md#upgrade-checklist + +Migration from version 1.x to 2.x and beyond is not backwards +compatible: - 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 +- Export 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") @@ -14,7 +22,6 @@ If you need to migrate data, take the following steps: - 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 +Because systemuser radicale changed to _radicale: +- chown -R _radicale:_radicale /var/lib/radicale +- userdel radicale diff --git a/srcpkgs/radicale/files/radicale/run b/srcpkgs/radicale/files/radicale/run index 0d44004cc10..ab664721091 100755 --- a/srcpkgs/radicale/files/radicale/run +++ b/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 diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index 5cf0cc8da0d..f32c4ac20eb 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -1,34 +1,50 @@ # Template file for 'radicale' pkgname=radicale -version=1.1.6 -revision=4 -archs=noarch +version=3.0.6 +revision=1 wrksrc="Radicale-${version}" build_style=python3-module -pycompile_module="radicale" hostmakedepends="python3 python3-setuptools" -depends="python3-pam python3-requests python3-dulwich" +depends="python3-pam python3-requests python3-dulwich python3-vobject + python3-dateutil python3-passlib python3-bcrypt python3-defusedxml + apache-htpasswd" short_desc="Complete calendar and contact storing and manipulating solution" -maintainer="lemmi " +maintainer="teldra " license="GPL-3.0-or-later" homepage="https://radicale.org" -distfiles="${PYPI_SITE}/R/Radicale/Radicale-${version}.tar.gz" -checksum=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b - +changelog="https://github.com/Kozea/Radicale/blob/${version}/NEWS.md" +distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz" +checksum=69cfbcc66f8dc13fb82c82ed9561a9aad30462a6bb09b45a64ad39401bf61b98 +provides="radicale-${version}_${revision}" conf_files=" /etc/radicale/config + /etc/radicale/rights + /etc/radicale/users /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" + /var/lib/radicale 750 _radicale _radicale" +system_accounts="_radicale" +_radicale_homedir="/var/lib/radicale" + +post_extract() { + touch users +} post_install() { vinstall config 644 etc/radicale/ - vinstall radicale.fcgi 644 usr/share/radicale + vinstall rights 640 etc/radicale/ + vinstall users 640 etc/radicale/ + vinstall config 644 usr/share/examples/radicale vinstall radicale.wsgi 644 usr/share/radicale vsv radicale + vdoc README.md +} + +radicale2_package() { + depends="radicale" + short_desc+=" (transitional dummy package)" + build_style=meta } diff --git a/srcpkgs/radicale/update b/srcpkgs/radicale/update deleted file mode 100644 index 8a7a9c8cf00..00000000000 --- a/srcpkgs/radicale/update +++ /dev/null @@ -1 +0,0 @@ -ignore="[2].*" diff --git a/srcpkgs/radicale2 b/srcpkgs/radicale2 new file mode 120000 index 00000000000..d5d747a4563 --- /dev/null +++ b/srcpkgs/radicale2 @@ -0,0 +1 @@ +radicale \ No newline at end of file diff --git a/srcpkgs/radicale2/INSTALL.msg b/srcpkgs/radicale2/INSTALL.msg deleted file mode 100644 index a1752ab1d4c..00000000000 --- a/srcpkgs/radicale2/INSTALL.msg +++ /dev/null @@ -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: - diff --git a/srcpkgs/radicale2/files/radicale/log/run b/srcpkgs/radicale2/files/radicale/log/run deleted file mode 100755 index 37284378a05..00000000000 --- a/srcpkgs/radicale2/files/radicale/log/run +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec svlogd /var/log/radicale diff --git a/srcpkgs/radicale2/files/radicale/run b/srcpkgs/radicale2/files/radicale/run deleted file mode 100755 index 0d44004cc10..00000000000 --- a/srcpkgs/radicale2/files/radicale/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -exec 2>&1 -exec chpst -u radicale radicale -f -C /etc/radicale/config diff --git a/srcpkgs/radicale2/template b/srcpkgs/radicale2/template deleted file mode 100644 index 6fd785c5484..00000000000 --- a/srcpkgs/radicale2/template +++ /dev/null @@ -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 " -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 -} diff --git a/srcpkgs/radicale2/update b/srcpkgs/radicale2/update deleted file mode 100644 index 1548362f526..00000000000 --- a/srcpkgs/radicale2/update +++ /dev/null @@ -1 +0,0 @@ -ignore="[3].*"