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

13 files changed, 35 insertions, 37 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 508a2613890f..dbaa6011afc8 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 15b002192310..804dc82a950f 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1,9 +1,9 @@
-AUX gsad-22.init 654 BLAKE2B 337f2d7a4899954abb923a7c41f58315ddb51e76cbfec7c55493039497e26ebe36e60fbcebad35e04f00a66fdeaa952e386fcb4847f61ce3fd49a0e32c03ecdd SHA512 b878fcc6d1eb17a41d2dcd6db53c165a5d848d2e22b79c2f5864adb90e4843287c00b6dd5db7a7344b69c154be92ba8b3354b5bde03e943e3b8ad7b08e048a8f
-AUX gsad-daemon.conf 416 BLAKE2B 7c6dff183ceb8afdbe7abb75333fb8aa570be406ecb18641e96d8045d793b6ef81b46acbfd243c4bb9a4bcb98cb6c039ebd0793c13855b7f5404e552a6088ef5 SHA512 7e696a3bb61310d7e8c553ed3744adb5fd60a75c83c0b9f99c76c092f78b4cf25d8b9c72b10d4a79ed501da16a27b8beddcda36f48acb550dfa01dbc19379f68
+AUX gsad-22.init 611 BLAKE2B 0fed09e66154cd3311678e3c9cc0b62481607c7689f77ffa9c302df6c642be30a7a1839422deb32b8fe3a5499b5b4e9457e356b8d65211348a25c2aa712fbc25 SHA512 fb43ef452634989971204493679b4c35177698b6192274ca036524e05cdf4417f660467db23a7e7bbc34d53d112049fe91072084f2393913b6821189a5715e9d
+AUX gsad-daemon.conf 428 BLAKE2B 5fdd58c878769245535cb46e2715fb14253bfe303d302a6e5a0efb655a30e92250582e2cfe4043afac79a718d178f350c91507c069bdf40e80fd7c688d47e270 SHA512 8ee1aca3d3e7f154eb5db21e256f7be68eca66bee0931a84a8187c49bc557b93255a842050bebe29b197746291fb40553b6bcde10adc871fb9aac2b27fb02f3d
 AUX gsad.init 601 BLAKE2B 79b76f512904c55f235cc6ac1b3513f920dee9cbaaa06c115c93f7abb215302f544a8e021fe0e7a66f0d646807da75a3fc4ed68cf01e00eaaa003b1ff39c1c9e SHA512 610db173cf45de0ff907dacfabba0b6e03c6a83fda97f3b76d253a80e2353961f9ac61bfd9131561e34339075556d4930273dadef94d8f9e2f8f30f50266e44d
 AUX gsad.service.conf 25 BLAKE2B fb1972cc41f5f8970717136ef71c81b74cb1abb6c0419d3c8f7f51a9f54f933eb1c1551cfb56149bc7b5e2c68dd11d731b556a7ba2da678b02f24cf143810b4f SHA512 ece2d5838f743a820dd732a5e5b17d91e85ce07655173a0143740ef6bcd20156d6aebfcf8c43d53caa7713402607d88acc0328499326f6921e3b057bd0ef9d66
 DIST gsad-21.4.4.tar.gz 220618 BLAKE2B 276164ce1e03a6ed211d3bdf24c7f9b5ac832c07891b34b467f61ec02c5670d5368ea3219b3cc445e4ef83fef0aee7375c89ce8008746ea7e08abf50da8fb9fd SHA512 092c8187754b3f0503e4ae6fd9c41dbd6917264668a5f8f831d40e88c7b8db6772acd354db62ac66b4af13b7c27e78516d4975f5bfede0d28001007a46c39f75
 DIST gsad-22.5.1.tar.gz 223290 BLAKE2B 24530f085c644895d5153929038d040fbcb0626b4b2df0ce3966d96fc8c756fbb2b78540b2a57affab2f2eb97cf868f09b7ac863f9a314cb1f74a829fbea48cc SHA512 52ec1377d57d90f64e949472f5f6d1f94e9cdce86d7a807451ed9f01ff36e392606d725461e416246b9e706f00aa536cbc5672fb977695b20d0c5957b67447aa
 EBUILD gsad-21.4.4.ebuild 2329 BLAKE2B 35f607bb6ca44b9a42ad60bcda84c825251453a77ef146147b0f551f6b04968cc4a38c9a3f566bd0539436761ce6ed072b5b925e98f9db74faa0698c80ff1094 SHA512 4084d98b9893a037512fc0233a908ee1ec7afbe43f1e700a45627f40291da44b17f627ea731623ab1500e4f72ab31b4b5f846d84751185dbfde82c8f946fdcea
-EBUILD gsad-22.5.1-r1.ebuild 2458 BLAKE2B 16a1c2ec681ea43caaed5fd62aa9f792d58d36bc97dc6d23872d5a0be5c30cbe9f6a0b1235f16bd671e0daf1ba3b2661227580f1e8a6caf4f7a69e74193140c7 SHA512 ff3f19b5ae4dd336f030cc74c0b5f7ef2ad441049960cd6a4035e89d346b01ebc471a8439bd47228b40b4b69f6893ea3c2ade019e1eec3e7be6c959a8fb1deea
+EBUILD gsad-22.5.1-r2.ebuild 2479 BLAKE2B 2240548aa9db6b8818ef8dd6d80e9947c08c631176ebd30c0fba66d63b1f15c469c8e9c88a6004273d4e3604894bd3818dd0581357b56386c579cd66039d72ca SHA512 ddb159aa230f34d1b62ab1fb7d242b786cf5c6319eb691e514b65573ba981372d4c55a7d9a13001bfc405895a5e8898e0dd2ce2d9184eac5e137308a18590a4d
 MISC metadata.xml 602 BLAKE2B d3c36459de572672fec6a1cd7d7c29c5b8be3a421455c8702a2bfbcf4d969c5783d5026024bbffe4b765a18b50852b534b9d2a1174f5586327ff13a4f704781f SHA512 e15e39148d80f4b6c8c6e14c18ae977d6ebcec98b201e4d9b58d83f4a183023f383d4c5ae986064b6a176b741d0ac923173cb4f78a30185ce341c642002e13d7
diff --git a/net-analyzer/gsad/files/gsad-22.init b/net-analyzer/gsad/files/gsad-22.init
index 9a93713bd591..f416990b19a4 100644
--- a/net-analyzer/gsad/files/gsad-22.init
+++ b/net-analyzer/gsad/files/gsad-22.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 : ${GSAD_USER:=gvm}
@@ -8,10 +8,8 @@
 
 name="Greenbone Security Assistant (GSA)"
 command="/usr/bin/gsad"
-command_args="--foreground ${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}"
-command_background="true"
 command_user="${GSAD_USER}:${GSAD_GROUP}"
