From 601dfeea14fc73343535e9e59947081753226fb3 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Sun, 21 Aug 2022 20:16:13 +0200 Subject: [PATCH 1/5] 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/files/routinator/run | 2 ++ srcpkgs/routinator/template | 8 +++++++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/routinator/files/README.voidlinux create mode 100755 srcpkgs/routinator/files/routinator/run diff --git a/srcpkgs/routinator/files/README.voidlinux b/srcpkgs/routinator/files/README.voidlinux new file mode 100644 index 000000000000..a391288867c5 --- /dev/null +++ b/srcpkgs/routinator/files/README.voidlinux @@ -0,0 +1,14 @@ +If you want to use routinator 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..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 e0a668e7c33f0ed3bbf42f830924b945a41bf771 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 22 Aug 2022 01:56:57 +0200 Subject: [PATCH 2/5] New-package: python3-sphinx-tabs-3.4.1 --- srcpkgs/python3-sphinx-tabs/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-sphinx-tabs/template diff --git a/srcpkgs/python3-sphinx-tabs/template b/srcpkgs/python3-sphinx-tabs/template new file mode 100644 index 000000000000..eeff7b52f96d --- /dev/null +++ b/srcpkgs/python3-sphinx-tabs/template @@ -0,0 +1,20 @@ +# Template file for 'python3-sphinx-tabs' +pkgname=python3-sphinx-tabs +version=3.4.1 +revision=1 +wrksrc=sphinx-tabs-${version} +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-Sphinx" +checkdepends="python3-Sphinx python3-wheel" +short_desc="Tabbed views for Sphinx" +maintainer="Klara Modin " +license="MIT" +homepage="https://github.com/executablebooks/sphinx-tabs" +changelog="https://raw.githubusercontent.com/executablebooks/sphinx-tabs/master/CHANGELOG.md" +distfiles="${PYPI_SITE}/s/sphinx-tabs/sphinx-tabs-${version}.tar.gz" +checksum=d2a09f9e8316e400d57503f6df1c78005fdde220e5af589cc79d493159e1b832 + +post_install() { + vlicense LICENSE +} From 5bc01b789e2bbfb13da42b254d438be39f767a65 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 22 Aug 2022 02:09:01 +0200 Subject: [PATCH 3/5] New package: python3-sphinx-copybutton-0.5.0 --- srcpkgs/python3-sphinx-copybutton/template | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 srcpkgs/python3-sphinx-copybutton/template diff --git a/srcpkgs/python3-sphinx-copybutton/template b/srcpkgs/python3-sphinx-copybutton/template new file mode 100644 index 000000000000..0812ff70f392 --- /dev/null +++ b/srcpkgs/python3-sphinx-copybutton/template @@ -0,0 +1,20 @@ +# Template file for 'python3-sphinx-copybutton' +pkgname=python3-sphinx-copybutton +version=0.5.0 +revision=1 +wrksrc=sphinx-copybutton-${version} +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-Sphinx" +checkdepends="python3-Sphinx python3-wheel" +short_desc="Sphinx extension to add a 'copy' button to code blocks" +maintainer="Klara Modin " +license="MIT" +homepage="https://github.com/executablebooks/sphinx-copybutton" +changelog="https://raw.githubusercontent.com/executablebooks/sphinx-copybutton/master/CHANGELOG.md" +distfiles="${PYPI_SITE}/s/sphinx-copybutton/sphinx-copybutton-${version}.tar.gz" +checksum=a0c059daadd03c27ba750da534a92a63e7a36a7736dcf684f26ee346199787f6 + +post_install() { + vlicense LICENSE +} From 314f24278c897a7a48c240b48f40d39d4a511aa0 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Sun, 21 Aug 2022 20:17:05 +0200 Subject: [PATCH 4/5] routinator: build and install manual --- srcpkgs/routinator/template | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/srcpkgs/routinator/template b/srcpkgs/routinator/template index 916f939b8b1e..0e95253d4931 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-sphinx-tabs python3-sphinx-copybutton" depends="rsync" short_desc="Resource Public Key Infrastructure (RPKI) validator" maintainer="Cameron Nemo " @@ -21,6 +22,10 @@ case "$XBPS_TARGET_MACHINE" in *) broken="ftbfs in ring" ;; esac +post_build() { + make -C doc/manual text +} + post_install() { vsv routinator vdoc README.md @@ -29,4 +34,8 @@ post_install() { vlicense LICENSE vdoc $FILESDIR/README.voidlinux + + for doc in doc/manual/build/text/*; do + vdoc $doc; + done } From 580f394560d1a33568cacb6447e120c2692a2ac0 Mon Sep 17 00:00:00 2001 From: Klara Modin Date: Mon, 22 Aug 2022 17:07:41 +0200 Subject: [PATCH 5/5] 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 0e95253d4931..79f194c4e8a1 100644 --- a/srcpkgs/routinator/template +++ b/srcpkgs/routinator/template @@ -8,7 +8,7 @@ depends="rsync" short_desc="Resource Public Key Infrastructure (RPKI) validator" maintainer="Cameron Nemo " 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"