gentoo resync : 19.03.2019

5 files changed, 79 insertions, 99 deletions

diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 9068b2cd1e8e..8e3134f8e03d 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,9 +1,9 @@
 AUX radicale-1.1.6-config.patch 841 BLAKE2B a21d34a08108de5f90470def9239ed667063691c17d0bb000a0b07dfdef58888a6623c29e661b84bc7cca9d3b373dfa7ce8fd0e7e658de36a9bce5ef88555d8d SHA512 193a15a2d0a80a5518275aecc42dcb2c27c68bc7d98666ea3607ca1901d1d84fe8fa5a7f4cb10e83db1b00ca94f3b592fd0ed4fb8d3f2b57c66dc707f5fba3c9
+AUX radicale-r2.init.d 603 BLAKE2B 3eedaf633d51e18b82a50c304f64a7268afec75e89515eb10b45b891691ff39b5d84753c4b3ed71c5a5b017c65d2c8bd38a6a043e0570f2916d12856202c3b45 SHA512 053fb6d5e7cec094a55fc8e56df9787949fd4b6c09caa1855de91d0a78eba5cfaac1a77a81afc178f93a75a0e70732c2c43b7f378596877ab36240ca46df9b03
 AUX radicale.init.d 564 BLAKE2B 370d68329a2507c4b96766597851f1c5de13df492422212df3739eb4a5444ce537cdd23ea5d630ae51795979d69f521054c41a968585ffa671d8624aac176e53 SHA512 670de8a2d0d5e29b68c1e177db20d13874722f2ac9d96e746e59cb47181e206b4d249a5f9c4411acf4abe49ec44d93cf452b9100470e5374f3fe8e3c0dc000aa
+AUX radicale.service 546 BLAKE2B 6d43e9b9aec713a944259e6323442f6796068ede3da5399f9081692b55fa0edc7ec72b35d190ec68f14972374c4da23178e84c7f4ff6df611c1f82e1e0b3029d SHA512 94705c36ddd4de14b608fa71cb8ee4fff3f4f12cf90cfeb3863c334e98ac5d19b34134d26c319d5d05b61efba8370addb87b8b6a6ad7005a17f8bfb35ff9013b
 DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B 38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6 SHA512 3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
-DIST Radicale-2.1.10.tar.gz 77790 BLAKE2B 37061dd049dc918775f20b522ed86a47f32f34505c13763f8ae49ff007aca77f88caafc959be857c735c11b13506efdfc8413750808b88d5ea6dbe69e05f03ff SHA512 30fac6639e56bbd10664330d84ebba28b34005b4b4b4c5a6c22f53cb7e810ba4961cbd314e62fe33538674a2d4b45f14751f36ef5fa2ae2b7d44c1b1158f6e1c
-DIST Radicale-2.1.8.tar.gz 76348 BLAKE2B 87a4ec20990dc7e5dbba88a3fb3d1475210d40c12584d5bb7ba7c6d1ca2cd8efb97b7054d322f0a7fbe58fd8325be63df52f1d370cc13ccc90863b0900925656 SHA512 038bee4114b090bcf873e8a4ec83cbbc7bdd34b4843fd1a769a023c891b589b3a18637d5f8f8595691a7930804ad7695e333bb9df96d00515b7a3695294eb5f7
+DIST Radicale-2.1.11.tar.gz 76490 BLAKE2B 35578b693a32d4a77f8ff1c93cbb8fb63fd8dabf9fde79cd928d4afa6e059fe836840ca6a33621c13e9421a69bfb25cbb59688ba83bed62003ef3b56b54804b1 SHA512 e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733
 EBUILD radicale-1.1.6.ebuild 1684 BLAKE2B a52aa9b6d283de410e7013e6a700782e77041078fce0cddd067ab603078db78d728cbac4d4cf9320473ae9a66c801a791d3ac4d21b352e954df33077e1c8e4e3 SHA512 d1600fdaea50a3b811516350b6380a05c28d82de18e02d2b3fe630eaeadf0c7e3fe06df26df80f392100ff3d31175eb57a8b6c31b481cc26a7f844fbe4cfaa0c
