app-office/radicale: Bump to version 0.7.1 / now move logs to its own directory

4 files changed, 29 insertions, 11 deletions

diff --git a/app-office/radicale/ChangeLog b/app-office/radicale/ChangeLog
index 3b3f1d88f..8fb2c06ab 100644
--- a/app-office/radicale/ChangeLog
+++ b/app-office/radicale/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*radicale-0.7.1 (11 Sep 2012)
+
+  11 Sep 2012; René Neumann (Necoro) <gentoo@necoro.eu>
+  -radicale-0.6.4.ebuild, +radicale-0.7.1.ebuild, files/radicale.init.d:
+  Bump to version 0.7.1 / now move logs to its own directory
+
   22 Jun 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   radicale-0.6.4.ebuild:
   inherit user eclass instead of eutils eclass for enewuser
diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest
index 98f3a59c1..73a89bead 100644
--- a/app-office/radicale/Manifest
+++ b/app-office/radicale/Manifest
@@ -1,5 +1,5 @@
-AUX radicale.init.d 650 RMD160 4c250c0c3967db0cdc8387419fd3f435efe9403e SHA1 a5c604f08d3829d374d6a08bb00529a571cc4b51 SHA256 9cf1ef81ab063759b72a54012aa33052f92ad69598943522e1c03d826dbace07
-DIST Radicale-0.6.4.tar.gz 30994 RMD160 9da7aede8ec48fa9725a85985cd3e6e3bd277689 SHA1 15854dd3a7070ef8438573b4a9fef92a2b46b8ab SHA256 83fd6d1b958cd2eae7fa8d773db508e1a4f87266e48346016d03e2b2c7eb80ea
-EBUILD radicale-0.6.4.ebuild 1492 RMD160 391306bbba3b476bf1f5e27111126ae0f3e8c0df SHA1 00544c9b5b9bdd9cdfa570e9b8525875f3490cfa SHA256 0657580bcabd1b193c52ccc1031deb6b7a3756468ee530aeb979da86f42d138a
-MISC ChangeLog 950 RMD160 2101b33414329abc55eaa18873505a34f2354559 SHA1 e464db72eb9da86858a208f1f8f07dfd7288d9eb SHA256 927ee25b24b4ace2a928c08849179f25843428932bd9e80df5e93cb930c88497
-MISC metadata.xml 208 RMD160 c18611400760e42bdd001905be0a63c2e963bcea SHA1 595816105cac477cb85792a182e15888029118a1 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82
+AUX radicale.init.d 576 SHA256 8090c06d040f3f3cde4d031920136b8f9db85010566fcfe9036a764223fb09bd SHA512 906b0a525c44df5872f51493567b51f4ab83fd4879407275ecfc43c19efa41c40b6a5fd41612972349b1eb00357337be07ee2013a18e6673e2600b1f04fb40bf WHIRLPOOL 0791d62f25975205c1d48b04749468d3dd224980fac7625ebdf4f0def51fa00a12e02b42b3409e6b280d434a04412dbc9b7e5849430cc22f7192d386a2f41795
+DIST Radicale-0.7.1.tar.gz 35355 SHA256 36e076b8c54be9df61a8434e9670d852429dcae557fadb77de23e762258bb8e4 SHA512 00ad9788b39a33f94e656e9104e1a81a9052b182021ea486d865a826c8e8711d58476beb35b89fd46371166886d9a312f417db49d81293d0434af0261c1636e1 WHIRLPOOL a353dad90c3391e104b113479b975e4a29049e7c4301122c6ed064233cc757661ea56ee92fbfe21c97e2702787bd8f639ae93418d68ac3abacb744848d909fa1
+EBUILD radicale-0.7.1.ebuild 1964 SHA256 5fab56fddf69db2ec176fad78912217cca5fc1e374f3af6bc31d34fc30cab5fd SHA512 e20e3faf2d65f7e880d03d79c98324c1872665c43e4205f510969c0f92d7df1176c99e6e8f2e84d2fcb36d76a9c6eed078aeb6465a9cb5779cd5e3163601cb17 WHIRLPOOL 9e55316330deff3cbdcc8ce1df7be6f0471e178d7dd8dc76397e3341331a5d3d82d2f7a41a2d140d1fd98043b4da7ebb0955f44678b405c9518c5492a9a147eb
+MISC ChangeLog 1173 SHA256 693ed7790858194ae1e73e56e6eb1956fcba5b15da8fe9f7fbc9366986f94f4c SHA512 ab10b6ecba025c539143ccd019d50e83346c8de85202ea85ffc3ac689629de57122120a3890284eb1842b149cd745a14d362841623cd216374ea3cc6cf582a29 WHIRLPOOL 8e2110af503105919edd3ba4fee828ea5ce88d2f4e8eda4a2590a839156ec0b17835756bb5c761158096293b143b313abb8bfab13c5bf4aba8a4e90d26c51aaa
+MISC metadata.xml 208 SHA256 c4841c87f0c2b9b5e679a27dc72180be8d508fb3f5df0fbab2ec2c805c0a6d82 SHA512 21d90d4547c76c80e50e134359dfbec42b158bbc16e4741738bdde5f67b7926d158dae1905948a477405b74e754ce4ed63cad910f220a709db8dfccf160e5288 WHIRLPOOL 33ec53f42c7a8c4c419989bd94e083c417574463e19c9c1322e6b96d0f5a6a52e3dd69fbedf2d11a7a77d24a93b81f3a604b6b33cac62548389537bf3e42df0e
diff --git a/app-office/radicale/files/radicale.init.d b/app-office/radicale/files/radicale.init.d
index ebbe58de7..8e3e94a64 100644
--- a/app-office/radicale/files/radicale.init.d
+++ b/app-office/radicale/files/radicale.init.d
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -11,8 +11,6 @@ depend() {
 }
 
 start() {
-    touch /var/log/radicale
-    chown radicale:radicale /var/log/radicale
     ebegin "Starting radicale"
         start-stop-daemon --start --quiet --background \
         --user radicale \
diff --git a/app-office/radicale/radicale-0.6.4.ebuild b/app-office/radicale/radicale-0.7.1.ebuild
index a8bf4a2f0..4309e408b 100644
--- a/app-office/radicale/radicale-0.6.4.ebuild
+++ b/app-office/radicale/radicale-0.7.1.ebuild
@@ -26,9 +26,15 @@ RDEPEND="ssl? ( >=dev-lang/python-2.6.6[ssl] )
 		ldap? ( dev-python/python-ldap )
 		fastcgi? ( dev-python/flup )"
 
+# radicale's authentication against PAM is not possible here:
+# Gentoo has not included the package
+# also it seems old, which is bad with respect to
+# http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-1502
+
 S=${WORKDIR}/${MY_P}
 
 RDIR=/var/lib/radicale
+LDIR=/var/log/radicale
 
 pkg_setup() {
 	enewgroup radicale
@@ -36,8 +42,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	sed -i -e "s:^folder = .*$:folder = ${RDIR}:g" \
+	# fix pathes
+	sed -i -e "s:^\(filesystem_folder = \).*$:\1${RDIR}:g" \
 				config || die
+	sed -i -e "s;^\(args = ('/var/log/radicale\);\1/radicale.log;" \
+				logging || die
+	distutils_src_prepare
 }
 
 src_install() {
@@ -49,8 +59,10 @@ src_install() {
 	# init file
 	newinitd "${FILESDIR}"/radicale.init.d radicale || die
 
-	keepdir ${RDIR}
-	fowners radicale:radicale ${RDIR}
+	# directories
+	diropts -m0750
+	dodir ${RDIR}; fowners radicale:radicale ${RDIR}
+	dodir ${LDIR}; fowners radicale:radicale ${LDIR}
 
 	# config file
 	insinto /etc/${PN}
@@ -66,4 +78,6 @@ pkg_postinst() {
 	einfo "Radicale now supports WSGI."
 	einfo "A sample wsgi-script has been put into ${ROOT}usr/share/${PN}."
 	use fastcgi && einfo "You will also find there an example fcgi-script."
+
+	distutils_pkg_postinst
 }