commit: 8620af5e31bbe72d74686a165134e34c3af0bd35 Author: Manuel Rüger <mrueg <AT> gentoo <DOT> org> AuthorDate: Tue Sep 15 10:08:23 2015 +0000 Commit: Manuel Rüger <mrueg <AT> gentoo <DOT> org> CommitDate: Tue Sep 15 10:08:23 2015 +0000 URL: https://gitweb.gentoo.org/dev/mrueg.git/commit/?id=8620af5e
app-office/radicale: Version bump. Remove old Package-Manager: portage-2.2.20.1 app-office/radicale/Manifest | 2 +- .../radicale/files/radicale-0.9-config.patch | 38 ---------------------- app-office/radicale/metadata.xml | 2 +- .../{radicale-0.10.ebuild => radicale-1.0.ebuild} | 38 +++++++++++++--------- 4 files changed, 25 insertions(+), 55 deletions(-) diff --git a/app-office/radicale/Manifest b/app-office/radicale/Manifest index 553a097..5ea5dc6 100644 --- a/app-office/radicale/Manifest +++ b/app-office/radicale/Manifest @@ -1 +1 @@ -DIST Radicale-0.10.tar.gz 43051 SHA256 0c6522f5751685fc159524ed7acee811ccb9a582db2adb6bbb4da99ce0103d64 SHA512 d223df0277e43081c9d5a95f30fb5ad5f852b24fc9493b089e36d82ee45ce1549b68e28bf8bdd12352bc3f087babc8f3b6d4e3fce87980e6ca5e3e75f4ace820 WHIRLPOOL 9e4b1beae792e47badb7b33bf343e442f92e9add9d3f877b8796f0c51eda448b0ed975bb9ad99d8d18a69c106813595a16ec108889cefffb6504c8fcae02450f +DIST radicale-1.0.tar.gz 50348 SHA256 2a6fddc5c3c4119daad28f2d52f33abf91da8d464dd447109c23e3b9608a2df8 SHA512 fe925acb98b9db9d41d1b92e4e203effe80a2cf6bf2a2524a05f81950ffe1911be30d81058bf3f90d5c9b318b6693802ff55cf6edf9a649aa28226ac4b407881 WHIRLPOOL 2c58bf8904ef6ef2d6205a6e3b6daecc5cb91eb9439af2298e5c8d59f1cbff5b7c2441a8634c39545d828f2677f52e139207d515bf32bfe1231b0145631b4f85 diff --git a/app-office/radicale/files/radicale-0.9-config.patch b/app-office/radicale/files/radicale-0.9-config.patch deleted file mode 100644 index d2cc315..0000000 --- a/app-office/radicale/files/radicale-0.9-config.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- config.old 2015-01-12 02:14:10.653980565 +0100 -+++ config 2015-01-12 02:16:06.776971337 +0100 -@@ -107,13 +107,13 @@ - [rights] - # Rights backend - # Value: None | authenticated | owner_only | owner_write | from_file | custom --type = None -+type = owner_only - - # Custom rights handler - custom_handler = - - # File for rights management from_file --file = ~/.config/radicale/rights -+file = /etc/radicale/rights - - - [storage] -@@ -125,7 +125,7 @@ - custom_handler = - - # Folder for storing local collections, created if not present --filesystem_folder = ~/.config/radicale/collections -+filesystem_folder = /var/lib/radicale/collections - - # Database URL for SQLAlchemy - # dialect+driver://user:password@host/dbname[?key=value..] ---- logging.old 2015-01-12 02:14:15.084980213 +0100 -+++ logging 2015-01-12 02:14:24.519979463 +0100 -@@ -45,7 +45,7 @@ - [handler_file] - # File handler - class = FileHandler --args = ('/var/log/radicale',) -+args = ('/var/log/radicale/radicale.log',) - formatter = full - - diff --git a/app-office/radicale/metadata.xml b/app-office/radicale/metadata.xml index 28ffef1..54dc5f4 100644 --- a/app-office/radicale/metadata.xml +++ b/app-office/radicale/metadata.xml @@ -6,6 +6,6 @@ <name>Manuel Rüger</name> </maintainer> <use> - <flag name='mysql'>Enable support for using MySQL-Databases as storage backend.</flag> + <flag name='http_auth'>Enable support for HTTP authentication.</flag> </use> </pkgmetadata> diff --git a/app-office/radicale/radicale-0.10.ebuild b/app-office/radicale/radicale-1.0.ebuild similarity index 68% rename from app-office/radicale/radicale-0.10.ebuild rename to app-office/radicale/radicale-1.0.ebuild index 7fe05bb..99e2c43 100644 --- a/app-office/radicale/radicale-0.10.ebuild +++ b/app-office/radicale/radicale-1.0.ebuild @@ -4,7 +4,7 @@ EAPI=5 -# radicale also supports python3_{3,4} +# radicale also supports python3 # but python-ldap is blocking here PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE="ssl?" @@ -16,36 +16,42 @@ 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" +SRC_URI="https://github.com/Kozea/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="fastcgi git ldap mysql sqlite postgres ssl" +IUSE="fastcgi git http_auth ldap mysql sqlite pam postgres ssl test" + +RESTRICT="test" # fail here RDEPEND=" fastcgi? ( $(python_gen_cond_dep 'dev-python/flup[${PYTHON_USEDEP}]' python2_7) - $(python_gen_cond_dep 'dev-python/flipflop[${PYTHON_USEDEP}]' python3_{3,4}) - ) + $(python_gen_cond_dep 'dev-python/flipflop[${PYTHON_USEDEP}]' python3_4) ) git? ( dev-python/dulwich[${PYTHON_USEDEP}] ) + http_auth? ( dev-python/requests[${PYTHON_USEDEP}] ) ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) mysql? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] dev-python/mysql-python[${PYTHON_USEDEP}] ) sqlite? ( dev-python/sqlalchemy[${PYTHON_USEDEP},sqlite] ) + pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) postgres? ( dev-python/sqlalchemy[${PYTHON_USEDEP}] dev-python/psycopg:2[${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 +DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] + test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/sqlalchemy[${PYTHON_USEDEP}] + dev-python/dulwich[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] )" S=${WORKDIR}/${MY_P} RDIR=/var/lib/radicale LDIR=/var/log/radicale -PATCHES=( "${FILESDIR}"/${P}-config.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.10-config.patch ) + +DOCS=( NEWS.rst TODO.rst ) pkg_setup() { enewgroup radicale @@ -61,14 +67,12 @@ python_install_all() { # directories diropts -m0750 - dodir ${RDIR} - fowners radicale:radicale ${RDIR} - dodir ${LDIR} - fowners radicale:radicale ${LDIR} + dodir ${RDIR} ${LDIR} + fowners radicale:radicale ${RDIR} ${LDIR} # config file insinto /etc/${PN} - doins config logging + doins config logging rights # fcgi and wsgi files insinto /usr/share/${PN} @@ -78,6 +82,10 @@ python_install_all() { distutils-r1_python_install_all } +python_test() { + nosetests tests || die +} + pkg_postinst() { einfo "Radicale now supports WSGI." einfo "A sample wsgi-script has been put into ${ROOT}usr/share/${PN}."