From 074839e6e856db2fedc6aae0866dff732baab60f Mon Sep 17 00:00:00 2001 From: projectmoon Date: Thu, 11 Jun 2020 19:35:56 +0000 Subject: [PATCH 1/2] radicale: update to 3.0.3. --- srcpkgs/radicale/INSTALL.msg | 12 ++++++-- srcpkgs/radicale/template | 24 ++++++++++------ 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 - 8 files changed, 26 insertions(+), 57 deletions(-) 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..74c5e939201 100644 --- a/srcpkgs/radicale/INSTALL.msg +++ b/srcpkgs/radicale/INSTALL.msg @@ -1,7 +1,13 @@ -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, and the radicale2 package +is now a transitional package that points to the main radicale 3.x +package. To remove radicale2 and transition to the radicale package: -If you need to migrate data, take the following steps: + xbps-pkgdb -m manual radicale + xbps-remove radicale2 + +Migration from version 1.x to 2.x and beyond is not backwards +compatible. Migration of data from 2.x to 3.x is not necessary. If you +need to migrate data from 1.x to 2.x, take the following steps: - Disable the radicale 1.x service ("radicale") - Back up the radicale 1.x collections currently in /var/lib/radicale diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index 5cf0cc8da0d..1cde24dfc1c 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -1,20 +1,21 @@ # Template file for 'radicale' pkgname=radicale -version=1.1.6 -revision=4 +version=3.0.3 +revision=1 archs=noarch 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="projectmoon " license="GPL-3.0-or-later" homepage="https://radicale.org" -distfiles="${PYPI_SITE}/R/Radicale/Radicale-${version}.tar.gz" -checksum=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b - +distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz" +checksum=9e22273dda13938b44e0555a96f63e0491e42c1e58a290864ecae1181580be8c +provides="radicale-${version}_${revision}" conf_files=" /etc/radicale/config /etc/sv/radicale/log/run" @@ -28,7 +29,14 @@ radicale_homedir="/var/lib/radicale" post_install() { vinstall config 644 etc/radicale/ + vinstall config 644 usr/share/examples/radicale vinstall radicale.fcgi 644 usr/share/radicale vinstall radicale.wsgi 644 usr/share/radicale vsv radicale } + +radicale2_package() { + depends="radicale" + short_desc+=" (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/radicale2 b/srcpkgs/radicale2 new file mode 120000 index 00000000000..984860429f2 --- /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].*" From 09d3d0c3942fff5444a1ce00825d5146ae383fd2 Mon Sep 17 00:00:00 2001 From: projectmoon Date: Wed, 10 Jun 2020 19:42:55 +0000 Subject: [PATCH 2/2] etesync-dav: update to 0.20.0. --- srcpkgs/etesync-dav/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template index 932c54e3e53..62c060f956a 100644 --- a/srcpkgs/etesync-dav/template +++ b/srcpkgs/etesync-dav/template @@ -1,19 +1,19 @@ # Template file for 'etesync-dav' pkgname=etesync-dav -version=0.17.1 +version=0.20.0 revision=1 archs=noarch wrksrc="etesync-dav-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-etesync radicale2 python3-Flask python3-Flask-WTF" +depends="python3-etesync radicale python3-Flask python3-Flask-WTF" checkdepends="$depends python3-pytest" short_desc="CalDAV and CardDAV frontend for EteSync" maintainer="projectmoon " license="GPL-3.0-only" homepage="http://www.etesync.com" distfiles="${PYPI_SITE}/e/etesync-dav/etesync-dav-${version}.tar.gz" -checksum=2d7018e3a0af8c203671eed4098f970d629876d17b235d434a595a5056aa7972 +checksum=50b9a493aca5d4a514673e271d4f99e52b085464cb96172cbc7d9288614210e1 do_check() { pytest3