From b014100163affd29dc2b2d4738cc0c270d995d77 Mon Sep 17 00:00:00 2001 From: projectmoon Date: Thu, 11 Jun 2020 19:35:56 +0000 Subject: [PATCH 1/2] New package: radicale3-3.0.3 --- srcpkgs/radicale/template | 2 +- srcpkgs/radicale2/template | 2 +- srcpkgs/radicale3/INSTALL.msg | 1 + srcpkgs/radicale3/files/radicale/log/run | 2 ++ srcpkgs/radicale3/files/radicale/run | 3 ++ srcpkgs/radicale3/template | 36 ++++++++++++++++++++++++ srcpkgs/radicale3/update | 1 + 7 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/radicale3/INSTALL.msg create mode 100755 srcpkgs/radicale3/files/radicale/log/run create mode 100755 srcpkgs/radicale3/files/radicale/run create mode 100644 srcpkgs/radicale3/template create mode 100644 srcpkgs/radicale3/update diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index 5cf0cc8da0d..ef65e6a4ed3 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -5,7 +5,6 @@ revision=4 archs=noarch wrksrc="Radicale-${version}" build_style=python3-module -pycompile_module="radicale" hostmakedepends="python3 python3-setuptools" depends="python3-pam python3-requests python3-dulwich" short_desc="Complete calendar and contact storing and manipulating solution" @@ -14,6 +13,7 @@ license="GPL-3.0-or-later" homepage="https://radicale.org" distfiles="${PYPI_SITE}/R/Radicale/Radicale-${version}.tar.gz" checksum=c007198ea45ef797344672c681d4c13f8b4aa85c15c41a1156225767a405c92b +conflicts="radicale2 radicale3" conf_files=" /etc/radicale/config diff --git a/srcpkgs/radicale2/template b/srcpkgs/radicale2/template index 6fd785c5484..0097d29d550 100644 --- a/srcpkgs/radicale2/template +++ b/srcpkgs/radicale2/template @@ -15,7 +15,7 @@ license="GPL-3.0-or-later" homepage="https://radicale.org" distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz" checksum=ddba493443434de499f28818758cba92320362986dba852dc2c10c6daa5d20e1 -conflicts="radicale" +conflicts="radicale radicale3" provides="radicale-${version}_${revision}" conf_files=" /etc/radicale/config diff --git a/srcpkgs/radicale3/INSTALL.msg b/srcpkgs/radicale3/INSTALL.msg new file mode 100644 index 00000000000..6dc666e20cc --- /dev/null +++ b/srcpkgs/radicale3/INSTALL.msg @@ -0,0 +1 @@ +You are installing the 3.x version of radicale. diff --git a/srcpkgs/radicale3/files/radicale/log/run b/srcpkgs/radicale3/files/radicale/log/run new file mode 100755 index 00000000000..37284378a05 --- /dev/null +++ b/srcpkgs/radicale3/files/radicale/log/run @@ -0,0 +1,2 @@ +#!/bin/sh +exec svlogd /var/log/radicale diff --git a/srcpkgs/radicale3/files/radicale/run b/srcpkgs/radicale3/files/radicale/run new file mode 100755 index 00000000000..ab664721091 --- /dev/null +++ b/srcpkgs/radicale3/files/radicale/run @@ -0,0 +1,3 @@ +#!/bin/sh +exec 2>&1 +exec chpst -u radicale radicale -C /etc/radicale/config diff --git a/srcpkgs/radicale3/template b/srcpkgs/radicale3/template new file mode 100644 index 00000000000..61db88588c7 --- /dev/null +++ b/srcpkgs/radicale3/template @@ -0,0 +1,36 @@ +# Template file for 'radicale3' +pkgname=radicale3 +version=3.0.3 +revision=1 +archs=noarch +wrksrc="Radicale-${version}" +build_style=python3-module +hostmakedepends="python3 python3-setuptools" +depends="python3-pam python3-requests python3-dulwich python3-vobject + python3-dateutil python3-passlib python3-bcrypt python3-defusedxml + apache-htpasswd" +short_desc="Complete calendar and contact storing and manipulating solution" +maintainer="projectmoon " +license="GPL-3.0-or-later" +homepage="https://radicale.org" +distfiles="https://github.com/Kozea/Radicale/archive/${version}.tar.gz" +checksum=9e22273dda13938b44e0555a96f63e0491e42c1e58a290864ecae1181580be8c +conflicts="radicale radicale2" +provides="radicale-${version}_${revision}" +conf_files=" + /etc/radicale/config + /etc/sv/radicale/log/run" +make_dirs=" + /etc/radicale 755 root root + /usr/share/radicale/ 755 root root + /var/log/radicale/ 700 root root + /var/lib/radicale 750 radicale radicale" +system_accounts="radicale" +radicale_homedir="/var/lib/radicale" + +post_install() { + vinstall config 644 etc/radicale/ + vinstall radicale.fcgi 644 usr/share/radicale + vinstall radicale.wsgi 644 usr/share/radicale + vsv radicale +} diff --git a/srcpkgs/radicale3/update b/srcpkgs/radicale3/update new file mode 100644 index 00000000000..1548362f526 --- /dev/null +++ b/srcpkgs/radicale3/update @@ -0,0 +1 @@ +ignore="[3].*" From ca979d18044d853960a31d6de4521a35451cac73 Mon Sep 17 00:00:00 2001 From: projectmoon Date: Wed, 10 Jun 2020 19:42:55 +0000 Subject: [PATCH 2/2] etesync-dav: update to 0.18.1. --- srcpkgs/etesync-dav/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/etesync-dav/template b/srcpkgs/etesync-dav/template index 932c54e3e53..bff7ad07aba 100644 --- a/srcpkgs/etesync-dav/template +++ b/srcpkgs/etesync-dav/template @@ -1,19 +1,19 @@ # Template file for 'etesync-dav' pkgname=etesync-dav -version=0.17.1 +version=0.18.1 revision=1 archs=noarch wrksrc="etesync-dav-${version}" build_style=python3-module hostmakedepends="python3-setuptools" -depends="python3-etesync radicale2 python3-Flask python3-Flask-WTF" +depends="python3-etesync radicale3 python3-Flask python3-Flask-WTF" checkdepends="$depends python3-pytest" short_desc="CalDAV and CardDAV frontend for EteSync" maintainer="projectmoon " license="GPL-3.0-only" homepage="http://www.etesync.com" distfiles="${PYPI_SITE}/e/etesync-dav/etesync-dav-${version}.tar.gz" -checksum=2d7018e3a0af8c203671eed4098f970d629876d17b235d434a595a5056aa7972 +checksum=580c650b4b226ae37fe15c2096e71c110bff73e2cf13771c52feddd1ea33dcd2 do_check() { pytest3