[PR PATCH] radicale: update to 3.1.9, fix conf file permissions, add log sv

[PR PATCH] radicale: update to 3.1.9, fix conf file permissions, add log sv

[fanyx]

[-- Attachment #1: Type: text/plain, Size: 849 bytes --]

There is a new pull request by fanyx against master on the void-packages repository

https://github.com/fanyx/void-packages radicale
https://github.com/void-linux/void-packages/pull/49476

radicale: update to 3.1.9, fix conf file permissions, add log sv
### Changes

- Update to 3.1.9
- https://github.com/void-linux/void-packages/issues/38923
- Add logging service for unused logging directory

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - armv7l

This superseeds https://github.com/void-linux/void-packages/pull/46357.

A patch file from https://github.com/void-linux/void-packages/pull/49476.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-49476.patch --]
[-- Type: text/x-diff, Size: 3978 bytes --]

From 51fd761fb3cc501e27f18adf0dc005fcab511bef Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 23 Mar 2024 14:44:23 +0100
Subject: [PATCH 1/3] radicale: update to 3.1.9.

---
 srcpkgs/radicale/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index cfab227cfa194c..87c8ca72d17394 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,7 +1,7 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=3.1.8
-revision=4
+version=3.1.9
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt
@@ -12,9 +12,10 @@ short_desc="Complete calendar and contact storing and manipulating solution"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://radicale.org"
-changelog="https://raw.githubusercontent.com/Kozea/Radicale/master/CHANGELOG.md"
+#changelog="https://raw.githubusercontent.com/Kozea/Radicale/master/CHANGELOG.md"
+changelog="https://raw.githubusercontent.com/Kozea/Radicale/v3.1.9/CHANGELOG.md"
 distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=40078e0f05917c09664363a9e289a36d32e00d10a1d169ffc60b5c581deb4e77
+checksum=4247b18004f0779e00392a3fced1d93f720f50b7be30b46d0283f09de6d1e45b
 conf_files="
  /etc/radicale/config
  /etc/radicale/rights

From e89f710a7e8e1d753680045fd7faa862906536be Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 23 Mar 2024 14:45:29 +0100
Subject: [PATCH 2/3] radicale: add logging service

---
 srcpkgs/radicale/files/radicale/log/run | 3 +++
 srcpkgs/radicale/template               | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100755 srcpkgs/radicale/files/radicale/log/run

diff --git a/srcpkgs/radicale/files/radicale/log/run b/srcpkgs/radicale/files/radicale/log/run
new file mode 100755
index 00000000000000..3e9054eea257d7
--- /dev/null
+++ b/srcpkgs/radicale/files/radicale/log/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec vlogger -t radicale -p daemon
+
diff --git a/srcpkgs/radicale/template b/srcpkgs/radicale/template
index 87c8ca72d17394..c544c47d8cb989 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -18,8 +18,7 @@ distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.g
 checksum=4247b18004f0779e00392a3fced1d93f720f50b7be30b46d0283f09de6d1e45b
 conf_files="
  /etc/radicale/config
- /etc/radicale/rights
- /etc/sv/radicale/log/run"
+ /etc/radicale/rights"
 make_dirs="
  /etc/radicale 755 root root
  /usr/share/radicale/ 755 root root

From cde58da76cfab2f84835d92c799b849127d408c1 Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 23 Mar 2024 14:52:58 +0100
Subject: [PATCH 3/3] radicale: fix permissions post-install

---
 srcpkgs/radicale/INSTALL  | 12 ++++++++++++
 srcpkgs/radicale/template |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/radicale/INSTALL

diff --git a/srcpkgs/radicale/INSTALL b/srcpkgs/radicale/INSTALL
new file mode 100644
index 00000000000000..1971514b11d5d3
--- /dev/null
+++ b/srcpkgs/radicale/INSTALL
@@ -0,0 +1,12 @@
+# *-*-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 c544c47d8cb989..39f46902bd8adc 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"

Re: [PR REVIEW] radicale: update to 3.1.9, fix conf file permissions, add log sv

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49476#discussion_r1536673262

Comment:
log services should be created automatically by xbps-src if the directory doesn't exist in the service in files/

Re: [PR REVIEW] radicale: update to 3.1.9, fix conf file permissions, add log sv

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49476#discussion_r1536673048

Comment:
changelog should point to master not the tag

Re: [PR REVIEW] radicale: update to 3.1.9, fix conf file permissions, add log sv

[fanyx]

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New review comment by fanyx on void-packages repository

https://github.com/void-linux/void-packages/pull/49476#discussion_r1536675344

Comment:
should this line stay or get removed?

Re: [PR REVIEW] radicale: update to 3.1.9, fix conf file permissions, add log sv

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 197 bytes --]

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/49476#discussion_r1536675603

Comment:
not sure why it exists, but probably removed

Re: [PR PATCH] [Updated] radicale: update to 3.1.9, fix conf file permissions, add log sv

[fanyx]

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

There is an updated pull request by fanyx against master on the void-packages repository

https://github.com/fanyx/void-packages radicale
https://github.com/void-linux/void-packages/pull/49476

radicale: update to 3.1.9, fix conf file permissions, add log sv
### Changes

- Update to 3.1.9
- https://github.com/void-linux/void-packages/issues/38923
- Add logging service for unused logging directory

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - armv7l

This superseeds https://github.com/void-linux/void-packages/pull/46357.

A patch file from https://github.com/void-linux/void-packages/pull/49476.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-radicale-49476.patch --]
[-- Type: text/x-diff, Size: 2051 bytes --]

From d80bf3abfa78c2577f5c19d96a8bed02f536e19f Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Sat, 23 Mar 2024 14:44:23 +0100
Subject: [PATCH] radicale: update to 3.1.9.

* fix permissions post-install
---
 srcpkgs/radicale/INSTALL  | 12 ++++++++++++
 srcpkgs/radicale/template | 11 +++++------
 2 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 srcpkgs/radicale/INSTALL

diff --git a/srcpkgs/radicale/INSTALL b/srcpkgs/radicale/INSTALL
new file mode 100644
index 00000000000000..1971514b11d5d3
--- /dev/null
+++ b/srcpkgs/radicale/INSTALL
@@ -0,0 +1,12 @@
+# *-*-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..bd828bae91e251 100644
--- a/srcpkgs/radicale/template
+++ b/srcpkgs/radicale/template
@@ -1,7 +1,7 @@
 # Template file for 'radicale'
 pkgname=radicale
-version=3.1.8
-revision=4
+version=3.1.9
+revision=1
 build_style=python3-module
 hostmakedepends="python3-setuptools"
 depends="python3-vobject python3-dateutil python3-passlib python3-bcrypt
@@ -14,15 +14,14 @@ license="GPL-3.0-or-later"
 homepage="https://radicale.org"
 changelog="https://raw.githubusercontent.com/Kozea/Radicale/master/CHANGELOG.md"
 distfiles="https://github.com/Kozea/Radicale/archive/refs/tags/v${version}.tar.gz"
-checksum=40078e0f05917c09664363a9e289a36d32e00d10a1d169ffc60b5c581deb4e77
+checksum=4247b18004f0779e00392a3fced1d93f720f50b7be30b46d0283f09de6d1e45b
 conf_files="
  /etc/radicale/config
- /etc/radicale/rights
- /etc/sv/radicale/log/run"
+ /etc/radicale/rights"
 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"