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

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

[-- Attachment #1: Type: text/plain, Size: 741 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
- [x] Add missing python packages required for documentation
    - [x] python3-sphinx-tabs
    - [x] python3-sphinx-copybutton

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: 4049 bytes --]

From 2f073ae6b3470e8a8505b6ec19d4c98075ee1959 Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Wed, 28 Sep 2022 21:18:46 +0000
Subject: [PATCH 1/3] routinator: update to 0.12.0

---
 srcpkgs/routinator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index 5a8b3c2965b0..7394b4990ba4 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -1,6 +1,6 @@
 # Template file for 'routinator'
 pkgname=routinator
-version=0.11.2
+version=0.12.0
 revision=1
 build_style=cargo
 depends="rsync"
@@ -11,7 +11,7 @@ homepage="https://rpki.readthedocs.io/"
 changelog="https://raw.githubusercontent.com/NLnetLabs/routinator/main/Changelog.md"
 distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz"
 conf_files="/etc/routinator/routinator.conf"
-checksum=00f825c53168592da0285e8dbd228018e77248d458214a2c0f86cd0ca45438f5
+checksum=e1e517280b3adca7a976c86bc59ea4cc5b6a6c7a0b8ab0166be6e6bff001c698
 
 case "$XBPS_TARGET_MACHINE" in
 	x86_64*|i686*|arm*|aarch64*) ;;

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

- create a system user/group
---
 srcpkgs/routinator/files/routinator/run | 2 ++
 srcpkgs/routinator/template             | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100755 srcpkgs/routinator/files/routinator/run

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 7394b4990ba4..1f4d5455db10 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -1,7 +1,7 @@
 # Template file for 'routinator'
 pkgname=routinator
 version=0.12.0
-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=e1e517280b3adca7a976c86bc59ea4cc5b6a6c7a0b8ab0166be6e6bff001c698
+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 af8c55d0ad319f6af9d403224966195eb0a4619c Mon Sep 17 00:00:00 2001
From: Klara Modin <klarasmodin@gmail.com>
Date: Mon, 22 Aug 2022 17:07:41 +0200
Subject: [PATCH 3/3] routinator: change homepage

rpki.readthedocs.io no longer goes to routinator, it goes to a general
information page about RPKI
---
 srcpkgs/routinator/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template
index 1f4d5455db10..07dd3c466864 100644
--- a/srcpkgs/routinator/template
+++ b/srcpkgs/routinator/template
@@ -7,7 +7,7 @@ depends="rsync"
 short_desc="Resource Public Key Infrastructure (RPKI) validator"
 maintainer="Cameron Nemo <cam@nohom.org>"
 license="BSD-3-Clause"
-homepage="https://rpki.readthedocs.io/"
+homepage="https://routinator.docs.nlnetlabs.nl/"
 changelog="https://raw.githubusercontent.com/NLnetLabs/routinator/main/Changelog.md"
 distfiles="https://github.com/NLnetLabs/routinator/archive/v${version}.tar.gz"
 conf_files="/etc/routinator/routinator.conf"