-pidfile="/run/gsad/gsad.pid"
+command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}"
 retry="${GSAD_TIMEOUT}"
 
 depend() {
@@ -20,5 +18,5 @@ depend() {
 }
 
 start_pre() {
-        checkpath -d /run/gsad
+        checkpath -d --owner ${GSAD_USER} /var/run/gsad
 }
diff --git a/net-analyzer/gsad/files/gsad-daemon.conf b/net-analyzer/gsad/files/gsad-daemon.conf
index f7c7ee514e50..e74b409cc84a 100644
--- a/net-analyzer/gsad/files/gsad-daemon.conf
+++ b/net-analyzer/gsad/files/gsad-daemon.conf
@@ -1,7 +1,7 @@
 # Greenbone Security Assistant command args
 
 # e.g. --foreground | e.g. --no-redirect
-GSAD_OPTIONS="--no-redirect"
+GSAD_OPTIONS="--no-redirect --http-only"
 
 # GSAD listen adress
 GSAD_LISTEN_ADDRESS="--listen=127.0.0.1"
diff --git a/net-analyzer/gsad/gsad-22.5.1-r1.ebuild b/net-analyzer/gsad/gsad-22.5.1-r2.ebuild
index 49e02618b234..7055f5038584 100644
--- a/net-analyzer/gsad/gsad-22.5.1-r1.ebuild
+++ b/net-analyzer/gsad/gsad-22.5.1-r2.ebuild
@@ -98,7 +98,7 @@ src_install() {
 			${PN}.service
 
 	insinto /etc/gvm/sysconfig
-	doins "${FILESDIR}/${PN}-daemon.conf"
+	newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf"
 
 	newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index a20c66640fe9..30b91c758cfa 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -2,8 +2,8 @@ AUX gvm-sync-all 727 BLAKE2B d92b004173747814bf063c5aa05fcfd5b37c04ab7eb9d044da2
 AUX gvm-sync-all.service 170 BLAKE2B 31aa75ba8733c73a2db4afbaf49eb5c40da3aaf9d4f11aad4b06dc2dc07dc927a54d2c2c8397eaeb43318430063b69fe2d803f16613af88887f8aad2638ee2f1 SHA512 8d9b862f729c64394b8801d36fefe4dfab0e0a80b603a19ed112f7a37e77c5a5cf906abafdd819b79df8dabc089b846e463c53317b0803e96dc2a5878a5639f2
 AUX gvm-sync-all.timer 183 BLAKE2B f91b69c6b2a5024c6cd9d678676071f7d5e175a3b35e0e34ffc03be7630df7519948c6c3285c7b265c73c0b7b4485706bba5673f89234c478ad6cd43d7305ddc SHA512 3716c8057bab3926b57e5e9868f4e00ec95940e5a9ea0506e16a152a76cb9b388ba5f0c8404245dcba5ba26bc789f0670781c41568d53a82412cd19689aca2c6
 AUX gvmd-21.4.5.init 771 BLAKE2B ade6f5e9da956d430062c4af610a496e449d5958897493a4b64323c2a2c74a47c5caf1d273c9a1186ce091048b63f0f685b33da9beecd2e6adbc9dce4b9196e4 SHA512 c481fb8352b34f4035c258858ef61ca90e36761210527360db8cda4c8687b2cb6fa1130f4f8a1b0f6046b3f39066c89e34c2c3c00b2090c8bd60bed57bb92197
-AUX gvmd-22.init 881 BLAKE2B 112a26516731258abb1ff91fd8f81eb1f77bed2ff77540d10c416d18e580690f863fe4a7b0d87f22117c772e154ba5599c82ac6eaa595261a1cc29749f418914 SHA512 126cf722e6d087cf911794abb33c7468096d4f98725ff98d52db510d1e277f35d53397a19a35672304713fa09ac5fdc94ddd4321306900413f30ee42eab37062
-AUX gvmd-daemon-22.conf 818 BLAKE2B 15febb320cc0358beb6f2bb02c740f3ec3eb24f06154fe4f61afaf140e7b9a0a65288cd4c84c34b156c6129c1526eb8b0efc9668cc93aecbd50bdf7a7d5d3675 SHA512 9bd2b3dfd0f2417a2d575ef063cecb0d9f4babe6371eff5f94e38f3e8c61fe769b16d50d492c4564f0d9a702b4eb9207c004c94efec172f278ee088cae04b487
+AUX gvmd-22.init 743 BLAKE2B 7c2a20b96c0810c3b542d33e37dbdf874c61168287f4fcb22b151e2a12b65dd9d1586dfcc228c941136f4a204df5661f9547dcb3c440a57fd80e412a81cdfc6f SHA512 17da410edae524b28ae66fed6adc15cd553f2c7bac6d34eff06288e5ae476dffa88efbb484accbf25a5045fb36cf23bb5583ad0adcb3480f9450d5bf150dbb40
+AUX gvmd-daemon-22.conf 892 BLAKE2B 1b8c15d6c889e471d86d6a12f7795c0d126f905c55e2588937299868154ae402a8aeb4d71f0492920df738076d4dff41c372bef22432de69bf3f499da8f58028 SHA512 dcee0ad72e86b7822ca1dec11a60da9cfcfc7db50d1e179b3f819ed14e93b88e552b4b18a30fdac3423dfb913637e307e55da0aac73903ee6e736c41cde41454
 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb
 AUX gvmd.service.conf 552 BLAKE2B f941faaa568d378d78c911e8c79b6d0cd384e042f6af2bd0d1d5f2ec1af432d86d548f1cc1e2ebed161b5f7c866b716fa1a456d51725e70ed513b55f62c647df SHA512 0e74bc4851c07ddfaf9cee361b466c1ae3eafa25b3d1722bd9cc925b2d648c62706ffd10504fa2a530bae72ba756f083388f570fad76835db3087eea2bd8573e
 DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
@@ -11,5 +11,5 @@ DIST gvmd-22.5.5.tar.gz 1034891 BLAKE2B 86382768133d18be08d5536ad02e501affa9c3c7
 DIST gvmd-22.6.0.tar.gz 1039082 BLAKE2B 0e6e53ce990090e212e035f2224bfa84c906f130dd5a33f5e57a53b3a5b82afac725db4412c5d0f3de0abc2fada5120845eaf3b93db18aa1137c948a14964594 SHA512 de6688dfd19b9bb779a963b3f8607818dad13da4024b7e0a0e80649cb11bbcf0a65bf1b72eaf5408ead2dabff2e806a0f7dd8472c6f314774b82fcd01fb37b37
 EBUILD gvmd-21.4.5-r5.ebuild 3198 BLAKE2B 9edf07dcf189b01b98e27aa2230e082d53bb5491da674fecd0d743475ba0bbb87cde73ea8fffe8b320aee002abd489b942ac34687e955a1c3818a9b347752581 SHA512 7eccbc904374ce4713e22c209e0ec3720e3c81e38b5d21391f6c84bde92b97f68c7f65a1af787e79cf97264b597ed112c793ac208f3d54234fbf821dd792d21a
 EBUILD gvmd-22.5.5.ebuild 3294 BLAKE2B 4e627afcc395ba8876e6d5200836f6582d4585c41506deada63736ecc0de3dcd42ef65c03fd12d96782a1c17921260db95833e30d498fb7a2fee023414d2f9b9 SHA512 88a01e213a2fadd2d77941fa4887bcefe177b21f49292b6f18a538891c4bb0d22960b2d5164d8e96efbf4e236ee48d30ab61ce13501fb1c1525bf088563f8e25
-EBUILD gvmd-22.6.0.ebuild 3294 BLAKE2B 4e627afcc395ba8876e6d5200836f6582d4585c41506deada63736ecc0de3dcd42ef65c03fd12d96782a1c17921260db95833e30d498fb7a2fee023414d2f9b9 SHA512 88a01e213a2fadd2d77941fa4887bcefe177b21f49292b6f18a538891c4bb0d22960b2d5164d8e96efbf4e236ee48d30ab61ce13501fb1c1525bf088563f8e25
+EBUILD gvmd-22.6.0-r1.ebuild 3199 BLAKE2B 4e0edb383313e7e908b0695696b7655de37559b68e1dd9921872c7dea31d7ecf7bf6491893d46cfdc6fa85908220dc789345712ad6a889ed3b11682955675a67 SHA512 9ba7d36a8c9159bf61fad884a08c0e321f5627eb1e7d9a5ad0828ab0fd6ce95e8892e89e6bccf20f61ac84460d5b74e04ba3ec2cba45cb3a16ba45591b8c066a
 MISC metadata.xml 1138 BLAKE2B 5abfda85605cdc2bacbfc1295b9b443ceecda1a3bd51423a1c35c4799d42f8aec6c4d5c8bc29293a800193016bc0065361ff55616859064c061b105b31fb0f18 SHA512 f09448bd5acd5ed22611ac455c94a3ae0a0531a9aeec6bad638c48cfeb627fef5214c0734d04951ef18ee96046b8e89b812c198e6147fb21f8d5dd495ed4bb67
diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init
index f1ac6ddbac72..8fd1a0bfb335 100644
--- a/net-analyzer/gvmd/files/gvmd-22.init
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -3,14 +3,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 : ${GVMD_USER:=gvm}
-: ${GVMD_GROUP:=gvm}
+: ${GVMD_GROUP:=$(id -ng ${GVMD_USER})}
 : ${GVMD_TIMEOUT:=30}
 
 name="Greenbone Vulnerability Manager"
 command=/usr/bin/gvmd
-command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
+command_args="${GVMD_VT_UPDATE} ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
 command_user="${GVMD_USER}:${GVMD_GROUP}"
-pidfile="/run/gvmd/gvmd.pid"
+pidfile="/var/run/gvmd/gvmd.pid"
 retry="${GVMD_TIMEOUT}"
 
 depend() {
@@ -19,12 +19,5 @@ depend() {
 }
 
 start_pre() {
-	mkdir /run/gvmd
-	for p in gvm-checking gvm-create-functions gvm-helping gvm-migrating gvm-serving; do
-		touch /run/gvmd/${p}
-	done
-	chown -R gvm:gvm /run/gvmd/
-
-	touch /run/feed-update.lock
-	chown gvm:gvm /run/feed-update.lock
+	checkpath -d --owner ${GVMD_USER} /var/run/gvmd
 }
diff --git a/net-analyzer/gvmd/files/gvmd-daemon-22.conf b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
index e1a5482747fc..061609e1c45c 100644
--- a/net-analyzer/gvmd/files/gvmd-daemon-22.conf
+++ b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
@@ -25,5 +25,8 @@ GVMD_LISTEN_MODE="--listen-mode=755"
 # Scanner listen address unix socket
 GVMD_SCANNER_HOST="--scanner-host=/run/ospd/ospd-openvas.sock"
 
+# Update vt
+GVMD_VT_UPDATE="--osp-vt-update=/run/ospd/ospd-openvas.sock"
+
 # TLS settings
 GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"
diff --git a/net-analyzer/gvmd/gvmd-22.6.0.ebuild b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
index 22ce3ef705d4..d7a4a809642a 100644
--- a/net-analyzer/gvmd/gvmd-22.6.0.ebuild
+++ b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
@@ -112,9 +112,6 @@ src_install() {
 		fowners -R gvm:gvm /var/lib/gvm
 	fi
 
-	dosbin "${FILESDIR}"/gvm-sync-all
-	systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
-
 	systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \
 			${PN}.service
 }
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