[gentoo-commits] dev/graaff:master commit in: app-office/radicale/files/, app-office/radicale/

["Hans de Graaff" <graaff@gentoo.org>]

commit:     b4657ba4bfcaee51226a7efd178c1835b921b757
Author:     Hans de Graaff <hans <AT> degraaff <DOT> org>
AuthorDate: Sun Oct  6 15:59:58 2013 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Oct  6 15:59:58 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/graaff.git;a=commit;h=b4657ba4

Update from bug 322811.

Package-Manager: portage-2.2.1

---
 app-office/radicale/ChangeLog                      |  8 ++-
 app-office/radicale/Manifest                       | 11 +---
 .../radicale/files/radicale-0.8-config.patch       | 77 ++++++++++++++++++++++
 app-office/radicale/metadata.xml                   |  5 ++
 app-office/radicale/radicale-0.8.ebuild            | 75 +++++++++++++++++++++
 5 files changed, 165 insertions(+), 11 deletions(-)

diff --git a/app-office/radicale/ChangeLog b/app-office/radicale/ChangeLog
index fd8ba38..573946d 100644
--- a/app-office/radicale/ChangeLog
+++ b/app-office/radicale/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for app-office/radicale
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*radicale-0.8 (06 Oct 2013)
+
+  06 Oct 2013; Hans de Graaff <graaff@gentoo.org> +radicale-0.8.ebuild,
+  +files/radicale-0.8-config.patch:
+  Update from bug 322811.
+
 *radicale-0.7.1 (04 Aug 2012)
 
   04 Aug 2012; Hans de Graaff <graaff@gentoo.org> +radicale-0.7.1.ebuild:

diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest
index 338aab8..b17b4f3 100644
--- a/app-office/radicale/Manifest
+++ b/app-office/radicale/Manifest
@@ -1,12 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST Radicale-0.7.1.tar.gz 35355 SHA256 36e076b8c54be9df61a8434e9670d852429dcae557fadb77de23e762258bb8e4 SHA512 00ad9788b39a33f94e656e9104e1a81a9052b182021ea486d865a826c8e8711d58476beb35b89fd46371166886d9a312f417db49d81293d0434af0261c1636e1 WHIRLPOOL a353dad90c3391e104b113479b975e4a29049e7c4301122c6ed064233cc757661ea56ee92fbfe21c97e2702787bd8f639ae93418d68ac3abacb744848d909fa1
 DIST Radicale-0.7.tar.gz 34061 SHA256 f3d17d16bac4cbeedc5e66a8b711f29d51309e9264a9ef930b5d466503794c09 SHA512 7c7fb9ad0b9820d490f615af9193bbbbb204aee9f940264221d2e74ef72ffcc28bdb84b97dcd225efe117d346e386465c25c1798875831587033341e432716f0 WHIRLPOOL e6322e41c0ebcf19eb8874f574a797a4aa4c63822587be4c59ebce105c2b19b9e9bc1dc09890f5a5d0a5d95a6029ab6ab8ea0f82362d3f893a65d91d42482e22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF4EAREIAAYFAlAcwaAACgkQiIP6VqMIqNeDxQD9Ey9TZRN+lBymoOguWbuQxmPa
-duuvkpCTH9oCgrDHf+cA/iyvIMT+bal/O1kjCrJRJgks+K4ClAO4F1uPgeN5BeNn
-=Bav1
------END PGP SIGNATURE-----
+DIST Radicale-0.8.tar.gz 39813 SHA256 e8c0df5239c22f2687a09eca7d53c318706648aff72b620849ed3f7540bc1941 SHA512 8b4db28b1fedc78e6d638a8e00dbbe0f37ada39686aae4afdf427461bbd7189d8222adf417fa5e546d9f6a6c7ff0c08eb3aa8609e9fb57c17a9e30161eabba85 WHIRLPOOL c705914db79503215f86e40545950e0fb07d439bc89372849865fece597eb863c28bd13255206a6e298308ba0a819b2e065ca05b592fc7bbb0c2c44896322138

