From: teldra <teldra@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] radicale: update to 3.0.6
Date: Wed, 16 Sep 2020 19:15:12 +0200 [thread overview]
Message-ID: <20200916171512.1MaUxBNJBivYdnL_-mYh00ZQXLUnLCan8SY_t2RZOrQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24945@inbox.vuxu.org>
[-- 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].*"
next prev parent reply other threads:[~2020-09-16 17:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-16 17:11 [PR PATCH] " teldra
2020-09-16 17:13 ` [PR PATCH] [Updated] " teldra
2020-09-16 17:15 ` teldra [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200916171512.1MaUxBNJBivYdnL_-mYh00ZQXLUnLCan8SY_t2RZOrQ@z \
--to=teldra@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).