-EBUILD radicale-2.1.10.ebuild 2370 BLAKE2B ff89f8d31eb7c4a1ae57aba0fa912d93807bc73836d47a1732ad935bd61e952d343261499e33f6e9d954bca3f6fe7639e83b3da125a3b8f76cc890a3cd3ecff6 SHA512 41b48890b3038ea451a7574c34a8a8413ea4f9d5abf00403f3fc47d8b2bfd883ccd58cec76324de2d862f5b4e4c6f9c8a2508e7c86205d28717d871e67c4a8f5
-EBUILD radicale-2.1.8.ebuild 2315 BLAKE2B c6621c0fd342d270b2af2938612a05dd66a8c5a6644d6cb0f3d0806f109f85de8f9009fea9beb188962172f2406f2f38a797a7e0977ac82c17be6ab154ff08d2 SHA512 33a172ffd1d55dcad8870cfb3da26ae7cdd7fc01f0fb67fcd1177f2a2986f4b5255c618042e886a47fce9d75d08345b6cadfd794783139b7230188244e736237
+EBUILD radicale-2.1.11-r1.ebuild 2753 BLAKE2B 359faabe6cc7af9642d3707396a933b746814eee9f1abca3d15fb8d209fb4d1a691a6a0b95849a054816cf7c1b42b3fc39da76f98ca960910aa9ea6f4939af8e SHA512 faa4bfb2e86ea84f600f4691f8bd6feba509710f3ce836bdcbd236da1a4b2586756a216cab69fb66ee1231ed326aaa05227bf0973839b17a9d3c4d979f4eb3ba
 MISC metadata.xml 472 BLAKE2B dad26ff5abb5fb50a0016f23a03f33bf2e6dc536ed92fe30a587824f8b85789ae16a44d362df683c2b62c9db73175f0cbb06b26a6a6d4b3d544fdefb30613690 SHA512 309c2abddb4150357ffbfd35d8dd153592b4e7426b61728a25f7a2a8eb6a97ab8c3e4042eb5e333d4524977ec7f30e6793b33a6a2a70eff1f1c555d7f9f706e2
diff --git a/www-apps/radicale/files/radicale-r2.init.d b/www-apps/radicale/files/radicale-r2.init.d
new file mode 100644
index 000000000000..00f85d29e0e5
--- /dev/null
+++ b/www-apps/radicale/files/radicale-r2.init.d
@@ -0,0 +1,27 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+PIDFILE=/run/radicale.pid
+
+depend() {
+    need localmount
+}
+
+start() {
+    ebegin "Starting radicale"
+        start-stop-daemon --start --quiet --background \
+        --user radicale \
+	--umask 0027 \
+        --stderr-logger /usr/bin/logger \
+        --pidfile ${PIDFILE} --make-pidfile \
+        --exec /usr/bin/radicale -- --foreground
+    eend $?
+}
+
+stop() {
+    ebegin "Stopping radicale"
+        start-stop-daemon --stop --quiet \
+        --pidfile ${PIDFILE}
+    eend $?
+}
diff --git a/www-apps/radicale/files/radicale.service b/www-apps/radicale/files/radicale.service
new file mode 100644
index 000000000000..ffafba8d3ae7
--- /dev/null
+++ b/www-apps/radicale/files/radicale.service
@@ -0,0 +1,25 @@
+## this is heavily inspired by https://radicale.org/setup/
+
+[Unit]
+Description=A simple CalDAV (calendar) and CardDAV (contact) server
+After=network.target
+Requires=network.target
+
+[Service]
+ExecStart=/usr/bin/radicale
+Restart=on-failure
+User=radicale
+# Deny other users access to the calendar data
+UMask=0027
+PrivateTmp=true
+ProtectSystem=strict
+ProtectHome=true
+PrivateDevices=true
+ProtectKernelTunables=true
+ProtectKernelModules=true
+ProtectControlGroups=true
+NoNewPrivileges=true
+StateDirectory=radicale
+
+[Install]
+WantedBy=multi-user.target
diff --git a/www-apps/radicale/radicale-2.1.10.ebuild b/www-apps/radicale/radicale-2.1.11-r1.ebuild
index 89f03ec7fc82..853fccb8ac1f 100644
--- a/www-apps/radicale/radicale-2.1.10.ebuild
+++ b/www-apps/radicale/radicale-2.1.11-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit distutils-r1 eutils user
+inherit distutils-r1 eutils user systemd
 
 MY_PN="Radicale"
 MY_P="${MY_PN}-${PV}"
@@ -19,14 +19,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+bcrypt"
 
-RDEPEND=">=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
+RDEPEND="sys-apps/util-linux
+	>=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
 	>=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
 	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
 
 S=${WORKDIR}/${MY_P}
 