diff --git a/app-office/radicale/files/radicale-0.8-config.patch b/app-office/radicale/files/radicale-0.8-config.patch
new file mode 100644
index 0000000..aa867bc
--- /dev/null
+++ b/app-office/radicale/files/radicale-0.8-config.patch
@@ -0,0 +1,77 @@
+From 6887e996ad771d22659c0eb8cbca94c936fdb10a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ren=C3=A9=20=27Necoro=27=20Neumann?= <gentoo@necoro.eu>
+Date: Sun, 15 Sep 2013 14:02:32 +0200
+Subject: Fix the config for Gentoo's default needs.
+
+    * Set pathes
+    * Set rights.type to 'owner_only' to model pre-0.8 behavior
+      (None means 'everyone is allowed everything')
+    * Remove 'public_users' and 'private_users' as they are obsolete.
+---
+ config  | 13 ++++---------
+ logging |  2 +-
+ 2 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/config b/config
+index 453a45e..10c1595 100644
+--- a/config
++++ b/config
+@@ -30,7 +30,7 @@ dns_lookup = True
+ # Root URL of Radicale (starting and ending with a slash)
+ base_prefix = /
+ # Message displayed in the client when a password is needed
+-realm = Radicale - Password Required lol
++realm = Radicale - Password Required
+ 
+ 
+ [encoding]
+@@ -45,11 +45,6 @@ stock = utf-8
+ # Value: None | htpasswd | IMAP | LDAP | PAM | courier | http
+ type = None
+ 
+-# Usernames used for public collections, separated by a comma
+-public_users = public
+-# Usernames used for private collections, separated by a comma
+-private_users = private
+-
+ # Htpasswd filename
+ htpasswd_filename = /etc/radicale/users
+ # Htpasswd encryption method
+@@ -97,10 +92,10 @@ http_password_parameter =
+ [rights]
+ # Rights management method
+ # Value: None | owner_only | owner_write | from_file
+-type = None
++type = owner_only
+ 
+ # File for rights management from_file
+-file = ~/.config/radicale/rights
++file = /etc/radicale/rights
+ 
+ 
+ [storage]
+@@ -109,7 +104,7 @@ file = ~/.config/radicale/rights
+ type = filesystem
+ 
+ # 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
+index f4efb88..b10f88c 100644
+--- 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
+ 
+ 
+-- 
+1.8.1.5
+

diff --git a/app-office/radicale/metadata.xml b/app-office/radicale/metadata.xml
index f977299..d53c88f 100644
--- a/app-office/radicale/metadata.xml
+++ b/app-office/radicale/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>graaff@gentoo.org</email></maintainer>
+<use>
+  <flag name="sql">
+    Add SQL support.
+  </flag>
+</use>
 </pkgmetadata>

diff --git a/app-office/radicale/radicale-0.8.ebuild b/app-office/radicale/radicale-0.8.ebuild
new file mode 100644
index 0000000..9881005
--- /dev/null
+++ b/app-office/radicale/radicale-0.8.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+# radicale also supports python3_{2,3}
+# but python-ldap and flup are blocking here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?"
+
+inherit 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="~x86 ~amd64"
+IUSE="fastcgi ldap sql ssl"
+
+RDEPEND="ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
+		fastcgi? ( dev-python/flup[${PYTHON_USEDEP}] )
+		sql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] )"
+
+# 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
+
+PATCHES=( "${FILESDIR}"/${P}-config.patch )
+
+pkg_setup() {
+	enewgroup radicale
+	enewuser radicale -1 -1 ${RDIR} radicale
+}
+
+python_install_all() {
+	# delete the useless .rst, so that it is not installed
+	rm README.rst
+
+	# init file
+	newinitd "${FILESDIR}"/radicale.init.d radicale || die
+
+	# directories
+	diropts -m0750
+	dodir ${RDIR}; fowners radicale:radicale ${RDIR}
+	dodir ${LDIR}; fowners radicale:radicale ${LDIR}
+
+	# config file
+	insinto /etc/${PN}
+	doins config logging || die
+
+	# fcgi and wsgi files
+	insinto /usr/share/${PN}
+	doins radicale.wsgi
+	use fastcgi && doins radicale.fcgi
+
+	distutils-r1_python_install_all
+}
+
+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."
+}