From 103a73605ceceab52f62d7b1934575dd5a117614 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Wed, 21 Aug 2019 21:46:25 -0300
Subject: testing/radicale: upgrade to 2.1.11

---
 testing/radicale/APKBUILD       | 13 ++++---------
 testing/radicale/radicale.initd | 20 +++++++++++++-------
 2 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'testing/radicale')

diff --git a/testing/radicale/APKBUILD b/testing/radicale/APKBUILD
index 63634d6916..5b00824583 100644
--- a/testing/radicale/APKBUILD
+++ b/testing/radicale/APKBUILD
@@ -1,15 +1,13 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=radicale
-pkgver=2.1.10
-pkgrel=2
+pkgver=2.1.11
+pkgrel=0
 pkgdesc="A simple CalDAV (calendar) and CardDAV (contact) server"
 url="http://radicale.org"
 arch="noarch"
 license="GPL-3.0-or-later"
 depends="python3 py3-vobject py3-dateutil py3-setuptools"
-# py3-setuptools required for "from pkg_resources import load_entry_point"
-makedepends="py-setuptools"
 pkgusers="radicale"
 pkggroups="radicale"
 install="$pkgname.pre-install"
@@ -20,13 +18,10 @@ subpackages="$pkgname-openrc"
 builddir="$srcdir/Radicale-$pkgver"
 
 build() {
-	cd "$builddir"
 	python3 setup.py build
 }
 
 package() {
-	cd "$builddir"
-
 	python3 setup.py install --skip-build --prefix=/usr \
 		--root="$pkgdir"
 
@@ -40,5 +35,5 @@ package() {
 		"$pkgdir"/etc/init.d/radicale
 }
 
-sha512sums="30fac6639e56bbd10664330d84ebba28b34005b4b4b4c5a6c22f53cb7e810ba4961cbd314e62fe33538674a2d4b45f14751f36ef5fa2ae2b7d44c1b1158f6e1c  Radicale-2.1.10.tar.gz
-dd0e7641687592f5b6b053c6f7170bd81747467db690827906826684b8cafd3de9a065d5389d6f3beb5e02fa6ba6daf2bcd77022ec1505dc88abc2e8f6b17a57  radicale.initd"
+sha512sums="e85f12664d3db6b911dd534eaddd15c498ca4f641cc15523644300aca8b1ef3f6fd4d9645857235502f03a7903111905537b04f9a6fdbde1a60fbb720d377733  Radicale-2.1.11.tar.gz
+7774317de5007a76d9ff53a8998392588012a42dfe28d06f6405763bf352aabf2ca27173dc75a809985b082148b78d507b7764cc1164999690265085ab767cd3  radicale.initd"
diff --git a/testing/radicale/radicale.initd b/testing/radicale/radicale.initd
index d5a7d7be86..de89f2de1e 100644
--- a/testing/radicale/radicale.initd
+++ b/testing/radicale/radicale.initd
@@ -1,16 +1,22 @@
 #!/sbin/openrc-run
+supervisor=supervise-daemon
+
+name=radicale
+description="A simple CalDAV (calendar) and CardDAV (contact) server"
 
-pidfile=/var/run/radicale.pid
-start_stop_daemon_args="--user radicale"
 command=/usr/bin/radicale
-command_args="--foreground"
-command_background=yes
+command_args_foreground="--foreground"
+
+command_user=radicale:radicale
 
 depend() {
 	use net
 	need localmount
 }
 
-#start_pre() {
-#	checkpath --directory "${pidfile%/*}"
-#}
+pre_start() {
+	checkpath --directory --owner radicale /var/lib/radicale
+	checkpath --directory --owner radicale /var/log/radicale
+	checkpath --file --owner root:radicale --mode 0640 /etc/radicale/config
+	checkpath --file --owner root:radicale --mode 0640 /etc/radicale/logging
+}
-- 
cgit v1.2.3