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
- [ ] 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: 4247 bytes --]

From f36f6d54d39020e890d855387dca1e2d28f54e10 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Sun, 3 Jul 2022 23:46:51 +0200
Subject: [PATCH 1/2] routinator: add runit service

- create a system user/group
- add install message with instructions to initialize the service
---
 srcpkgs/routinator/INSTALL.msg          | 14 ++++++++++++++
 srcpkgs/routinator/files/routinator/run |  2 ++
 srcpkgs/routinator/template             |  6 +++++-
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/routinator/INSTALL.msg
 create mode 100755 srcpkgs/routinator/files/routinator/run

diff --git a/srcpkgs/routinator/INSTALL.msg b/srcpkgs/routinator/INSTALL.msg
new file mode 100644
index 000000000000..f0463437fb50
--- /dev/null
+++ b/srcpkgs/routinator/INSTALL.msg
@@ -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/files/routinator/run b/srcpkgs/routinator/files/routinator/run
new file mode 100755
index 000000000000..9bfb6265b058
--- /dev/null
+++ b/srcpkgs/routinator/files/routinator/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec routinator --config /etc/routinator/routinator.conf server --user=_routinator --group=_routinator 2>&1
diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index ce1f0b16e6c8..fafe6b920341 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,6 +22,7 @@ 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

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

make html depends on some PyPI packages that are not in the void repos
so they would have to be installed with pip manually. The text manual
should probably be enough for offline usage.
---
 srcpkgs/routinator/template | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index fafe6b920341..d0802839e7d2 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"
 depends="rsync"
 short_desc="Resource Public Key Infrastructure (RPKI) validator"
 maintainer="Cameron Nemo <cnemo@tutanota.com>"
@@ -21,10 +22,19 @@ case "$XBPS_TARGET_MACHINE" in
 	*) broken="ftbfs in ring" ;;
 esac
 
+post_build() {
+	cd doc/manual
+	make text
+}
+
 post_install() {
 	vsv routinator
 	vdoc README.md
 	vman doc/routinator.1
 	vinstall etc/routinator.conf.system-service 0644 etc/routinator routinator.conf
 	vlicense LICENSE
+
+	for doc in doc/manual/build/text/*; do
+		vdoc $doc;
+	done
 }