gentoo auto-resync : 11:08:2023 - 15:35:17

4 files changed, 17 insertions, 10 deletions

diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 70ea924685ab..ef066d5346c2 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -1,4 +1,5 @@
-AUX ospd-openvas-22.initd 499 BLAKE2B 413a85a48aa9812bbac9b647906a8445b6f0d7c69876cbb2cd6f9713cb4d48584672ce1d3a8c0fd8ac451a49d6106ba6c7cb58ed78947913345c5e2367ca333a SHA512 1b2122d36a851d7d810cf599a37eb40a5775ff5d084d6a31110f7c7f2d183348f99b0e4eb8adc89eb7f30c5644344c7c6116b8e90463345965fafbb9431aca4e
+AUX ospd-openvas-22.confd 75 BLAKE2B 252dc02627b72869705b6ba9a5c900f9687d1f79168f3dbe1e99d03e6c8001e95403f1df0d51ae8dc3780402cf99f2bd1782217f537a2ade206b71d52cf254a8 SHA512 5b7abda759df3aaf3e32c9ab8c8ec6a4f46fdc7be8bb4380ec41bee7aa99e6f7368fa61f9a92ecab508a51fe7ebe52f519ec16cff78f1d579c853b8c5d476b40
+AUX ospd-openvas-22.initd 547 BLAKE2B 05f5b9b339948bddc6d9d8d88cbecc7dc5e674ec3a2629eb9553452d8e70251280b5eb18391833ee603f3056c244a31fbbf146dc75d12da867e3259a82924fa1 SHA512 45982400f75782fb8c839bbb5dee006d44385654bcc5a30425c82c377b092f61b5210b2e030639ed72bf593e6b3fb9f234e95c82e9844808a9666b5dc0d4c3d9
 AUX ospd-openvas.confd 226 BLAKE2B c43d443a83515f8890fd5406741a0e5e48d63fbe4e0a9060ee6c3679138ca406478f584bc8da7e24ec9520385509d3f1de609aaefb54ed36371638b2e0fa2c67 SHA512 ef07f02c3900ee431785b2c2e53f04f4fd114f502526ec509c869dcd3a95e4284fc65f05f5ec85280cc05a29a46fba9c74ef3b0b0d618b9c9c1e62d9bb3fc6fa
 AUX ospd-openvas.initd 491 BLAKE2B 1020cec8fba128547e7d0606c60989b74103b0d324ee72166f6d5d3f872134589f1aa9ef05e4c73215743e4d78db0c8ca4ee909d5503f64246c8b3f186952e67 SHA512 c5ca7fbff20a5f3b85e4f1c7ec22322056dee2e0800689f0fdf252d5b785eaf8db7909867fc4f6f13c53447d60e07f3d904965d7313d4bfaf58e3240f25ef00d
 AUX ospd-openvas.logrotate 333 BLAKE2B 9265d7b1ace6a43204bbb31ab3b9e5896d91282b142c357373c113babd793dca101913aabc9d41c9d27125c43389b22a2b025e8f68b8aa41a669be444e97fe5d SHA512 378d049316928aea00bc5bf6332ecb5e671688681bd187f8b49104f056be2e75ec899e9bf9ecce1d1ad05caf654162e15715cbba8f375a9dd6c917839d85d5af
@@ -7,5 +8,5 @@ AUX ospd-openvas.service_notus.conf 479 BLAKE2B f0c63fdd48396c39001823890aafe082
 DIST ospd-openvas-21.4.4.tar.gz 173368 BLAKE2B 4568eb45bb999d0ff2cf91652dd56000bceb967f5c37c3061735322d1c72165f9b869c8b48694b37fd6d684679fa1bbff4a5550076bbcfcee5936b470cb04700 SHA512 3981b0a9044f90243fe06f15b0d8ee5a6b1a334556f6de76955aecda0404da2f8bd1d39bf547093a31c244f0aabae819f5e45e8c518984fc7d50764a267086e9
 DIST ospd-openvas-22.5.3.tar.gz 250022 BLAKE2B 277180051216527ce5889257a362219bdf11e88670e5fcde1cd4f1e687fbe7d56301d28d9a95982443bb1ecf9bb2553b7fcd6784cedad0139ad34cbdde142c39 SHA512 12be93803d52b46ec24760f07b7ace47b6383e5d84bf8903ea07d0e55889d149564b37e5be15ae5a33f03449bf2499d4e5220220d5ebec99629ee64548bb00f8
 EBUILD ospd-openvas-21.4.4-r4.ebuild 1902 BLAKE2B 67a71298b7506ca6906599d8e7c9edb8b6f98337f267913849a5cc112dc949559114914c0e8116cf8945e4b344ff2e15e1f4bcdab4980fa9bf849405b8b02c2f SHA512 f636d9181d96010c7367912d6421f2ab12d55df26bed987e77ab77e26d745002775ff2236c5325950e8ceaf6fc3b3746c9e0944602c0547f31b213bf8347afe3