-RDIR=/var/lib/radicale
-LDIR=/var/log/radicale
+RDIR=/var/lib/${PN}
 
 pkg_pretend() {
 	if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
@@ -51,21 +51,21 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	enewgroup radicale
-	enewuser radicale -1 -1 ${RDIR} radicale
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 ${RDIR} ${PN}
 }
 
 python_install_all() {
 	rm README* || die
 
 	# init file
-	newinitd "${FILESDIR}"/radicale.init.d radicale
+	newinitd "${FILESDIR}"/radicale-r2.init.d radicale
+	systemd_dounit "${FILESDIR}/${PN}.service"
 
 	# directories
-	diropts -m0750 -oradicale -gradicale
 	keepdir ${RDIR}
-	diropts -m0755 -oradicale -gradicale
-	keepdir ${LDIR}
+	fowners ${PN}:${PN} ${RDIR}
+	fperms 0750 ${RDIR}
 
 	# config file
 	insinto /etc/${PN}
@@ -79,6 +79,17 @@ python_install_all() {
 }
 
 pkg_postinst() {
-	einfo "A sample WSGI script has been put into ${ROOT%/}/usr/share/${PN}."
+	local _erdir="${EROOT%/}${RDIR}"
+
+	einfo "A sample WSGI script has been put into ${EROOT%/}/usr/share/${PN}."
 	einfo "You will also find there an example FastCGI script."
+	if [[ $(stat --format="%U:%G:%a" "${_erdir}") != "${PN}:${PN}:750" ]]
+	then
+		ewarn "Unsafe file permissions detected on ${_erdir}. This probably comes"
+		ewarn "from an earlier version of this ebuild."
+		ewarn "To fix run:"
+		ewarn "  \`chown -R ${PN}:${PN} ${_erdir}\`"
+		ewarn "  \`chmod 0750 ${_erdir}\`"
+		ewarn "  \`chmod -R o= ${_erdir}\`"
+	fi
 }
diff --git a/www-apps/radicale/radicale-2.1.8.ebuild b/www-apps/radicale/radicale-2.1.8.ebuild
deleted file mode 100644
index 5184bfacbcf7..000000000000
--- a/www-apps/radicale/radicale-2.1.8.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
-
-inherit distutils-r1 eutils user
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bcrypt"
-
-RDEPEND=">=dev-python/vobject-0.9.5[${PYTHON_USEDEP}]
-	bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
-
-S=${WORKDIR}/${MY_P}
-
-RDIR=/var/lib/radicale
-LDIR=/var/log/radicale
-
-pkg_pretend() {
-	if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
-		eerror "It looks like you have a version 1 database in ${RDIR}."
-		eerror "You must convert this database to version 2 format before upgrading."
-		eerror "You may want to back up the old database before migrating."
-		eerror
-		eerror "If you have kept the Gentoo-default database configuration, this will work:"
-		eerror "1. Stop any running instance of Radicale."
-		eerror "2. Run \`radicale --export-storage ~/radicale-exported\`."
-		eerror "3. Run \`chown -R radicale: ~/radicale-exported\`"
-		eerror "4. Run \`mv \"${RDIR}\" \"${RDIR}.old\"\`."
-		eerror "5. Install Radicale version 2."
-		eerror "6. Run \`mv ~/radicale-exported \"${RDIR}/collections\"\`."
-		eerror
-		eerror "For more details, or if you are have a more complex configuration,"
-		eerror "please see the migration guide: https://radicale.org/1to2/"
-		eerror "If you do a custom migration, please ensure the database is cleaned out of"
-		eerror "${RDIR}, including the hidden .props file."
-		die
-	fi
-}
-
-pkg_setup() {
-	enewgroup radicale
-	enewuser radicale -1 -1 ${RDIR} radicale
-}
-
-python_install_all() {
-	rm README* || die
-
-	# init file
-	newinitd "${FILESDIR}"/radicale.init.d radicale
-
-	# directories
-	diropts -m0750 -oradicale -gradicale
-	keepdir ${RDIR}
-	diropts -m0755 -oradicale -gradicale
-	keepdir ${LDIR}
-
-	# config file
-	insinto /etc/${PN}
-	doins config logging
-
-	# fcgi and wsgi files
-	exeinto /usr/share/${PN}
-	doexe radicale.fcgi radicale.wsgi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	einfo "A sample WSGI script has been put into ${ROOT%/}/usr/share/${PN}."
-	einfo "You will also find there an example FastCGI script."
-}