Re: etesync-dav upgrade to 0.18.1, new package radicale3

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-653758623

Comment:
Rebased to the latest master.

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[Piraty]

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

New comment by Piraty on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-653922601

Comment:
I am not sure about how the `conflicts=` logic works.
* does the mechanism require all packages to explicitly list all of the others in order to work correctly (@Duncaen ?)
* in that case, you should revbump the old packages so the binary packages are updated

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-654283072

Comment:
It might make sense to revbump yes. It's definitely safer if nothing else.

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[CameronNemo]

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-660387231

Comment:
Why keep radicale2? The only reason we kept radicale 1 was so that old data could be migrated to version 2.

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[CameronNemo]

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-660387231

Comment:
Why keep radicale2? The only reason we kept radicale 1 was so that old data could be migrated to version 2. But version 3 only changes a few config keys, it does not change the data format.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[CameronNemo]

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

New review comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r456720943

Comment:
Not sure what the point of this message is, would suggest getting rid of it.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New review comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r456771648

Comment:
It was copied from the radicale 2 template :D

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New review comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r456773343

Comment:
Also, radicale3 does make some backwads incompatible changes from radicale2, otherwise I wouldn't be packaging it here. So both probably need to be kept.

Re: [PR PATCH] [Updated] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/22810

etesync-dav upgrade to 0.18.1, new package radicale3
This upgrades etesync-dav to 0.18.1, which requires radicale 3.x. So there's also a commit adding radicale3, and making it conflict with radicale and radicale2.

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

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

From 4be677d75e7078c91e12c8370e1e7416b6545ca3 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Thu, 11 Jun 2020 19:35:56 +0000
Subject: [PATCH 1/2] New package: radicale3-3.0.3

---
 srcpkgs/radicale/INSTALL.msg                  | 12 ++++++---
 srcpkgs/radicale/template                     | 25 +++++++++++++------
 srcpkgs/radicale2                             |  1 +
 srcpkgs/radicale2/INSTALL.msg                 |  4 ---
 srcpkgs/radicale2/files/radicale/run          |  3 ---
 srcpkgs/radicale3/INSTALL.msg                 |  1 +
 .../files/radicale/log/run                    |  0
 srcpkgs/radicale3/files/radicale/run          |  3 +++
 srcpkgs/{radicale2 => radicale3}/template     | 16 ++++++------
 srcpkgs/{radicale2 => radicale3}/update       |  0
 10 files changed, 39 insertions(+), 26 deletions(-)
 create mode 120000 srcpkgs/radicale2
 delete mode 100644 srcpkgs/radicale2/INSTALL.msg
 delete mode 100755 srcpkgs/radicale2/files/radicale/run
 create mode 100644 srcpkgs/radicale3/INSTALL.msg
 rename srcpkgs/{radicale2 => radicale3}/files/radicale/log/run (100%)
 create mode 100755 srcpkgs/radicale3/files/radicale/run
 rename srcpkgs/{radicale2 => radicale3}/template (72%)
 rename srcpkgs/{radicale2 => radicale3}/update (100%)

diff --git a/srcpkgs/radicale/INSTALL.msg b/srcpkgs/radicale/INSTALL.msg
index 260d1bb0b69..74c5e939201 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,7 +1,13 @@
-You are installing the legacy version of radicale (1.x)!
-Please install the radicale2 package for the latest (2.x) version.
+radicale has been upgraded from 1.x to 3.x, and the radicale2 package
+is now a transitional package that points to the main radicale 3.x
+package. To remove radicale2 and transition to the radicale package:
 
-If you need to migrate data, take the following steps:
+    xbps-pkgdb -m manual radicale
+    xbps-remove radicale2
+
+Migration from version 1.x to 2.x and beyond is not backwards
+compatible. Migration of data from 2.x to 3.x is not necessary. If you
+need to migrate data from 1.x to 2.x, take the following steps:
 
 - Disable the radicale 1.x service ("radicale")
 - Back up the radicale 1.x collections currently in /var/lib/radicale
diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 5cf0cc8da0d..b88a879bf5a 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,26 +1,28 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=1.1.6
-revision=4
+version=3.0.3
+revision=1
 archs=noarch
 wrksrc="Radicale-${version}"
 build_style=python3-module
-pycompile_module="radicale"
 hostmakedepends="python3 python3-setuptools"
-depends="python3-pam python3-requests python3-dulwich"
+depends="python3-pam python3-requests python3-dulwich python3-vobject
+ python3-dateutil python3-passlib python3-bcrypt python3-defusedxml
+ apache-htpasswd"
 short_desc="Complete calendar and contact storing and manipulating solution"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="GPL-3.0-or-later"
 homepage="https://radicale.org"
-distfiles="${PYPI_SITE}/R/Radicale/Radicale-${version}.tar.gz"
-checksum=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b
-
+distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz"
+checksum=9e22273dda13938b44e0555a96f63e0491e42c1e58a290864ecae1181580be8c
+provides="radicale-${version}_${revision}"
 conf_files="
  /etc/radicale/config
  /etc/sv/radicale/log/run"
 make_dirs="
  /etc/radicale 755 root root
  /usr/share/radicale/ 755 root root
+ /usr/share/examples/radicale/ 755 root root
  /var/log/radicale/ 700 root root
  /var/lib/radicale 750 radicale radicale"
 system_accounts="radicale"
@@ -28,7 +30,14 @@ radicale_homedir="/var/lib/radicale"
 
 post_install() {
 	vinstall config 644 etc/radicale/
+	vinstall config 644 usr/share/examples/radicale
 	vinstall radicale.fcgi 644 usr/share/radicale
 	vinstall radicale.wsgi 644 usr/share/radicale
 	vsv radicale
 }
