[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/, www-apps/radicale/files/
commit: 60c762aebda5b24c14976c5b468a78d5eb5ed1b0
Author: Henning Schild hennsch de>
AuthorDate: Fri Aug 23 07:45:46 2024 +
Commit: Eli Schwartz gentoo org>
CommitDate: Sun Aug 25 20:23:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c762ae
www-apps/radicale: remove old
Signed-off-by: Henning Schild hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/38254
Signed-off-by: Eli Schwartz gentoo.org>
www-apps/radicale/files/radicale-r3.init.d | 27 -
www-apps/radicale/radicale-3.1.9.ebuild| 90 --
2 files changed, 117 deletions(-)
diff --git a/www-apps/radicale/files/radicale-r3.init.d
b/www-apps/radicale/files/radicale-r3.init.d
deleted file mode 100644
index bb0cc5db08b0..
--- a/www-apps/radicale/files/radicale-r3.init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 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
- eend $?
-}
-
-stop() {
- ebegin "Stopping radicale"
- start-stop-daemon --stop --quiet \
- --pidfile ${PIDFILE}
- eend $?
-}
diff --git a/www-apps/radicale/radicale-3.1.9.ebuild
b/www-apps/radicale/radicale-3.1.9.ebuild
deleted file mode 100644
index 7c3557675f25..
--- a/www-apps/radicale/radicale-3.1.9.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit distutils-r1 systemd
-
-MY_P=${P^}
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/";
-SRC_URI="
- https://github.com/Kozea/Radicale/archive/refs/tags/v${PV}.tar.gz
- -> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-
-RDEPEND="
- >=acct-user/radicale-0-r2
- acct-group/radicale
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/defusedxml[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/vobject[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sys-apps/util-linux
-"
-
-BDEPEND="
- test? (
-
[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/, www-apps/radicale/files/
commit: 07b6c8a70ff507e27740b0273b6fcb91ebce4cf1
Author: Henning Schild hennsch de>
AuthorDate: Fri Mar 11 14:48:33 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Fri Mar 11 16:43:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07b6c8a7
www-apps/radicale: drop old
Signed-off-by: Henning Schild hennsch.de>
Closes: https://github.com/gentoo/gentoo/pull/24490
Signed-off-by: Arthur Zamarin gentoo.org>
www-apps/radicale/Manifest | 1 -
www-apps/radicale/files/radicale-r2.init.d | 27 -
www-apps/radicale/metadata.xml | 3 -
www-apps/radicale/radicale-2.1.12-r1.ebuild | 87 -
4 files changed, 118 deletions(-)
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 6c873f4bc2b7..f1d42b7f51b7 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,2 +1 @@
-DIST radicale-2.1.12.tar.gz 123828 BLAKE2B
38ffb264b1f8e185642e0236821bd1a7714c34306f4d67d181a9130c7955b9f3a616547fa04a15781c2587bbdc5e7ea1eeab9da65790b72fb78cd83d78b0fd43
SHA512
98b5c1e6c71928859de9f497b7e968e56c659e9e5d8c559d4359718511d67a23d4daa9adca679f5f732ad531cb04d184b022cf2684fa5fdbfe24a35c92813968
DIST radicale-3.1.5.tar.gz 136725 BLAKE2B
574032fc9a4010db2de0066758093b74fb29e43c3e8f3328441c92af99827a5f4174ac3ddbc2573083642af4c68073c470ce64ae7689b537a72aa0b813b641b8
SHA512
0febad350e970e4f0ef8199472bb94a81a2a412be2b55c1baee16967b39bf9a5f7b9e8aa7c95a19beedf2f8b2d871382aa0727803432575bff248bc0137adce3
diff --git a/www-apps/radicale/files/radicale-r2.init.d
b/www-apps/radicale/files/radicale-r2.init.d
deleted file mode 100644
index 23da22d7fc9e..
--- a/www-apps/radicale/files/radicale-r2.init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 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/metadata.xml b/www-apps/radicale/metadata.xml
index b8bf55526ab7..1dead5aa423a 100644
--- a/www-apps/radicale/metadata.xml
+++ b/www-apps/radicale/metadata.xml
@@ -13,7 +13,4 @@
Kozea/Radicale
-
- Enable bcrypt
-
diff --git a/www-apps/radicale/radicale-2.1.12-r1.ebuild
b/www-apps/radicale/radicale-2.1.12-r1.ebuild
deleted file mode 100644
index 8c98f9b9deed..
--- a/www-apps/radicale/radicale-2.1.12-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit distutils-r1 systemd
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="https://radicale.org/";
-SRC_URI="https://github.com/Kozea/Radicale/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+bcrypt"
-
-RDEPEND="
- acct-user/radicale
- acct-group/radicale
- >=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- sys-apps/util-linux
- bcrypt? (
- dev-python/bcrypt[${PYTHON_USEDEP}]
- dev-python/passlib[${PYTHON_USEDEP}]
- )"
-
-distutils_enable_tests --install pytest
-
-S="${WORKDIR}/${MY_P}"
-
-RDIR=/var/lib/${PN}
-
-src_prepare() {
- sed -i '/^addopts =/d' setup.cfg || die
- distutils-r1_src_prepare
-}
-
-python_test() {
- epytest radicale/tests/
-}
-
-python_install_all() {
- rm README* || die
-
- # init file
- newinitd "${FILESDIR}"/radicale-r2.init.d radicale
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- # directories
- keepdir ${RDIR}
- fowners ${PN}:${PN} ${RDIR}
- fperms 0750 ${RDIR}
-
- # 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() {
- 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}
[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/, www-apps/radicale/files/
commit: c56005092fc25ec00417e2853c7650d342f97248
Author: Marco Scardovi
AuthorDate: Sun Mar 28 11:50:33 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Apr 7 07:51:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5600509
www-apps/radicale: remove older version
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Marco Scardovi scardovi.com>
Signed-off-by: Joonas Niilola gentoo.org>
www-apps/radicale/Manifest | 1 -
www-apps/radicale/files/radicale-r2.init.d | 27 ---
www-apps/radicale/radicale-2.1.12.ebuild | 72 --
3 files changed, 100 deletions(-)
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index 158b1ea3b9c..65bd4d52291 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,2 +1 @@
-DIST Radicale-2.1.12.tar.gz 109781 BLAKE2B
743eaeffab43f2efcfc798f84d00fee40a09609beeb555e3afe3c9f4c54d8e0ce3a7eba4c1e14d6702775ab7d156b085408ee968b0d53437982cf2ea7cb4653c
SHA512
a708fb1269f7ba8c9e351e101f613a8adb18c12b1239b832ed9e0287476f30aa7ded30f9bc259da9c4b5f3aefe90bbf9980d0d08d98dd07b79cd19930b0e204c
DIST radicale-3.0.6.tar.gz 123817 BLAKE2B
fa4b70c9920d518df6c939395eca857c237a75218b90ada45564f2d84266d65df12898e4efbb52905829948061e10e72b5442943fd5061a28447330ae8d491e8
SHA512
e9741547395fae8886ad84b6807422ebb196f5293d484f5f6136498058576cff697e28c117216f151d56494af83593347ceee40a6efa21272b803d0f301a396d
diff --git a/www-apps/radicale/files/radicale-r2.init.d
b/www-apps/radicale/files/radicale-r2.init.d
deleted file mode 100644
index 6b1e0b37d95..000
--- a/www-apps/radicale/files/radicale-r2.init.d
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2021 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/radicale-2.1.12.ebuild
b/www-apps/radicale/radicale-2.1.12.ebuild
deleted file mode 100644
index aef65e3ee5d..000
--- a/www-apps/radicale/radicale-2.1.12.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1 eutils systemd
-
-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 ~arm ~x86"
-IUSE="+bcrypt"
-
-RDEPEND="
- acct-user/radicale
- acct-group/radicale
- >=dev-python/vobject-0.9.6[${PYTHON_USEDEP}]
- >=dev-python/python-dateutil-2.7.3[${PYTHON_USEDEP}]
- sys-apps/util-linux
- bcrypt? ( dev-python/passlib[bcrypt,${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-RDIR=/var/lib/${PN}
-
-python_install_all() {
- rm README* || die
-
- # init file
- newinitd "${FILESDIR}"/radicale-r2.init.d radicale
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- # directories
- keepdir ${RDIR}
- fowners ${PN}:${PN} ${RDIR}
- fperms 0750 ${RDIR}
-
- # 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() {
- 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
-}
[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/, www-apps/radicale/files/
commit: f55d8f0f79305fa8d7d89290f6345a907cab46f5
Author: Henning Schild hennsch de>
AuthorDate: Fri Mar 8 09:16:18 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Mar 9 21:22:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f55d8f0f
www-apps/radicale: clean up init script and run with umask
Make sure that files created by the deamon are not world readable,
inspired by the systemd service coming in a later commit.
Suggested-by: Thomas Deutschmann gentoo.org>
Signed-off-by: Henning Schild hennsch.de>
Signed-off-by: Thomas Deutschmann gentoo.org>
www-apps/radicale/files/radicale-r2.init.d | 27 +++
www-apps/radicale/radicale-2.1.11-r1.ebuild | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
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 000..00f85d29e0e
--- /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/radicale-2.1.11-r1.ebuild
b/www-apps/radicale/radicale-2.1.11-r1.ebuild
index e95f957a111..cfd37257975 100644
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ b/www-apps/radicale/radicale-2.1.11-r1.ebuild
@@ -59,7 +59,7 @@ python_install_all() {
rm README* || die
# init file
- newinitd "${FILESDIR}"/radicale-r1.init.d radicale
+ newinitd "${FILESDIR}"/radicale-r2.init.d radicale
# directories
keepdir ${RDIR}
[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/, www-apps/radicale/files/
commit: 6da1901a78213ed76f1ae4c5b53e449439bd742f
Author: Henning Schild hennsch de>
AuthorDate: Fri Mar 8 09:21:33 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Mar 9 21:23:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6da1901a
www-apps/radicale: add systemd service file
Signed-off-by: Henning Schild hennsch.de>
Signed-off-by: Thomas Deutschmann gentoo.org>
www-apps/radicale/files/radicale.service| 25 +
www-apps/radicale/radicale-2.1.11-r1.ebuild | 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/www-apps/radicale/files/radicale.service
b/www-apps/radicale/files/radicale.service
new file mode 100644
index 000..ffafba8d3ae
--- /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.11-r1.ebuild
b/www-apps/radicale/radicale-2.1.11-r1.ebuild
index cfd37257975..853fccb8ac1 100644
--- a/www-apps/radicale/radicale-2.1.11-r1.ebuild
+++ b/www-apps/radicale/radicale-2.1.11-r1.ebuild
@@ -5,7 +5,7 @@ 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}"
@@ -60,6 +60,7 @@ python_install_all() {
# init file
newinitd "${FILESDIR}"/radicale-r2.init.d radicale
+ systemd_dounit "${FILESDIR}/${PN}.service"
# directories
keepdir ${RDIR}
[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/, www-apps/radicale/files/
commit: 6f6b42f6f6efdd9ddfb0bb39111292cb2c6d6c2b
Author: Karel Kočí email cz>
AuthorDate: Tue Dec 4 21:53:48 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Mar 7 21:00:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f6b42f6
www-apps/radicale: log stdout and stderr to syslog
Radicale in default sends all its logs to stderr and stdout. This
redirect them to syslog.
Bug: https://bugs.gentoo.org/672534
Signed-off-by: Karel Kočí email.cz>
Closes: https://github.com/gentoo/gentoo/pull/10574
Signed-off-by: Thomas Deutschmann gentoo.org>
www-apps/radicale/files/radicale-r1.init.d | 27 ++
...ale-2.1.11.ebuild => radicale-2.1.10-r1.ebuild} | 10
www-apps/radicale/radicale-2.1.11.ebuild | 8 +++
3 files changed, 34 insertions(+), 11 deletions(-)
diff --git a/www-apps/radicale/files/radicale-r1.init.d
b/www-apps/radicale/files/radicale-r1.init.d
new file mode 100644
index 000..9e2ddb7c510
--- /dev/null
+++ b/www-apps/radicale/files/radicale-r1.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=/var/run/radicale.pid
+
+depend() {
+use net
+need localmount
+}
+
+start() {
+ebegin "Starting radicale"
+start-stop-daemon --start --quiet --background \
+--user radicale \
+--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/radicale-2.1.11.ebuild
b/www-apps/radicale/radicale-2.1.10-r1.ebuild
similarity index 90%
copy from www-apps/radicale/radicale-2.1.11.ebuild
copy to www-apps/radicale/radicale-2.1.10-r1.ebuild
index 4872a7b5e46..34fd1a1d2f8 100644
--- a/www-apps/radicale/radicale-2.1.11.ebuild
+++ b/www-apps/radicale/radicale-2.1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -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
pkg_pretend() {
if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
@@ -59,13 +59,11 @@ python_install_all() {
rm README* || die
# init file
- newinitd "${FILESDIR}"/radicale.init.d radicale
+ newinitd "${FILESDIR}"/radicale-r1.init.d radicale
# directories
diropts -m0750 -oradicale -gradicale
keepdir ${RDIR}
- diropts -m0755 -oradicale -gradicale
- keepdir ${LDIR}
# config file
insinto /etc/${PN}
diff --git a/www-apps/radicale/radicale-2.1.11.ebuild
b/www-apps/radicale/radicale-2.1.11.ebuild
index 4872a7b5e46..a65d7bc588b 100644
--- a/www-apps/radicale/radicale-2.1.11.ebuild
+++ b/www-apps/radicale/radicale-2.1.11.ebuild
@@ -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
pkg_pretend() {
if [[ -f ${RDIR}/.props && ${MERGE_TYPE} != buildonly ]]; then
@@ -59,13 +59,11 @@ python_install_all() {
rm README* || die
# init file
- newinitd "${FILESDIR}"/radicale.init.d radicale
+ newinitd "${FILESDIR}"/radicale-r1.init.d radicale
# directories
diropts -m0750 -oradicale -gradicale
keepdir ${RDIR}
- diropts -m0755 -oradicale -gradicale
- keepdir ${LDIR}
# config file
insinto /etc/${PN}
[gentoo-commits] repo/gentoo:master commit in: www-apps/radicale/, www-apps/radicale/files/
commit: 8162a820446888b9ed45003dc7c9e955bce8d381
Author: Thomas Deutschmann gentoo org>
AuthorDate: Sat Feb 24 03:23:11 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Sat Feb 24 03:23:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8162a820
www-apps/radicale: Security cleanup (bug #618176)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
www-apps/radicale/Manifest | 1 -
.../radicale/files/radicale-1.1.1-config.patch | 34 --
www-apps/radicale/radicale-1.1.1.ebuild| 72 --
3 files changed, 107 deletions(-)
diff --git a/www-apps/radicale/Manifest b/www-apps/radicale/Manifest
index a84266d4ed5..d11e34b6ebd 100644
--- a/www-apps/radicale/Manifest
+++ b/www-apps/radicale/Manifest
@@ -1,2 +1 @@
-DIST Radicale-1.1.1.tar.gz 47174 BLAKE2B
60b2ccff2a2c604becc8c4c40d106c467f43be93593471732528cf1939165451702aa6e0ed8435584eb1202072fbe82a9afecd292b6365143d095f784e7eecb5
SHA512
dc251d8fa4d347c2bbcf472b7a2da94d674f858a007fec1d74774cd1f3ae43eb2d5902ed45762638ec49546b8ee1f66446d07b50fc0ff6595deb67ea07f87af2
DIST Radicale-1.1.6.tar.gz 48280 BLAKE2B
38d3047d473fad24188b597a57d3e1f0e34df03f00f6806b86c447ed731be074bf0b5f6dfb951c8a9f627993bf0763792150bc06532414a658e4d306123fcdd6
SHA512
3fed85fc5fa2b041277112870b8b508a22cc85ec0680dd1cf9411e73715e18a9b0ddd651eafb0c9529bd308e7fd87ae44ecdd82935f4062050919780301d56d9
diff --git a/www-apps/radicale/files/radicale-1.1.1-config.patch
b/www-apps/radicale/files/radicale-1.1.1-config.patch
deleted file mode 100644
index 4eb286f8d40..000
--- a/www-apps/radicale/files/radicale-1.1.1-config.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/config b/config
-index 453a45e..10c1595 100644
a/config
-+++ b/config
-@@ -146,7 +146,7 @@ http_password_parameter =
- #custom_handler =
-
- # File for rights management from_file
--#file = ~/.config/radicale/rights
-+file = /etc/radicale/rights
-
-
- [storage]
-@@ -163,7 +163,7 @@ file = ~/.config/radicale/rights
- #custom_handler =
-
- # Folder for storing local collections, created if not present
--#filesystem_folder = ~/.config/radicale/collections
-+filesystem_folder = /var/lib/radicale/
-
- # Database URL for SQLAlchemy
- # dialect+driver://user:password@host/dbname[?key=value..]
-diff --git a/logging b/logging
a/logging
-+++ b/logging
-@@ -45,7 +45,7 @@ formatter = simple
- [handler_file]
- # File handler
- class = FileHandler
--args = ('/var/log/radicale',)
-+args = ('/var/log/radicale/radicale.log',)
- formatter = full
-
-
diff --git a/www-apps/radicale/radicale-1.1.1.ebuild
b/www-apps/radicale/radicale-1.1.1.ebuild
deleted file mode 100644
index 4d26a7cd795..000
--- a/www-apps/radicale/radicale-1.1.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils distutils-r1 user
-
-MY_PN="Radicale"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A simple CalDAV calendar server"
-HOMEPAGE="http://www.radicale.org/";
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-RDIR=/var/lib/radicale
-LDIR=/var/log/radicale
-
-PATCHES=( "${FILESDIR}"/${P}-config.patch )
-
-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
- dodir ${RDIR}
- fowners radicale:radicale ${RDIR}
- diropts -m0755
- dodir ${LDIR}
- fowners radicale:radicale ${LDIR}
-
- # config file
- insinto /etc/${PN}
- doins config logging
-
- # fcgi and wsgi files
- exeinto /usr/share/${PN}
- doexe radicale.wsgi
- doexe radicale.fcgi
-
- 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."
-
- einfo "Radicale supports different authentication backends that depend
on external libraries."
- einfo "Please install"
- optfeature "LDAP auth" dev-python/python-ldap
- optfeature "PAM auth" dev-python/python-pam
- optfeature "HTTP auth" dev-python/requests
- optfeature "FastCGI mode" dev-python/flup
- optfeature "Database storage backend" dev-python/sqlalchemy
- einfo "Please note that some of these libraries are Python 2 only."
-}
