From 5e69285fa5f1776069119830eb66cefa948a1e73 Mon Sep 17 00:00:00 2001
From: Alarig Le Lay <alarig@swordarmor.fr>
Date: Mon, 16 Dec 2024 12:41:49 +0100
Subject: [PATCH] net-misc/routinator: switch to config file

Signed-off-by: Alarig Le Lay <alarig@swordarmor.fr>
---
 metadata/md5-cache/net-misc/routinator-0.14.0 | 2 +-
 net-misc/routinator/files/routinator-confd    | 7 -------
 net-misc/routinator/files/routinator-initd    | 3 +--
 net-misc/routinator/files/routinator.conf     | 4 ++++
 net-misc/routinator/routinator-0.14.0.ebuild  | 5 ++++-
 5 files changed, 10 insertions(+), 11 deletions(-)
 delete mode 100644 net-misc/routinator/files/routinator-confd
 create mode 100644 net-misc/routinator/files/routinator.conf

diff --git a/metadata/md5-cache/net-misc/routinator-0.14.0 b/metadata/md5-cache/net-misc/routinator-0.14.0
index 3c934ee..d99394f 100644
--- a/metadata/md5-cache/net-misc/routinator-0.14.0
+++ b/metadata/md5-cache/net-misc/routinator-0.14.0
@@ -12,4 +12,4 @@ RDEPEND=acct-group/routinator acct-user/routinator
 SLOT=0
 SRC_URI=https://github.com/NLnetLabs/routinator/archive/refs/tags/v0.14.0.tar.gz -> routinator-0.14.0.tar.gz https://herbizarre.swordarmor.fr/garbage/routinator-0.14.0-vendor.tar.xz
 _eclasses_=toolchain-funcs	fa554cc3cff825d21dfe3f24841e29cf	multilib	b2a329026f2e404e9e371097dda47f96	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multiprocessing	1e32df7deee68372153dca65f4a7c21f	rust	55e231f09fddb09cbbaa254cf234368b	rust-toolchain	3f822985d9297438ed2443aa1fbdf33e	cargo	b5f350ebe96460cff090d0f2ae7e698a
-_md5_=f6326b18173162162960d2326d8cf658
+_md5_=b6fcaba2e0666fe85ebe30777c3415ea
diff --git a/net-misc/routinator/files/routinator-confd b/net-misc/routinator/files/routinator-confd
deleted file mode 100644
index 692aa5e..0000000
--- a/net-misc/routinator/files/routinator-confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/init.d/routinator
-
-# Options to pass to the routinator process
-# See routinator man for options
-
-ROUTINATOR_BASEDIR="/var/lib/routinator"
-ROUTINATOR_OPTS="--rtr=[::]:323 --user=routinator --group=routinator"
diff --git a/net-misc/routinator/files/routinator-initd b/net-misc/routinator/files/routinator-initd
index 9584850..dadca82 100755
--- a/net-misc/routinator/files/routinator-initd
+++ b/net-misc/routinator/files/routinator-initd
@@ -5,8 +5,7 @@
 name="routinator daemon"
 description="An RPKI relying party software"
 command=/usr/bin/routinator
-command_args="--syslog --config /etc/routinator.conf --repository-dir=${ROUTINATOR_BASEDIR}/repository server
-${ROUTINATOR_OPTS}"
+command_args="--config /etc/routinator.conf server"
 pidfile="/run/${RC_SVCNAME}.pid"
 command_args_background="--detach --pid-file=${pidfile}"
 
diff --git a/net-misc/routinator/files/routinator.conf b/net-misc/routinator/files/routinator.conf
new file mode 100644
index 0000000..00d4d5a
--- /dev/null
+++ b/net-misc/routinator/files/routinator.conf
@@ -0,0 +1,4 @@
+repository-dir = "/var/lib/routinator/repository"
+rtr-listen = [ "[::]:323" ]
+user = "routinator"
+group = "routinator"
diff --git a/net-misc/routinator/routinator-0.14.0.ebuild b/net-misc/routinator/routinator-0.14.0.ebuild
index 86b191b..720884f 100644
--- a/net-misc/routinator/routinator-0.14.0.ebuild
+++ b/net-misc/routinator/routinator-0.14.0.ebuild
@@ -44,6 +44,7 @@ src_unpack() {
 
 src_configure() {
 	local myfeatures=(
+		$(usev aspa)
 		$(usev rta)
 	)
 
@@ -52,11 +53,13 @@ src_configure() {
 
 src_install() {
 	newinitd "${FILESDIR}/${PN}-initd" ${PN}
-	newconfd "${FILESDIR}/${PN}-confd" ${PN}
 
 	cargo_src_install
 
 	doman doc/routinator.1
+
+	insinto /etc
+	doins "${FILESDIR}/${PN}.conf"
 }
 
 pkg_postinst() {