Date: Monday, April 23, 2018 @ 21:59:44 Author: dvzrv Revision: 317465
archrelease: copy trunk to community-any Added: radicale/repos/community-any/PKGBUILD (from rev 317464, radicale/trunk/PKGBUILD) radicale/repos/community-any/radicale-sysusers.conf (from rev 317464, radicale/trunk/radicale-sysusers.conf) radicale/repos/community-any/radicale-tmpfiles.conf (from rev 317464, radicale/trunk/radicale-tmpfiles.conf) radicale/repos/community-any/radicale.service (from rev 317464, radicale/trunk/radicale.service) Deleted: radicale/repos/community-any/PKGBUILD radicale/repos/community-any/fix-flake8-test.diff radicale/repos/community-any/radicale-sysusers.conf radicale/repos/community-any/radicale-tmpfiles.conf radicale/repos/community-any/radicale.service ------------------------+ PKGBUILD | 133 ++++++++++++++++++++++------------------------- fix-flake8-test.diff | 24 -------- radicale-sysusers.conf | 4 - radicale-tmpfiles.conf | 6 +- radicale.service | 50 ++++++++--------- 5 files changed, 93 insertions(+), 124 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-04-23 21:59:34 UTC (rev 317464) +++ PKGBUILD 2018-04-23 21:59:44 UTC (rev 317465) @@ -1,70 +0,0 @@ -# Maintainer: Moritz Lipp <m...@pwmt.org> -# Co-Maintainer: fordprefect <fordpref...@dukun.de> -# Contributor: Thor77 <tho...@thor77.org> - -pkgname=radicale -_name=Radicale -pkgver=2.1.8 -pkgrel=5 -pkgdesc='Simple calendar (CalDAV) and contact (CardDAV) server' -arch=('any') -url="http://www.radicale.org/" -license=('GPL3') -depends=('python-bcrypt' 'python-passlib' 'python-setuptools' 'python-vobject') -checkdepends=('python-bcrypt' 'python-pytest-cov' 'python-pytest-flake8' 'python-pytest-isort' 'python-pytest-runner') -backup=('etc/radicale/config') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Kozea/${pkgname}/archive/${pkgver}.tar.gz" - 'fix-flake8-test.diff' - "${pkgname}-sysusers.conf" - "${pkgname}-tmpfiles.conf" - "${pkgname}.service") -sha512sums=('70d7c890a733fb27d007fa593d0140bfd3bde1ff46235252a2cdd3ceaf3bc9f998acb62e131f9bc71aa1c55f51c297e4f494cb22f8cba3c5d8d90069e4957c87' - 'f951fff9187448ea3052395b6999f19cfc48dbf5cfb24359f646e1fba8a3556b40c7174f91deee4a18f5794c5fd8e45ee555a569e4320d758712ee581df6feb1' - '444489ba929680490884e338acc311fb61d81f9d9f0282c92c40a80317af9e61123e4764e803d1698876417170efd40bfe7f56408570891c4e426de3be17c302' - '4570ed393b73bc5a3fd571947acae78b96b5e17f659e3169f542b9c481635680c724d5c6c0952661fae063caf04c786afe7043c5052945e7a00bb66326dec016' - '6a3452009bebc0f8680ea8e64b9a398c04f3fb6b20752c377392e22641845a04dbfda78d586271c9a25bd7d5ba42b7a8f74774afed68732f19ddd764f53e11cc') - -prepare() { - mv -v ${_name}-${pkgver} ${pkgname}-${pkgver} - cd "${pkgname}-${pkgver}" - # issue with implicit exception handling: - # https://github.com/Kozea/Radicale/issues/780 - patch -Np1 -i "${srcdir}/fix-flake8-test.diff" -} - -build() { - cd "${pkgname}-${pkgver}" - python setup.py build -} - -# disabling checks because of broken python-pycodestyle -#check() { -# cd "${pkgname}-${pkgver}" -# python setup.py test -#} - -package() { - cd "${pkgname}-${pkgver}" - python setup.py install --skip-build \ - --optimize=1 \ - --prefix=/usr \ - --root="${pkgdir}" - # config - install -vDm 644 config "${pkgdir}/etc/${pkgname}/config" - # fcgi/wsgi - install -t "${pkgdir}/usr/share/${pkgname}/" \ - -vDm 644 "${pkgname}.fcgi" \ - -vDm 644 "${pkgname}.wsgi" - # systemd service - install -vDm 644 "${srcdir}/${pkgname}.service" \ - "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" - # sysusers.d - install -vDm 644 "${srcdir}/${pkgname}-sysusers.conf" \ - "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" - # tmpfiles.d - install -vDm 644 "${srcdir}/${pkgname}-tmpfiles.conf" \ - "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" - # docs - install -t "${pkgdir}/usr/share/doc/${pkgname}/" -vDm644 {NEWS,README}.md -} - Copied: radicale/repos/community-any/PKGBUILD (from rev 317464, radicale/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-04-23 21:59:44 UTC (rev 317465) @@ -0,0 +1,63 @@ +# Maintainer: Moritz Lipp <m...@pwmt.org> +# Co-Maintainer: fordprefect <fordpref...@dukun.de> +# Contributor: Thor77 <tho...@thor77.org> + +pkgname=radicale +_name=Radicale +pkgver=2.1.9 +pkgrel=1 +pkgdesc='Simple calendar (CalDAV) and contact (CardDAV) server' +arch=('any') +url="http://www.radicale.org/" +license=('GPL3') +depends=('python-bcrypt' 'python-passlib' 'python-setuptools' 'python-vobject') +checkdepends=('python-bcrypt' 'python-pytest-cov' 'python-pytest-flake8' 'python-pytest-isort' 'python-pytest-runner') +backup=('etc/radicale/config') +source=("${pkgname}-${pkgver}.tar.gz::https://github.com/Kozea/${pkgname}/archive/${pkgver}.tar.gz" + "${pkgname}-sysusers.conf" + "${pkgname}-tmpfiles.conf" + "${pkgname}.service") +sha512sums=('30df36772f4dd38c9c79ecd9669da8b40c7284afa9e2949c174c159838c33a66edec1a49adf7c110017dc83c592415be6fa43e2de6007d7e154b8707773c4a44' + '444489ba929680490884e338acc311fb61d81f9d9f0282c92c40a80317af9e61123e4764e803d1698876417170efd40bfe7f56408570891c4e426de3be17c302' + '4570ed393b73bc5a3fd571947acae78b96b5e17f659e3169f542b9c481635680c724d5c6c0952661fae063caf04c786afe7043c5052945e7a00bb66326dec016' + '6a3452009bebc0f8680ea8e64b9a398c04f3fb6b20752c377392e22641845a04dbfda78d586271c9a25bd7d5ba42b7a8f74774afed68732f19ddd764f53e11cc') + +prepare() { + mv -v ${_name}-${pkgver} ${pkgname}-${pkgver} +} + +build() { + cd "${pkgname}-${pkgver}" + python setup.py build +} + +check() { + cd "${pkgname}-${pkgver}" + python setup.py test +} + +package() { + cd "${pkgname}-${pkgver}" + python setup.py install --skip-build \ + --optimize=1 \ + --prefix=/usr \ + --root="${pkgdir}" + # config + install -vDm 644 config "${pkgdir}/etc/${pkgname}/config" + # fcgi/wsgi + install -t "${pkgdir}/usr/share/${pkgname}/" \ + -vDm 644 "${pkgname}.fcgi" \ + -vDm 644 "${pkgname}.wsgi" + # systemd service + install -vDm 644 "${srcdir}/${pkgname}.service" \ + "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" + # sysusers.d + install -vDm 644 "${srcdir}/${pkgname}-sysusers.conf" \ + "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf" + # tmpfiles.d + install -vDm 644 "${srcdir}/${pkgname}-tmpfiles.conf" \ + "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf" + # docs + install -t "${pkgdir}/usr/share/doc/${pkgname}/" -vDm 644 {NEWS,README}.md +} + Deleted: fix-flake8-test.diff =================================================================== --- fix-flake8-test.diff 2018-04-23 21:59:34 UTC (rev 317464) +++ fix-flake8-test.diff 2018-04-23 21:59:44 UTC (rev 317465) @@ -1,24 +0,0 @@ -diff -ruN Radicale-2.1.8-a/radicale/__init__.py Radicale-2.1.8-b/radicale/__init__.py ---- Radicale-2.1.8-a/radicale/__init__.py 2017-09-24 02:01:14.000000000 +0200 -+++ Radicale-2.1.8-b/radicale/__init__.py 2018-02-04 14:08:39.257626655 +0100 -@@ -120,7 +120,7 @@ - try: - self.server_bind() - self.server_activate() -- except: -+ except Exception: - self.server_close() - raise - -diff -ruN Radicale-2.1.8-a/radicale/storage.py Radicale-2.1.8-b/radicale/storage.py ---- Radicale-2.1.8-a/radicale/storage.py 2017-09-24 02:01:14.000000000 +0200 -+++ Radicale-2.1.8-b/radicale/storage.py 2018-02-04 14:09:06.850699075 +0100 -@@ -779,7 +779,7 @@ - (path, e)) from e - tmp.close() - os.replace(tmp.name, path) -- except: -+ except Exception: - tmp.close() - os.remove(tmp.name) - raise Deleted: radicale-sysusers.conf =================================================================== --- radicale-sysusers.conf 2018-04-23 21:59:34 UTC (rev 317464) +++ radicale-sysusers.conf 2018-04-23 21:59:44 UTC (rev 317465) @@ -1,2 +0,0 @@ -u radicale - "Radicale user" -m radicale http Copied: radicale/repos/community-any/radicale-sysusers.conf (from rev 317464, radicale/trunk/radicale-sysusers.conf) =================================================================== --- radicale-sysusers.conf (rev 0) +++ radicale-sysusers.conf 2018-04-23 21:59:44 UTC (rev 317465) @@ -0,0 +1,2 @@ +u radicale - "Radicale user" +m radicale http Deleted: radicale-tmpfiles.conf =================================================================== --- radicale-tmpfiles.conf 2018-04-23 21:59:34 UTC (rev 317464) +++ radicale-tmpfiles.conf 2018-04-23 21:59:44 UTC (rev 317465) @@ -1,3 +0,0 @@ -d /etc/radicale 0750 root radicale - -z /etc/radicale/config 0644 root radicale - -d /var/lib/radicale 0750 radicale radicale - Copied: radicale/repos/community-any/radicale-tmpfiles.conf (from rev 317464, radicale/trunk/radicale-tmpfiles.conf) =================================================================== --- radicale-tmpfiles.conf (rev 0) +++ radicale-tmpfiles.conf 2018-04-23 21:59:44 UTC (rev 317465) @@ -0,0 +1,3 @@ +d /etc/radicale 0750 root radicale - +z /etc/radicale/config 0644 root radicale - +d /var/lib/radicale 0750 radicale radicale - Deleted: radicale.service =================================================================== --- radicale.service 2018-04-23 21:59:34 UTC (rev 317464) +++ radicale.service 2018-04-23 21:59:44 UTC (rev 317465) @@ -1,25 +0,0 @@ -[Unit] -Description=radicale - A simple CalDAV (calendar) and CardDAV (contact) server -After=syslog.target network.target -Requires=network.target - -[Service] -Type=simple -ExecStart=/usr/bin/radicale -f -User=radicale -Group=radicale -Restart=on-failure -UMask=0027 -PrivateTmp=yes -PrivateDevices=yes -ProtectSystem=full -ProtectHome=yes -ProtectKernelTunables=yes -ProtectKernelModules=yes -ProtectControlGroups=yes -NoNewPrivileges=yes -ReadWriteDirectories=/var/lib/radicale - -[Install] -WantedBy=multi-user.target - Copied: radicale/repos/community-any/radicale.service (from rev 317464, radicale/trunk/radicale.service) =================================================================== --- radicale.service (rev 0) +++ radicale.service 2018-04-23 21:59:44 UTC (rev 317465) @@ -0,0 +1,25 @@ +[Unit] +Description=radicale - A simple CalDAV (calendar) and CardDAV (contact) server +After=syslog.target network.target +Requires=network.target + +[Service] +Type=simple +ExecStart=/usr/bin/radicale -f +User=radicale +Group=radicale +Restart=on-failure +UMask=0027 +PrivateTmp=yes +PrivateDevices=yes +ProtectSystem=full +ProtectHome=yes +ProtectKernelTunables=yes +ProtectKernelModules=yes +ProtectControlGroups=yes +NoNewPrivileges=yes +ReadWriteDirectories=/var/lib/radicale + +[Install] +WantedBy=multi-user.target +