+
+radicale2_package() {
+	depends="radicale"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/radicale2 b/srcpkgs/radicale2
new file mode 120000
index 00000000000..984860429f2
--- /dev/null
+++ b/srcpkgs/radicale2
@@ -0,0 +1 @@
+./radicale
\ No newline at end of file
diff --git a/srcpkgs/radicale2/INSTALL.msg b/srcpkgs/radicale2/INSTALL.msg
deleted file mode 100644
index a1752ab1d4c..00000000000
--- a/srcpkgs/radicale2/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-You are installing the 2.x version of radicale.
-If you need to migrate data, use the radicale 1.x package.
-For more information, refer to the official radicale migration guide:
-<https://radicale.org/1to2/>
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/radicale3/INSTALL.msg b/srcpkgs/radicale3/INSTALL.msg
new file mode 100644
index 00000000000..6dc666e20cc
--- /dev/null
+++ b/srcpkgs/radicale3/INSTALL.msg
@@ -0,0 +1 @@
+You are installing the 3.x version of radicale.
diff --git a/srcpkgs/radicale2/files/radicale/log/run b/srcpkgs/radicale3/files/radicale/log/run
similarity index 100%
rename from srcpkgs/radicale2/files/radicale/log/run
rename to srcpkgs/radicale3/files/radicale/log/run
diff --git a/srcpkgs/radicale3/files/radicale/run b/srcpkgs/radicale3/files/radicale/run
new file mode 100755
index 00000000000..ab664721091
--- /dev/null
+++ b/srcpkgs/radicale3/files/radicale/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec chpst -u radicale radicale -C /etc/radicale/config
diff --git a/srcpkgs/radicale2/template b/srcpkgs/radicale3/template
similarity index 72%
rename from srcpkgs/radicale2/template
rename to srcpkgs/radicale3/template
index 6fd785c5484..61db88588c7 100644
--- a/srcpkgs/radicale2/template
+++ b/srcpkgs/radicale3/template
@@ -1,21 +1,21 @@
-# Template file for 'radicale2'
-pkgname=radicale2
-version=2.1.12
+# Template file for 'radicale3'
+pkgname=radicale3
+version=3.0.3
 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.
+ python3-dateutil python3-passlib python3-bcrypt python3-defusedxml
+ apache-htpasswd"
 short_desc="Complete calendar and contact storing and manipulating solution"
-maintainer="teldra <teldra@rotce.de>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="GPL-3.0-or-later"
 homepage="https://radicale.org"
 distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz"
-checksum=ddba493443434de499f28818758cba92320362986dba852dc2c10c6daa5d20e1
-conflicts="radicale"
+checksum=9e22273dda13938b44e0555a96f63e0491e42c1e58a290864ecae1181580be8c
+conflicts="radicale radicale2"
 provides="radicale-${version}_${revision}"
 conf_files="
  /etc/radicale/config
diff --git a/srcpkgs/radicale2/update b/srcpkgs/radicale3/update
similarity index 100%
rename from srcpkgs/radicale2/update
rename to srcpkgs/radicale3/update

From 1ac95781a2959e7914ea09ed157607ee83854d7f Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Wed, 10 Jun 2020 19:42:55 +0000
Subject: [PATCH 2/2] etesync-dav: update to 0.20.0.

---
 srcpkgs/etesync-dav/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template
index 932c54e3e53..62c060f956a 100644
--- a/srcpkgs/etesync-dav/template
+++ b/srcpkgs/etesync-dav/template
@@ -1,19 +1,19 @@
 # Template file for 'etesync-dav'
 pkgname=etesync-dav
-version=0.17.1
+version=0.20.0
 revision=1
 archs=noarch
 wrksrc="etesync-dav-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-etesync radicale2 python3-Flask python3-Flask-WTF"
+depends="python3-etesync radicale python3-Flask python3-Flask-WTF"
 checkdepends="$depends python3-pytest"
 short_desc="CalDAV and CardDAV frontend for EteSync"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="GPL-3.0-only"
 homepage="http://www.etesync.com"
 distfiles="${PYPI_SITE}/e/etesync-dav/etesync-dav-${version}.tar.gz"
-checksum=2d7018e3a0af8c203671eed4098f970d629876d17b235d434a595a5056aa7972
+checksum=50b9a493aca5d4a514673e271d4f99e52b085464cb96172cbc7d9288614210e1
 
 do_check() {
 	pytest3

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-662682603

Comment:
Some rather major changes to this PR, based on the suggestions of @ahesford: 
 
* The `radicale3` package was removed, and instead the `radicale` package now has radicale3.
* The `radicale2` package has been turned into a transitional package pointing to `radicale`.
* Essentially, we are dropping `radicale2`, and using the original package to upgrade to the latest version of Radicale.
* Configs for Radicale placed in `/usr/share/examples` in case of upgrade from old versions when `/etc/radicale` is not touched.
* Updated `INSTALL.msg` for Radicale.

`etesync-dav` upgraded to 0.20.0, and depends on the upgraded `radicale` package.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459069149

Comment:
I don't think this last part is necessary. Having a dummy package around isn't an issue.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459070736

Comment:
You might need something like `radicale>=3`, not sure.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459070415

Comment:
If you install a file into the directory, you don't need to to add it to `make_dirs`.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459071345

Comment:
Should this file still be here?

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-662686902

Comment:
Also the commit message is wrong.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New review comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459074573

Comment:
Not an issue per se, no. But it makes the system cleaner.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New review comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459075520

Comment:
No.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459076181

Comment:
Yes, but it also makes an already long INSTALL.msg even longer.

Re: [PR PATCH] [Updated] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/22810

etesync-dav upgrade to 0.18.1, new package radicale3
This upgrades etesync-dav to 0.18.1, which requires radicale 3.x. So there's also a commit adding radicale3, and making it conflict with radicale and radicale2.

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

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

From 074839e6e856db2fedc6aae0866dff732baab60f Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Thu, 11 Jun 2020 19:35:56 +0000
Subject: [PATCH 1/2] radicale: update to 3.0.3.

---
 srcpkgs/radicale/INSTALL.msg             | 12 ++++++--
 srcpkgs/radicale/template                | 24 ++++++++++------
 srcpkgs/radicale2                        |  1 +
 srcpkgs/radicale2/INSTALL.msg            |  4 ---
 srcpkgs/radicale2/files/radicale/log/run |  2 --
 srcpkgs/radicale2/files/radicale/run     |  3 --
 srcpkgs/radicale2/template               | 36 ------------------------
 srcpkgs/radicale2/update                 |  1 -
 8 files changed, 26 insertions(+), 57 deletions(-)
 create mode 120000 srcpkgs/radicale2
 delete mode 100644 srcpkgs/radicale2/INSTALL.msg
 delete mode 100755 srcpkgs/radicale2/files/radicale/log/run
 delete mode 100755 srcpkgs/radicale2/files/radicale/run
 delete mode 100644 srcpkgs/radicale2/template
 delete mode 100644 srcpkgs/radicale2/update

diff --git a/srcpkgs/radicale/INSTALL.msg b/srcpkgs/radicale/INSTALL.msg
index 260d1bb0b69..74c5e939201 100644
--- a/srcpkgs/radicale/INSTALL.msg
+++ b/srcpkgs/radicale/INSTALL.msg
@@ -1,7 +1,13 @@
-You are installing the legacy version of radicale (1.x)!
-Please install the radicale2 package for the latest (2.x) version.
+radicale has been upgraded from 1.x to 3.x, and the radicale2 package
+is now a transitional package that points to the main radicale 3.x
+package. To remove radicale2 and transition to the radicale package:
 
-If you need to migrate data, take the following steps:
+    xbps-pkgdb -m manual radicale
+    xbps-remove radicale2
+
+Migration from version 1.x to 2.x and beyond is not backwards
+compatible. Migration of data from 2.x to 3.x is not necessary. If you
+need to migrate data from 1.x to 2.x, take the following steps:
 
 - Disable the radicale 1.x service ("radicale")
 - Back up the radicale 1.x collections currently in /var/lib/radicale
diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 5cf0cc8da0d..1cde24dfc1c 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,20 +1,21 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=1.1.6
-revision=4
+version=3.0.3
+revision=1
 archs=noarch
 wrksrc="Radicale-${version}"
 build_style=python3-module
-pycompile_module="radicale"
 hostmakedepends="python3 python3-setuptools"
-depends="python3-pam python3-requests python3-dulwich"
+depends="python3-pam python3-requests python3-dulwich python3-vobject
+ python3-dateutil python3-passlib python3-bcrypt python3-defusedxml
+ apache-htpasswd"
 short_desc="Complete calendar and contact storing and manipulating solution"
-maintainer="lemmi <lemmi@nerd2nerd.org>"
+maintainer="projectmoon <projectmoon@agnos.is>"
 license="GPL-3.0-or-later"
 homepage="https://radicale.org"
-distfiles="${PYPI_SITE}/R/Radicale/Radicale-${version}.tar.gz"
-checksum=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b
-
+distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz"
+checksum=9e22273dda13938b44e0555a96f63e0491e42c1e58a290864ecae1181580be8c
+provides="radicale-${version}_${revision}"
 conf_files="
  /etc/radicale/config
  /etc/sv/radicale/log/run"
@@ -28,7 +29,14 @@ radicale_homedir="/var/lib/radicale"
 
 post_install() {
 	vinstall config 644 etc/radicale/
+	vinstall config 644 usr/share/examples/radicale
 	vinstall radicale.fcgi 644 usr/share/radicale
 	vinstall radicale.wsgi 644 usr/share/radicale
 	vsv radicale
 }
+
+radicale2_package() {
+	depends="radicale"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}
diff --git a/srcpkgs/radicale2 b/srcpkgs/radicale2
new file mode 120000
index 00000000000..984860429f2
--- /dev/null
+++ b/srcpkgs/radicale2
@@ -0,0 +1 @@
+./radicale
\ No newline at end of file
diff --git a/srcpkgs/radicale2/INSTALL.msg b/srcpkgs/radicale2/INSTALL.msg
deleted file mode 100644
index a1752ab1d4c..00000000000
--- a/srcpkgs/radicale2/INSTALL.msg
+++ /dev/null
@@ -1,4 +0,0 @@
-You are installing the 2.x version of radicale.
-If you need to migrate data, use the radicale 1.x package.
-For more information, refer to the official radicale migration guide:
-<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].*"

From 09d3d0c3942fff5444a1ce00825d5146ae383fd2 Mon Sep 17 00:00:00 2001
From: projectmoon <projectmoon@agnos.is>
Date: Wed, 10 Jun 2020 19:42:55 +0000
Subject: [PATCH 2/2] etesync-dav: update to 0.20.0.

---
 srcpkgs/etesync-dav/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template
index 932c54e3e53..62c060f956a 100644
--- a/srcpkgs/etesync-dav/template
+++ b/srcpkgs/etesync-dav/template
@@ -1,19 +1,19 @@
 # Template file for 'etesync-dav'
 pkgname=etesync-dav
-version=0.17.1
+version=0.20.0
 revision=1
 archs=noarch
 wrksrc="etesync-dav-${version}"
 build_style=python3-module
 hostmakedepends="python3-setuptools"
-depends="python3-etesync radicale2 python3-Flask python3-Flask-WTF"
+depends="python3-etesync radicale python3-Flask python3-Flask-WTF"
 checkdepends="$depends python3-pytest"
 short_desc="CalDAV and CardDAV frontend for EteSync"
 maintainer="projectmoon <projectmoon@agnos.is>"
 license="GPL-3.0-only"
 homepage="http://www.etesync.com"
 distfiles="${PYPI_SITE}/e/etesync-dav/etesync-dav-${version}.tar.gz"
-checksum=2d7018e3a0af8c203671eed4098f970d629876d17b235d434a595a5056aa7972
+checksum=50b9a493aca5d4a514673e271d4f99e52b085464cb96172cbc7d9288614210e1
 
 do_check() {
 	pytest3

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459079137

Comment:
It shouldn't need `provides` any more.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459080174

Comment:
The migration instructions need to be updated as well.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459080990

Comment:
This install msg needs to be huge, I don't think we should make it bigger for something that brings little value. People who care about the amount of packages they have know how to fix this.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459184859

Comment:
See prior comment about dropping all of this text in favor of a simple message noting the incompatibility.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459184710

Comment:
This whole `INSTALL.msg` should be gutted. The last version of radicale v1 is three years old. We should not try to hold users' hands by dumping long instructions that are unlikely to be read anyway. The entire contents of this file should be eliminated and replaced with this simple message:
```
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.
```
Note that https://radicale.org/1to2 now returns 404, so even Radicale is not interested in helping users migrate from a long-dead version. This is not our problem to solve. If somebody is interested enough, the information can be found in the Wayback Machine.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ahesford]

[-- 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/22810#discussion_r459182906

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

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ahesford]

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

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459182412

Comment:
Did @lemmi ask you to take over this template?

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[lemmi]

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

New comment by lemmi on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-662842866

Comment:
@ProjectMoon thanks for stepping up, just my 2 cents:
I don't have the capacity to maintain any of the newer radicale variants and I'm still running radicale 1, so I propose this:
We rename radicale to radicale1 and make radicale the package that tracks the newest radicale 3 release. Should I finally be able to also make the transition, I'll deprecate radicale1.

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New review comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459300340

Comment:
No. This was copied from the template for radicale3. Do you want me to change the maintainer back?

Re: [PR REVIEW] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New review comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#discussion_r459301445

Comment:
Just saw his comment.

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-662890827

Comment:
> @ProjectMoon thanks for stepping up, just my 2 cents:
> I don't have the capacity to maintain any of the newer radicale variants and I'm still running radicale 1, so I propose this:
> We rename radicale to radicale1 and make radicale the package that tracks the newest radicale 3 release. Should I finally be able to also make the transition, I'll deprecate radicale1.

This sounds good, but then we need to make a breaking change to the package tree, right?

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-663028529

Comment:
I'm not crazy about splitting to `radicale1` and updating `radicale` to v3. It's not much better than making `radicale3`. An inability to upgrade from the old `radicale` package sounds like an argument for holding local package versions, rather than altering the package tree to accomodate outdated software.

Maybe the `INSTALL.msg` for an updated `radicale` could include some basic instructions for reverting to an old version if that is required by some users:
```
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.

If you are unable to upgrade but require Radicale 1.x to function, you can install the xtools package and run

	xdowngrade /var/cache/xbps/radicale-<version>.<arch>.xbps
	xbps-pkgdb -m hold radicale

for your architecture and locally cached version number.

If you do not have a cached version of the package, you can install an unmanaged version with, for example

	pip install radicale<2

You may wish to use a virtual environment to isolate pip-installed packages from system-managed packages.
```

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[CameronNemo]

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

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-663084606

Comment:
@lemmi perhaps you can hold the `radicale` package for updates, seeing as the 1.x branch is not and probably will not receive any updates moving forward?

Re: [PR PATCH] [Updated] etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

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

https://github.com/ProjectMoon/void-packages master
https://github.com/void-linux/void-packages/pull/22810

etesync-dav upgrade to 0.18.1, new package radicale3
This upgrades etesync-dav to 0.18.1, which requires radicale 3.x. So there's also a commit adding radicale3, and making it conflict with radicale and radicale2.

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

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

Re: [PR PATCH] [Closed]: etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

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

etesync-dav upgrade to 0.18.1, new package radicale3
https://github.com/void-linux/void-packages/pull/22810

Description:
This upgrades etesync-dav to 0.18.1, which requires radicale 3.x. So there's also a commit adding radicale3, and making it conflict with radicale and radicale2.

Re: etesync-dav upgrade to 0.18.1, new package radicale3

[ProjectMoon]

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

New comment by ProjectMoon on void-packages repository

https://github.com/void-linux/void-packages/pull/22810#issuecomment-665217040

Comment:
Due to branch reorganization, GitHub closed this PR. New PR at: https://github.com/void-linux/void-packages/pull/23908