From 10e3fa8b58a6d0224cba3d2b2e2df958891879f0 Mon Sep 17 00:00:00 2001
From: "Robin H. Johnson" <robbat2@gentoo.org>
Date: Sun, 24 Mar 2024 22:52:58 -0700
Subject: [PATCH] net-misc/sks: match init.d behavior

- support args to systemd service
- ensure paths are correctly owned (/var/lib/sks/{PTree,KDB} must exist)
- sks-recon must start after sks-db

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---
 net-misc/sks/files/sks-db.service                          | 7 ++++++-
 net-misc/sks/files/sks-recon.service                       | 7 +++++--
 ...6_p20200624-r1.ebuild => sks-1.1.6_p20200624-r2.ebuild} | 0
 3 files changed, 11 insertions(+), 3 deletions(-)
 rename net-misc/sks/{sks-1.1.6_p20200624-r1.ebuild => sks-1.1.6_p20200624-r2.ebuild} (100%)

diff --git a/net-misc/sks/files/sks-db.service b/net-misc/sks/files/sks-db.service
index bbc3ba7e2b2d1..b48db1add6ffa 100644
--- a/net-misc/sks/files/sks-db.service
+++ b/net-misc/sks/files/sks-db.service
@@ -3,8 +3,13 @@ Description=SKS database thread
 After=network.target
 
 [Service]
-ExecStart=/usr/bin/sks db
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --directory ${SKS_DIR} ${SKS_DIR}/SKS ${SKS_DIR}/PTree
+ExecStartPre=/usr/lib/rc/bin/checkpath --owner sks:sks --file ${SKS_DIR}/*.log ${SKS_DIR}/KDB/* ${SKS_DIR}/PTree/*
+ExecStart=/usr/bin/sks db ${SKS_OPTIONS} ${SKS_DB_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]
diff --git a/net-misc/sks/files/sks-recon.service b/net-misc/sks/files/sks-recon.service
index 97ee52ffc0ed8..d56731d1c9617 100644
--- a/net-misc/sks/files/sks-recon.service
+++ b/net-misc/sks/files/sks-recon.service
@@ -1,10 +1,13 @@
 [Unit]
 Description=SKS key reconnaissance thread
-After=network.target
+After=network.target sks-db.service
 
 [Service]
-ExecStart=/usr/bin/sks recon
+Environment=SKS_DIR=/var/lib/sks
+EnvironmentFile=-/etc/sysconfig/sks
+ExecStart=/usr/bin/sks recon ${SKS_OPTIONS} ${SKS_RECON_OPTIONS}
 User=sks
+# WorkingDirectory cannot use a variable
 WorkingDirectory=/var/lib/sks
 
 [Install]
diff --git a/net-misc/sks/sks-1.1.6_p20200624-r1.ebuild b/net-misc/sks/sks-1.1.6_p20200624-r2.ebuild
similarity index 100%
rename from net-misc/sks/sks-1.1.6_p20200624-r1.ebuild
rename to net-misc/sks/sks-1.1.6_p20200624-r2.ebuild