-EBUILD ospd-openvas-22.5.3-r1.ebuild 2037 BLAKE2B 1a07a0d2966344c580cfa3f476925acd7c2426bfd25542c5e36e81bfc1489149e738f172349e2df0635e493fa4d02a0d6797367d4b4a5eede907633147baf85d SHA512 0214dbbfedc80103a0ae428c0aa090ff9305c4d946bcc28fc702a5fa61c9f2bbda41ed305755a84aad2b9bc5e97489e5b4e92de2487c0e9792313103ac8e5228
+EBUILD ospd-openvas-22.5.3-r2.ebuild 2040 BLAKE2B ea0f6e15a70b9987deeb7a1fb074d3bdaf1ae5ce8e47217164ee0bee933e8de31d842a03cd3bd59af3596e1d9f43ad5f4eef31ef29956ec263fb34e0638cb655 SHA512 3e780461edbcdc900f8786a8b49032b600fc33e4020ecc5ddd29c647a0e309bd757f60e6c0ba7657671ecb9312273fad74f196ebc8ae5bdf55c3c210f59c28a1
 MISC metadata.xml 1029 BLAKE2B 603e12bc771225baa50afc6e5254b64215055d9399c9d1862611150a49a74f397af610676ca273506f2359513b42d91786ef9f7c9100789437c00b8e59f6ccb2 SHA512 bf49f3444f277ae4b798a5c01d4c4dc5804187479774e85a9ea7481bae3b596df6f330979560ed43aa310cab72ba50dae4eeefe65a8e7dc6ada14659122ccaf7
diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd b/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd
new file mode 100644
index 000000000000..dbe9d762dae0
--- /dev/null
+++ b/net-analyzer/ospd-openvas/files/ospd-openvas-22.confd
@@ -0,0 +1,4 @@
+# OpenVAS Scanner command args
+
+# e.g --foreground
+OSPD_OPENVAS_OPTIONS=""
diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd
index f43f75802729..7c79d85d8e1f 100644
--- a/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd
+++ b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd
@@ -1,15 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 2020 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+: ${GVM_USER:=gvm}
+: ${GVM_GROUP:=$(id -ng ${GVM_USER})}
+: ${OSPD_TIMEOUT:=30}
+
 name="remotely control an OpenVAS Scanner"
 command=/usr/bin/ospd-openvas
-pidfile="/run/${RC_SVCNAME}.pid"
+command_user="${GVM_USER}:${GVM_GROUP}"
 command_args="${OSPD_OPENVAS_OPTIONS} \
-	${OSPD_OPENVAS_UNIX_SOCKET} \
-	${OSPD_OPENVAS_SOCKET_MODE} \
-	--pid-file ${pidfile} \
-	--config /etc/openvas/ospd.conf"
+	--config /etc/gvm/ospd-openvas.conf"
+retry="${OSPD_TIMEOUT}"
 
 depend() {
 	after bootmisc
@@ -17,5 +19,5 @@ depend() {
 }
 
 start_pre() {
-        checkpath -d /var/run/ospd
+        checkpath -d --owner ${GVM_USER} /var/run/ospd
 }
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.5.3-r1.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.5.3-r2.ebuild
index f7a5adb87543..2dd5709b8761 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.5.3-r1.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-22.5.3-r2.ebuild
@@ -56,7 +56,7 @@ python_install() {
 	fi
 
 	newinitd "${FILESDIR}/${PN}-22.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-22.confd" "${PN}"
 
 	systemd_dounit config/${PN}.service