From a407a3c130b4fea271800e6993a743424a7fa50a Mon Sep 17 00:00:00 2001 From: fanyx Date: Tue, 12 Dec 2023 12:54:18 +0100 Subject: [PATCH 1/2] radicale: fix permissions post-install --- srcpkgs/radicale/INSTALL | 11 +++++++++++ srcpkgs/radicale/template | 3 +-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/radicale/INSTALL diff --git a/srcpkgs/radicale/INSTALL b/srcpkgs/radicale/INSTALL new file mode 100644 index 00000000000000..a0551ab304a36b --- /dev/null +++ b/srcpkgs/radicale/INSTALL @@ -0,0 +1,11 @@ +# *-*-shell-*-* +# +case ${ACTION} in +post) + # fix permissions and owners + chown radicale:radicale /etc/radicale/config + chown radicale:radicale /etc/radicale/rights + chmod 644 /etc/radicale/config + chmod 640 /etc/radicale/rights + ;; +esac diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index cfab227cfa194c..8a7a341d79c7b3 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -22,7 +22,7 @@ conf_files=" make_dirs=" /etc/radicale 755 root root /usr/share/radicale/ 755 root root - /var/log/radicale/ 700 root root + /var/log/radicale/ 750 radicale radicale /var/lib/radicale 750 radicale radicale" system_accounts="radicale" radicale_homedir="/var/lib/radicale" @@ -38,7 +38,6 @@ do_check() { post_install() { vinstall config 644 etc/radicale/ vinstall rights 640 etc/radicale/ - vinstall config 644 usr/share/examples/radicale vinstall radicale.wsgi 644 usr/share/radicale vsv radicale vdoc README.md From 16e591aaf6da1d261936d98a8984f896751b2994 Mon Sep 17 00:00:00 2001 From: fanyx Date: Tue, 12 Dec 2023 13:00:43 +0100 Subject: [PATCH 2/2] radicale: remove deprecated pytests --- srcpkgs/radicale/template | 8 -------- 1 file changed, 8 deletions(-) diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template index 8a7a341d79c7b3..50537fc7ad71f9 100644 --- a/srcpkgs/radicale/template +++ b/srcpkgs/radicale/template @@ -6,8 +6,6 @@ build_style=python3-module hostmakedepends="python3-setuptools" depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt python3-defusedxml apache-htpasswd" -checkdepends="${depends} python3-pytest python3-pytest-flake8 python3-isort - python3-pytest-cov python3-waitress" short_desc="Complete calendar and contact storing and manipulating solution" maintainer="Orphaned " license="GPL-3.0-or-later" @@ -29,12 +27,6 @@ radicale_homedir="/var/lib/radicale" radicale_descr="Radicale user" replaces="radicale2<3.0.6" -do_check() { - # install the package to test_install directory for testing - python3 setup.py install --root="${PWD}/test_install" - PYTHONPATH="${PWD}/test_install/${py3_sitelib}" pytest -c /dev/null -} - post_install() { vinstall config 644 etc/radicale/ vinstall rights 640 etc/radicale/