Bug#929873: unblock: radicale/2.1.11-6
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Please unblock package radicale
Compared to -4 now in buster, -6 now in sid contains a fix for bug#919339
which affects new installs (not upgrades) of Radicale.
This is the diff for the bugfix specifically:
- --- radicale-2.1.11_buster/debian/etc/uwsgi/apps-available/radicale.ini>2019-01-15 02:40:10.000000000 +0100
+++ radicale-2.1.11/debian/etc/uwsgi/apps-available/radicale.ini<------>2019-04-08 22:07:57.000000000 +0200
@@ -39,13 +39,15 @@
module = radicale
env = RADICALE_CONFIG=/etc/radicale/config
.
- -chdir = /var/lib/radicale/collections
+umask 027
.
- -if-not-exists = /var/lib/radicale
- -exec-as-root = mkdir -p /var/lib/radicale
+if-not-exists = /var/lib/radicale/collections
+exec-as-root = mkdir -p /var/lib/radicale/collections
endif =
if-not-exists = /var/log/radicale
- -exec-as-root = mkdir -p /var/log/radicale/collections
+exec-as-root = mkdir -p /var/lib/radicale
endif =
- -exec-as-root = if ! dpkg-statoverride --list /var/lib/radicale >/dev/null 2>&1; then chown radicale: /var/lib/radicale /var/lib/radicale/collections; chmod g-w,o-rwx /var/lib/radicale; fi
+exec-as-root = if ! dpkg-statoverride --list /var/lib/radicale >/dev/null 2>&1; then chown radicale: /var/lib/radicale /var/lib/radicale/collections; chmod g-w,o-rwx /var/lib/radicale /var/lib/radicale/collections; fi
exec-as-root = if ! dpkg-statoverride --list /var/log/radicale >/dev/null 2>&1; then chown radicale:adm /var/log/radicale; chmod g-w,o-rwx /var/log/radicale; fi
+
+chdir2 = /var/lib/radicale/collections
Attached is the full debdiff, additionally fixing/improving documention
and example code, and adding a missing package suggestion.
unblock radicale/2.1.11-6
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEn+Ppw2aRpp/1PMaELHwxRsGgASEFAlzzl3kACgkQLHwxRsGg
ASFOqhAAgfaSAZNh2OzRAkbtU3j+63mDnsQoWcf2Rr4sVeG4Td+/qveDyNWD79w/
86OiQ9DwZQB4HnYSKTWJJCGgUFl+kHfokpB/vVM14hbvcp/nft2bbrbscxqScSro
PBUXi/aQrsnGru6bCp89yp3AG7cieBaa6RRBKanOsdeZSwmdksZAgM8QWTAs+YNn
efQe63AGDxlnAwweBUmR3dLzDZXLhVyrshgPoHBnAwZj07svsnek9pSQeYYrP+jR
t2P5I+0AyXyJQw922WNyRynl+PXFrMXPJevFMzwVuVAAxRGTWqTModPFr3CAdgF+
2WZnCHcc1xZa1TYoSLk8JYhEcpfc8Y9FuwE2AGhW8MBJ/VNJfHRUOinnBaNE66zV
6mnqbV3ba450+v1IqHGNLVSrRp8UpJZdkFpRJ+7hSM2dGK82ht0fEpTFPpZWsPxI
7UtpcVrDvlLPSH3QI4LLiq/Z9dafyE2v+Ur2v3tyZR4kqbcqJzoZ0EgfBO3jeAOc
L0Y2fRTN6ddiMj7pTFZlE8fo1ZG813CM8RgXGZQakZYeRJEFyfQ62qQK9NmTGJjo
1bU41JGqlnXq7039Pcj7iwftzkCnRJo11ZGpFkELMFVAhxiyqPTalloH8mHmmC3I
p5HfAChID8VkjpTa7Myvf6ZuN+uo7dJbJVI8ca8RE2NMdVfEwPk=
=r5Mo
-----END PGP SIGNATURE-----
diff -ruN radicale-2.1.11_buster/debian/changelog radicale-2.1.11/debian/changelog
--- radicale-2.1.11_buster/debian/changelog 2019-02-07 02:28:00.000000000 +0100
+++ radicale-2.1.11/debian/changelog 2019-04-08 22:11:56.000000000 +0200
@@ -1,3 +1,26 @@
+radicale (2.1.11-6) unstable; urgency=medium
+
+ * Really fix directory creation and access rights of /var/lib/radicale.
+ Closes: Bug#919339. Thanks to Slavko.
+
+ -- Jonas Smedegaard <dr@jones.dk> Mon, 08 Apr 2019 22:11:56 +0200
+
+radicale (2.1.11-5) unstable; urgency=medium
+
+ * Update watch file:
+ + Rewrite usage comment.
+ + Simplify regular expressions.
+ * Fix suggest uwsgi-plugin-python3,
+ and adapt long description and README.Debian.
+ Thanks to A. F. Cano.
+ * Fix typos DOMAIN → _DOMAIN in example vhost snippet.
+ Thanks to A. F. Cano.
+ * Fix have uwsgi snippet create collections subdir below /var/lib
+ (not bogusly below /var/log).
+ Closes: Bug#919339.
+
+ -- Jonas Smedegaard <dr@jones.dk> Mon, 08 Apr 2019 12:52:13 +0200
+
radicale (2.1.11-4) unstable; urgency=medium
* Add NEWS entry about incompatible changes to storage format.
diff -ruN radicale-2.1.11_buster/debian/control radicale-2.1.11/debian/control
--- radicale-2.1.11_buster/debian/control 2019-01-15 02:41:55.000000000 +0100
+++ radicale-2.1.11/debian/control 2019-03-27 08:18:37.000000000 +0100
@@ -44,6 +44,7 @@
python3-bcrypt,
python3-passlib,
uwsgi,
+ uwsgi-plugin-python3,
Provides:
${python:Provides},
Description: simple calendar and addressbook server - daemon
@@ -62,8 +63,8 @@
python3-bcrypt.
.
Serving directly with uWSGI
- requires the package uwsgi.
- Serving with Apache as front-end and uWSGI as middleware
+ requires the packages uwsgi and uwsgi-plugin-python3.
+ Serving with Apache as front-end and uWSGI only as middleware
additionally requires the packages apache2 and libapache2-mod-proxy-uwsgi.
Package: python3-radicale
diff -ruN radicale-2.1.11_buster/debian/etc/uwsgi/apps-available/radicale.ini radicale-2.1.11/debian/etc/uwsgi/apps-available/radicale.ini
--- radicale-2.1.11_buster/debian/etc/uwsgi/apps-available/radicale.ini 2019-01-15 02:40:10.000000000 +0100
+++ radicale-2.1.11/debian/etc/uwsgi/apps-available/radicale.ini 2019-04-08 22:07:57.000000000 +0200
@@ -39,13 +39,15 @@
module = radicale
env = RADICALE_CONFIG=/etc/radicale/config
-chdir = /var/lib/radicale/collections
+umask 027
-if-not-exists = /var/lib/radicale
-exec-as-root = mkdir -p /var/lib/radicale
+if-not-exists = /var/lib/radicale/collections
+exec-as-root = mkdir -p /var/lib/radicale/collections
endif =
if-not-exists = /var/log/radicale
-exec-as-root = mkdir -p /var/log/radicale/collections
+exec-as-root = mkdir -p /var/lib/radicale
endif =
-exec-as-root = if ! dpkg-statoverride --list /var/lib/radicale >/dev/null 2>&1; then chown radicale: /var/lib/radicale /var/lib/radicale/collections; chmod g-w,o-rwx /var/lib/radicale; fi
+exec-as-root = if ! dpkg-statoverride --list /var/lib/radicale >/dev/null 2>&1; then chown radicale: /var/lib/radicale /var/lib/radicale/collections; chmod g-w,o-rwx /var/lib/radicale /var/lib/radicale/collections; fi
exec-as-root = if ! dpkg-statoverride --list /var/log/radicale >/dev/null 2>&1; then chown radicale:adm /var/log/radicale; chmod g-w,o-rwx /var/log/radicale; fi
+
+chdir2 = /var/lib/radicale/collections
diff -ruN radicale-2.1.11_buster/debian/examples/apache2-vhost.conf radicale-2.1.11/debian/examples/apache2-vhost.conf
--- radicale-2.1.11_buster/debian/examples/apache2-vhost.conf 2018-12-13 01:17:56.000000000 +0100
+++ radicale-2.1.11/debian/examples/apache2-vhost.conf 2019-04-01 02:05:07.000000000 +0200
@@ -1,13 +1,13 @@
# example apache2 vhost snippet for Radicale CalDAV/CardDAV service
Define _DOMAIN example.org
-Define _HOST event.${DOMAIN}
+Define _HOST event.${_DOMAIN}
# secure-only access to protect password
# assumes already configured TLS certificates and mod-ssl / mod-gnutls
<VirtualHost *:443>
ServerName ${_HOST}
- ServerAdmin webmaster@${DOMAIN}
+ ServerAdmin webmaster@${_DOMAIN}
DocumentRoot /var/www/nowhere
Include conf-available/radicale.conf
@@ -31,7 +31,7 @@
# insecure access redirects to secure
<VirtualHost *:80>
ServerName ${_HOST}
- ServerAdmin webmaster@${DOMAIN}
+ ServerAdmin webmaster@${_DOMAIN}
DocumentRoot /var/www/nowhere
# avoid Let's Encrypt validation path
diff -ruN radicale-2.1.11_buster/debian/radicale.README.Debian radicale-2.1.11/debian/radicale.README.Debian
--- radicale-2.1.11_buster/debian/radicale.README.Debian 2018-12-16 15:57:57.000000000 +0100
+++ radicale-2.1.11/debian/radicale.README.Debian 2019-03-27 08:21:01.000000000 +0100
@@ -16,7 +16,7 @@
Install needed packages:
- apt install uwsgi uwsgi-plugin-psgi apache2 libapache2-mod-authnz-external
+ apt install uwsgi uwsgi-plugin-python3 apache2 libapache2-mod-authnz-external
Enable and activate back-end uWSGI service:
diff -ruN radicale-2.1.11_buster/debian/watch radicale-2.1.11/debian/watch
--- radicale-2.1.11_buster/debian/watch 2018-12-10 10:49:30.000000000 +0100
+++ radicale-2.1.11/debian/watch 2019-02-12 13:33:32.000000000 +0100
@@ -1,5 +1,9 @@
-# run "uscan --report" to check or "gbp import-orig --uscan" to update
version=4
-opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%,uversionmangle=s/rc/~rc/" \
- https://github.com/Kozea/Radicale/tags \
- (?:.*?/)?v?(\d[\d.]*(?:rc\d+)?)\.tar\.gz debian
+# check: uscan --report
+# update: gbp import-orig --upstream-vcs-tag=vX.Y.Z --uscan
+
+opts=\
+uversionmangle=s/rc/~rc/,\
+filenamemangle=s/.*?(@ANY_VERSION@@ARCHIVE_EXT@)/@PACKAGE@-$1/ \
+https://github.com/Kozea/Radicale/tags \
+.*?@ANY_VERSION@@ARCHIVE_EXT@
Reply to: