From: ProjectMoon <ProjectMoon@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] etesync-dav upgrade to 0.18.1, new package radicale3
Date: Wed, 22 Jul 2020 22:31:07 +0200 [thread overview]
Message-ID: <20200722203107.KTAq5jn3gMNcH5esdm46veLKRznbKrkRrYvmeOsASp0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22810@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-07-22 20:31 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22810@inbox.vuxu.org>
2020-07-04 12:15 ` ProjectMoon
2020-07-04 12:16 ` ProjectMoon
2020-07-05 18:29 ` Piraty
2020-07-06 14:46 ` ProjectMoon
2020-07-18 0:04 ` CameronNemo
2020-07-18 0:04 ` CameronNemo
2020-07-18 0:05 ` [PR REVIEW] " CameronNemo
2020-07-18 9:38 ` ProjectMoon
2020-07-18 9:59 ` ProjectMoon
2020-07-22 20:31 ` ProjectMoon [this message]
2020-07-22 20:35 ` ProjectMoon
2020-07-22 20:43 ` [PR REVIEW] " ericonr
2020-07-22 20:43 ` ericonr
2020-07-22 20:43 ` ericonr
2020-07-22 20:43 ` ericonr
2020-07-22 20:44 ` ericonr
2020-07-22 20:49 ` [PR REVIEW] " ProjectMoon
2020-07-22 20:51 ` ProjectMoon
2020-07-22 20:52 ` ericonr
2020-07-22 20:55 ` [PR PATCH] [Updated] " ProjectMoon
2020-07-22 21:00 ` [PR REVIEW] " ericonr
2020-07-22 21:00 ` ericonr
2020-07-22 21:01 ` ericonr
2020-07-23 2:39 ` ahesford
2020-07-23 2:39 ` ahesford
2020-07-23 2:39 ` ahesford
2020-07-23 2:39 ` ahesford
2020-07-23 6:38 ` lemmi
2020-07-23 8:45 ` [PR REVIEW] " ProjectMoon
2020-07-23 8:47 ` ProjectMoon
2020-07-23 8:47 ` ProjectMoon
2020-07-23 14:08 ` ahesford
2020-07-23 15:50 ` CameronNemo
2020-07-28 18:48 ` [PR PATCH] [Updated] " ProjectMoon
2020-07-28 18:48 ` [PR PATCH] [Closed]: " ProjectMoon
2020-07-28 18:55 ` ProjectMoon
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=20200722203107.KTAq5jn3gMNcH5esdm46veLKRznbKrkRrYvmeOsASp0@z \
--to=projectmoon@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).