Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] radicale: update to 3.0.6
@ 2020-09-16 17:11 teldra
  2020-09-16 17:13 ` [PR PATCH] [Updated] " teldra
                   ` (16 more replies)
  0 siblings, 17 replies; 18+ messages in thread
From: teldra @ 2020-09-16 17:11 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 478 bytes --]

There is a new pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8352 bytes --]

From b9627858eb18c25bd73abcce2a5673a40fd574f8 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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             | 21 ++++++-----
 srcpkgs/radicale/files/radicale/run      |  2 +-
 srcpkgs/radicale/template                | 44 ++++++++++++++++--------
 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 -
 9 files changed, 44 insertions(+), 70 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..998ef10517b 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,20 +1,23 @@
-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")
 - 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
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..67cccff69d9 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
+# Template file for 'radicale3'
+pkgname=radicale3
+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 <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"
-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"
+ /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/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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
@ 2020-09-16 17:13 ` teldra
  2020-09-16 17:15 ` teldra
                   ` (15 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-16 17:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8639 bytes --]

From dc2d869d15ef88eac81e54e1874325898e274d4c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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             | 21 ++++++-----
 srcpkgs/radicale/files/radicale/run      |  2 +-
 srcpkgs/radicale/template                | 44 ++++++++++++++++--------
 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, 44 insertions(+), 71 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..998ef10517b 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,20 +1,23 @@
-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")
 - 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
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..67cccff69d9 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
+# Template file for 'radicale3'
+pkgname=radicale3
+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 <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"
-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"
+ /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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
  2020-09-16 17:13 ` [PR PATCH] [Updated] " teldra
@ 2020-09-16 17:15 ` teldra
  2020-09-16 18:08 ` teldra
                   ` (14 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-16 17:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8591 bytes --]

From 5890e440cca1d8a03e4f0a9f19c7c599e6254ba8 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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             | 21 +++++++------
 srcpkgs/radicale/files/radicale/run      |  2 +-
 srcpkgs/radicale/template                | 40 +++++++++++++++++-------
 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, 42 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..998ef10517b 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,20 +1,23 @@
-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")
 - 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
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..7a93f658c0c 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 <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"
-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"
+ /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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
  2020-09-16 17:13 ` [PR PATCH] [Updated] " teldra
  2020-09-16 17:15 ` teldra
@ 2020-09-16 18:08 ` teldra
  2020-09-16 19:01 ` teldra
                   ` (13 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-16 18:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8775 bytes --]

From 841eee423a03a4f01e0611b90f1fd11d859486e0 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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 <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"
-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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (2 preceding siblings ...)
  2020-09-16 18:08 ` teldra
@ 2020-09-16 19:01 ` teldra
  2020-09-17  7:08 ` teldra
                   ` (12 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-16 19:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8775 bytes --]

From a877b90536856276f26d89cca6e8e41bba3f048c Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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 <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"
-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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (3 preceding siblings ...)
  2020-09-16 19:01 ` teldra
@ 2020-09-17  7:08 ` teldra
  2020-09-17 14:19 ` [PR REVIEW] " ahesford
                   ` (11 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17  7:08 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8808 bytes --]

From 56d6ecc52d632a0109d5fa9ec6cf67da017d8cad Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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                | 43 +++++++++++++++++-------
 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, 47 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..74c21ea539e 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,34 +1,51 @@
 # 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 <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"
