Re: [PR PATCH] [Updated] routinator: integrate better into Void Linux

[klarasm <klarasm@users.noreply.github.com>]

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

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

https://github.com/klarasm/void-packages routinator-integration
https://github.com/void-linux/void-packages/pull/37848

routinator: integrate better into Void Linux
Creating a draft PR to implement some improvements in how the package integrates into Void Linux as suggested in #35971.

- [x] Create a runit service
- [x] Build and include documentation (or maybe do a separate doc sub-package)

Feel free to comment any other improvements that could be included.

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

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

From 151422df701758a26a627ccc85898815aeaf6366 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 21 Aug 2022 20:16:13 +0200
Subject: [PATCH 1/2] routinator: add runit service

- create a system user/group
- add documentation on how to initialize routinator for use as a system
  service
---
 srcpkgs/routinator/files/README.voidlinux | 14 ++++++++++++++
 srcpkgs/routinator/template               |  8 +++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/routinator/files/README.voidlinux

diff --git a/srcpkgs/routinator/files/README.voidlinux b/srcpkgs/routinator/files/README.voidlinux
new file mode 100644
index 000000000000..f0463437fb50
--- /dev/null
+++ b/srcpkgs/routinator/files/README.voidlinux
@@ -0,0 +1,14 @@
+If this is your first time using routinator as a system service it needs to
+be initialized.
+
+If you want to use the ARIN TAL, you must read and agree to the ARIN Relying
+Party Agreement (RPA) available at
+https://www.arin.net/resources/manage/rpki/rpa.pdf
+
+Use following to intitialize and agree to the ARIN RPA:
+sudo -u _routinator sh -c 'cd /var/lib/routinator && \
+	routinator -c /etc/routinator/routinator.conf init --accept-arin-rpa'
+
+Otherwise use following to initialize and skip the ARIN TAL:
+sudo -u _routinator sh -c 'cd /var/lib/routinator && \
+	routinator -c /etc/routinator/routinator.conf init --skip-tal=arin'
diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index ce1f0b16e6c8..916f939b8b1e 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -1,7 +1,7 @@
 # Template file for 'routinator'
 pkgname=routinator
 version=0.11.2
-revision=1
+revision=2
 build_style=cargo
 depends="rsync"
 short_desc="Resource Public Key Infrastructure (RPKI) validator"
@@ -12,6 +12,9 @@ changelog="https://raw.githubusercontent.com/NLnetLabs/routinator/main/Changelog
 distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz"
 conf_files="/etc/routinator/routinator.conf"
 checksum=00f825c53168592da0285e8dbd228018e77248d458214a2c0f86cd0ca45438f5
+system_accounts="_routinator"
+_routinator_homedir="/var/lib/routinator"
+make_dirs="/var/lib/routinator 0755 _routinator _routinator"
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;
@@ -19,8 +22,11 @@ case "$XBPS_TARGET_MACHINE" in
 esac
 
 post_install() {
+	vsv routinator
 	vdoc README.md
 	vman doc/routinator.1
 	vinstall etc/routinator.conf.system-service 0644 etc/routinator routinator.conf
 	vlicense LICENSE
+
+	vdoc $FILESDIR/README.voidlinux
 }

From 9b0441719bb3a39dba92527df3713ba52467b46c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 21 Aug 2022 20:17:05 +0200
Subject: [PATCH 2/2] routinator: build and install manual

sphinx-tabs and sphinx-copybutton are needed but are not in the void
repos. Install those with pip directly instead.
---
 srcpkgs/routinator/template | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index 916f939b8b1e..8bb85575274c 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -3,6 +3,7 @@ pkgname=routinator
 version=0.11.2
 revision=2
 build_style=cargo
+hostmakedepends="python3-Sphinx python3-toml python3-sphinx_rtd_theme python3-pip"
 depends="rsync"
 short_desc="Resource Public Key Infrastructure (RPKI) validator"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
@@ -21,6 +22,12 @@ case "$XBPS_TARGET_MACHINE" in
 	*) broken="ftbfs in ring" ;;
 esac
 
+post_build() {
+	pip install sphinx-tabs sphinx-copybutton
+	cd doc/manual
+	make text
+}
+
 post_install() {
 	vsv routinator
 	vdoc README.md
@@ -29,4 +36,8 @@ post_install() {
 	vlicense LICENSE
 
 	vdoc $FILESDIR/README.voidlinux
+
+	for doc in doc/manual/build/text/*; do
+		vdoc $doc;
+	done
 }