From 2f231eae98e5a92db81334c7dceddbf696a6c052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= Date: Wed, 7 Oct 2015 02:38:04 +0200 Subject: testing/radicale: upgrade to 1.0.1 --- testing/radicale/APKBUILD | 29 +++++++------ testing/radicale/radicale-0.10-systemwide.patch | 57 ------------------------- testing/radicale/radicale-systemwide.patch | 57 +++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 71 deletions(-) delete mode 100644 testing/radicale/radicale-0.10-systemwide.patch create mode 100644 testing/radicale/radicale-systemwide.patch (limited to 'testing') diff --git a/testing/radicale/APKBUILD b/testing/radicale/APKBUILD index 7cbd8a25b2..d0d7ce641e 100644 --- a/testing/radicale/APKBUILD +++ b/testing/radicale/APKBUILD @@ -1,6 +1,7 @@ +# Contributor: Sören Tempel # Maintainer: Natanael Copa pkgname=radicale -pkgver=0.10 +pkgver=1.0.1 pkgrel=0 pkgdesc="A simple CalDAV (calendar) and CardDAV (contact) server" url="http://radicale.org" @@ -14,9 +15,8 @@ pkggroups="radicale" install="$pkgname.pre-install" subpackages="" source="http://pypi.python.org/packages/source/R/Radicale/Radicale-$pkgver.tar.gz - radicale-0.10-systemwide.patch - radicale.initd - " + $pkgname-systemwide.patch + $pkgname.initd" _builddir="$srcdir"/Radicale-$pkgver prepare() { @@ -36,25 +36,26 @@ build() { package() { cd "$_builddir" - python setup.py install --skip-build --prefix=/usr --root="$pkgdir" \ - || return 1 + python setup.py install --skip-build --prefix=/usr \ + --root="$pkgdir" || return 1 + install -d "$pkgdir"/etc/radicale install -m640 config "$pkgdir"/etc/radicale/ || return 1 install -m640 logging "$pkgdir"/etc/radicale/ || return 1 + install -d -o radicale "$pkgdir"/var/lib/radicale \ "$pkgdir"/var/log/radicale || return 1 - - install -D -m755 "$srcdir"/radicale.initd \ + install -Dm755 "$srcdir"/radicale.initd \ "$pkgdir"/etc/init.d/radicale || return 1 } -md5sums="32655d8893962956ead0ad690cca6044 Radicale-0.10.tar.gz -1175007391c9a27c06f5830543710402 radicale-0.10-systemwide.patch +md5sums="e29e51df14bc8ca5a580998d5d592285 Radicale-1.0.1.tar.gz +1175007391c9a27c06f5830543710402 radicale-systemwide.patch 8f017c52eef88c16a8cde11265f482fc radicale.initd" -sha256sums="0c6522f5751685fc159524ed7acee811ccb9a582db2adb6bbb4da99ce0103d64 Radicale-0.10.tar.gz -68fd1b42ebd3c347012be28268cac26b63d6a9391fbd6df6f52fb5955b55ed79 radicale-0.10-systemwide.patch +sha256sums="e18a68d0793403e7591c725f7d2b83490dcc5f3cdd008bd75fe952311eee1b60 Radicale-1.0.1.tar.gz +68fd1b42ebd3c347012be28268cac26b63d6a9391fbd6df6f52fb5955b55ed79 radicale-systemwide.patch 05026eb64495b272f08692ea51d44722a5f109e35506d5aaaf3293c511d734a8 radicale.initd" -sha512sums="d223df0277e43081c9d5a95f30fb5ad5f852b24fc9493b089e36d82ee45ce1549b68e28bf8bdd12352bc3f087babc8f3b6d4e3fce87980e6ca5e3e75f4ace820 Radicale-0.10.tar.gz -4b8327147ae7b620a76eb3070d10b79aa823b5ab2aa53f6ef73adde83a4b2c78afc929d265f54fe747acbc0e524cdbfbb84b72c576f8ab029a3a410236ebd966 radicale-0.10-systemwide.patch +sha512sums="d7c0486c0e860e88a5d8c387a7b18c14dab242e9a6b1fc49f35443f74fd1709e7927d307f056ba4caa319550d89bd6f97908a4b6fe56d197b637aa86e82382bf Radicale-1.0.1.tar.gz +4b8327147ae7b620a76eb3070d10b79aa823b5ab2aa53f6ef73adde83a4b2c78afc929d265f54fe747acbc0e524cdbfbb84b72c576f8ab029a3a410236ebd966 radicale-systemwide.patch dd0e7641687592f5b6b053c6f7170bd81747467db690827906826684b8cafd3de9a065d5389d6f3beb5e02fa6ba6daf2bcd77022ec1505dc88abc2e8f6b17a57 radicale.initd" diff --git a/testing/radicale/radicale-0.10-systemwide.patch b/testing/radicale/radicale-0.10-systemwide.patch deleted file mode 100644 index b993c3ea30..0000000000 --- a/testing/radicale/radicale-0.10-systemwide.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/config b/config -index a2e36ec..6243fa2 100644 ---- a/config -+++ b/config -@@ -16,7 +16,7 @@ - # IPv6 syntax: [address]:port - # For example: 0.0.0.0:9999, [::]:9999 - # IPv6 adresses are configured to only allow IPv6 connections --#hosts = 0.0.0.0:5232 -+hosts = 127.0.0.1:5232 - - # Daemon flag - #daemon = False -@@ -28,10 +28,10 @@ - #ssl = False - - # SSL certificate path --#certificate = /etc/apache2/ssl/server.crt -+certificate = /etc/ssl/radicale/server.crt - - # SSL private key --#key = /etc/apache2/ssl/server.key -+key = /etc/ssl/radicale/server.key - - # SSL Protocol used. See python's ssl module for available values - #protocol = PROTOCOL_SSLv23 -@@ -146,7 +146,7 @@ - #custom_handler = - - # File for rights management from_file --#file = ~/.config/radicale/rights -+file = /var/lib/radicale/rights - - - [storage] -@@ -163,7 +163,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..] -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 - - diff --git a/testing/radicale/radicale-systemwide.patch b/testing/radicale/radicale-systemwide.patch new file mode 100644 index 0000000000..b993c3ea30 --- /dev/null +++ b/testing/radicale/radicale-systemwide.patch @@ -0,0 +1,57 @@ +diff --git a/config b/config +index a2e36ec..6243fa2 100644 +--- a/config ++++ b/config +@@ -16,7 +16,7 @@ + # IPv6 syntax: [address]:port + # For example: 0.0.0.0:9999, [::]:9999 + # IPv6 adresses are configured to only allow IPv6 connections +-#hosts = 0.0.0.0:5232 ++hosts = 127.0.0.1:5232 + + # Daemon flag + #daemon = False +@@ -28,10 +28,10 @@ + #ssl = False + + # SSL certificate path +-#certificate = /etc/apache2/ssl/server.crt ++certificate = /etc/ssl/radicale/server.crt + + # SSL private key +-#key = /etc/apache2/ssl/server.key ++key = /etc/ssl/radicale/server.key + + # SSL Protocol used. See python's ssl module for available values + #protocol = PROTOCOL_SSLv23 +@@ -146,7 +146,7 @@ + #custom_handler = + + # File for rights management from_file +-#file = ~/.config/radicale/rights ++file = /var/lib/radicale/rights + + + [storage] +@@ -163,7 +163,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..] +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 + + -- cgit v1.2.3