-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"
+_radicale_descr="Radicale user"
+
+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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (4 preceding siblings ...)
  2020-09-17  7:08 ` teldra
@ 2020-09-17 14:19 ` ahesford
  2020-09-17 14:20 ` ahesford
                   ` (10 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2020-09-17 14:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 196 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490274771

Comment:
`depends="${sourcepkg}>=${version}_${revision}"`

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (5 preceding siblings ...)
  2020-09-17 14:19 ` [PR REVIEW] " ahesford
@ 2020-09-17 14:20 ` ahesford
  2020-09-17 14:20 ` ahesford
                   ` (9 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2020-09-17 14:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490276692

Comment:
Does the setup actually modify this file? If not, just `vinstall /dev/null 640 etc/radicale users` in `post_install`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (6 preceding siblings ...)
  2020-09-17 14:20 ` ahesford
@ 2020-09-17 14:20 ` ahesford
  2020-09-17 14:20 ` ahesford
                   ` (8 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2020-09-17 14:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490280182

Comment:
If you have a compelling reason to use the `_radicale` user (see my objection to that), the user in this line would be wrong.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (7 preceding siblings ...)
  2020-09-17 14:20 ` ahesford
@ 2020-09-17 14:20 ` ahesford
  2020-09-17 15:33 ` [PR PATCH] [Updated] " teldra
                   ` (7 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2020-09-17 14:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 367 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490279294

Comment:
There is no real utility in changing the system account. Users of the earlier `radicale` and `radicale2` packages will already have a `radicale` system account; this would pollute the account database and sow confusion.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (8 preceding siblings ...)
  2020-09-17 14:20 ` ahesford
@ 2020-09-17 15:33 ` teldra
  2020-09-17 15:34 ` teldra
                   ` (6 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17 15:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8174 bytes --]

From 612dea50f0466d8fda4e18c065d475bfbe6a1bf9 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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             | 24 +++------------
 srcpkgs/radicale/files/radicale/run      |  2 +-
 srcpkgs/radicale/template                | 37 +++++++++++++++++-------
 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, 33 insertions(+), 78 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..2542bdb3378 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,20 +1,4 @@
-You are installing the legacy version of radicale (1.x)!
-Please install the radicale2 package for the latest (2.x) version.
-
-If you need to migrate data, take the following steps:
-
-- 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
+CAUTION: Radicale 3.x is not backwards compatible with Radicale 1.x.
+If you are upgrading from Radicale 1.x, please consult upstream
+documentation for information about migrating existing data to the
+format used by this version.
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..2188af56b55 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,22 +1,25 @@
 # 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 <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"
-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
@@ -25,10 +28,24 @@ make_dirs="
  /var/lib/radicale 750 radicale radicale"
 system_accounts="radicale"
 radicale_homedir="/var/lib/radicale"
+radicale_descr="Radicale user"
+
+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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (9 preceding siblings ...)
  2020-09-17 15:33 ` [PR PATCH] [Updated] " teldra
@ 2020-09-17 15:34 ` teldra
  2020-09-17 15:34 ` [PR REVIEW] " teldra
                   ` (5 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17 15:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8202 bytes --]

From 6475cd382762304990042f2cf718b72dc9f1dc35 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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             | 24 +++------------
 srcpkgs/radicale/files/radicale/run      |  2 +-
 srcpkgs/radicale/template                | 37 +++++++++++++++++-------
 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, 33 insertions(+), 78 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..2542bdb3378 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,20 +1,4 @@
-You are installing the legacy version of radicale (1.x)!
-Please install the radicale2 package for the latest (2.x) version.
-
-If you need to migrate data, take the following steps:
-
-- 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
+CAUTION: Radicale 3.x is not backwards compatible with Radicale 1.x.
+If you are upgrading from Radicale 1.x, please consult upstream
+documentation for information about migrating existing data to the
+format used by this version.
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..f0e42721ae3 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,22 +1,25 @@
 # 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 <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"
-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
@@ -25,10 +28,24 @@ make_dirs="
  /var/lib/radicale 750 radicale radicale"
 system_accounts="radicale"
 radicale_homedir="/var/lib/radicale"
+radicale_descr="Radicale user"
+
+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="${sourcepkg}>=${version}_${revision}"
+	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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (10 preceding siblings ...)
  2020-09-17 15:34 ` teldra
@ 2020-09-17 15:34 ` teldra
  2020-09-17 15:36 ` teldra
                   ` (4 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17 15:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 150 bytes --]

New review comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490348053

Comment:
Done

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (11 preceding siblings ...)
  2020-09-17 15:34 ` [PR REVIEW] " teldra
@ 2020-09-17 15:36 ` teldra
  2020-09-17 15:37 ` teldra
                   ` (3 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17 15:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

New review comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490349590

Comment:
I made the proposal to unify the naming of systemaccounts. I stay with `radicale`.

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (12 preceding siblings ...)
  2020-09-17 15:36 ` teldra
@ 2020-09-17 15:37 ` teldra
  2020-09-17 15:38 ` teldra
                   ` (2 subsequent siblings)
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17 15:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New review comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490350093

Comment:
Now its correct. :)

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR REVIEW] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (13 preceding siblings ...)
  2020-09-17 15:37 ` teldra
@ 2020-09-17 15:38 ` teldra
  2020-09-17 15:38 ` [PR PATCH] [Updated] " teldra
  2020-09-17 17:54 ` [PR PATCH] [Closed]: " ahesford
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17 15:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

New review comment by teldra on void-packages repository

https://github.com/void-linux/void-packages/pull/24945#discussion_r490350726

Comment:
Ah, neat idea!

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Updated] radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (14 preceding siblings ...)
  2020-09-17 15:38 ` teldra
@ 2020-09-17 15:38 ` teldra
  2020-09-17 17:54 ` [PR PATCH] [Closed]: " ahesford
  16 siblings, 0 replies; 18+ messages in thread
From: teldra @ 2020-09-17 15:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages radicale-update
https://github.com/void-linux/void-packages/pull/24945

radicale: update to 3.0.6
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

A patch file from https://github.com/void-linux/void-packages/pull/24945.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-update-24945.patch --]
[-- Type: text/x-diff, Size: 8174 bytes --]

From 62011c4e4b5dcc13d8b5e1b76b98dfdeb9e5c8a2 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
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             | 24 +++-------------
 srcpkgs/radicale/files/radicale/run      |  2 +-
 srcpkgs/radicale/template                | 33 +++++++++++++++-------
 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, 29 insertions(+), 78 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..2542bdb3378 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,20 +1,4 @@
-You are installing the legacy version of radicale (1.x)!
-Please install the radicale2 package for the latest (2.x) version.
-
-If you need to migrate data, take the following steps:
-
-- 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
+CAUTION: Radicale 3.x is not backwards compatible with Radicale 1.x.
+If you are upgrading from Radicale 1.x, please consult upstream
+documentation for information about migrating existing data to the
+format used by this version.
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..200d4fdfdff 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,22 +1,25 @@
 # 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 <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"
-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
@@ -25,10 +28,20 @@ make_dirs="
  /var/lib/radicale 750 radicale radicale"
 system_accounts="radicale"
 radicale_homedir="/var/lib/radicale"
+radicale_descr="Radicale user"
 
 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
 }
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:
-<https://radicale.org/1to2/>
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 <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
-}
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].*"

^ permalink raw reply	[flat|nested] 18+ messages in thread

* Re: [PR PATCH] [Closed]: radicale: update to 3.0.6
  2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
                   ` (15 preceding siblings ...)
  2020-09-17 15:38 ` [PR PATCH] [Updated] " teldra
@ 2020-09-17 17:54 ` ahesford
  16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2020-09-17 17:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

There's a closed pull request on the void-packages repository

radicale: update to 3.0.6
https://github.com/void-linux/void-packages/pull/24945

Description:
create transitional dummy for radicale2
only etesync-dav needs to be updated in this pr if this is merged: https://github.com/void-linux/void-packages/pull/23908

^ permalink raw reply	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2020-09-17 17:54 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-16 17:11 [PR PATCH] radicale: update to 3.0.6 teldra
2020-09-16 17:13 ` [PR PATCH] [Updated] " teldra
2020-09-16 17:15 ` teldra
2020-09-16 18:08 ` teldra
2020-09-16 19:01 ` teldra
2020-09-17  7:08 ` teldra
2020-09-17 14:19 ` [PR REVIEW] " ahesford
2020-09-17 14:20 ` ahesford
2020-09-17 14:20 ` ahesford
2020-09-17 14:20 ` ahesford
2020-09-17 15:33 ` [PR PATCH] [Updated] " teldra
2020-09-17 15:34 ` teldra
2020-09-17 15:34 ` [PR REVIEW] " teldra
2020-09-17 15:36 ` teldra
2020-09-17 15:37 ` teldra
2020-09-17 15:38 ` teldra
2020-09-17 15:38 ` [PR PATCH] [Updated] " teldra
2020-09-17 17:54 ` [PR PATCH] [Closed]: " ahesford

Github messages for voidlinux

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://inbox.vuxu.org/voidlinux-github

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V1 voidlinux-github voidlinux-github/ http://inbox.vuxu.org/voidlinux-github \
		voidlinux-github@inbox.vuxu.org
	public-inbox-index voidlinux-github

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.vuxu.org/vuxu.github.voidlinux


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git