gentoo auto-resync : 09:10:2023 - 18:06:43

14 files changed, 39 insertions, 37 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index fd1bdc775410..1d4c8b9a94b1 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 044af1b5c205..6365e2e17f00 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1,9 +1,9 @@
-AUX gsad-22.init 733 BLAKE2B 53cca8b8cdf86ea094bc9f234425507caf46fe1b70c9bb5af84f60c0687e8c89bba1d8c891f5c6337002ed8454fbc65093f8457876a3419244f0014a132be8da SHA512 83677ad1a97870a5b10b88d56de65b2d0959cb594207538d9d781e1cb2249d6b1b255b9c78fe37ccda73718a683963d0dd7f1f53476f46473309006dfe2de1e4
+AUX gsad-22.init 863 BLAKE2B 874b4883bcc57cd40a12fe88ea11a8c63e935fb87ff5bf73ab3725f04f55f9fd677bd90f37a1ef8c8fadb35767eaa4aa87bba0668a07e9da68a614da965c22e1 SHA512 00f0e87de505678eb8fbb2086a3f8426c46eb1ec227da3a28a9ff12ef16b8ac2b612e135f779579778bf545724b7c4ada0ca54a49c70d5e49a0dca44e5b2882e
 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.6.0.tar.gz 223879 BLAKE2B 7e1d55052ef255d92cf8fd3c32f5490e192dc5635e4d9be8804ff0a72677add70081d0fff882673ea7dfc70e97acfb8012e683fefa9e6307661a39697a89eaea SHA512 39393d9190281065978d7fdb4745daa5faa066b6cc97a81b442f989eb8d466be05d6af39585ea4649555b88db819a6ced909b2e3a8e640df4c500e37bb26f05f
 EBUILD gsad-21.4.4.ebuild 2329 BLAKE2B 35f607bb6ca44b9a42ad60bcda84c825251453a77ef146147b0f551f6b04968cc4a38c9a3f566bd0539436761ce6ed072b5b925e98f9db74faa0698c80ff1094 SHA512 4084d98b9893a037512fc0233a908ee1ec7afbe43f1e700a45627f40291da44b17f627ea731623ab1500e4f72ab31b4b5f846d84751185dbfde82c8f946fdcea
-EBUILD gsad-22.6.0.ebuild 2211 BLAKE2B 8d7c9d7d79eee9a3a0f3144e046ba5f1ea722747f2afb4071f2b805746fd3232500d04b054676bf5aa9776d4668c23cc9ed0daf34fb74212a18feff71898c403 SHA512 cb581441ed74d0569d97621d9759eb6cde404a1f8336e6ca364b064b8c4658c10db39b581b4badcc7c97677018589c7e1e76325dfe02a88bff4c45b1613a2ca8
+EBUILD gsad-22.6.0-r1.ebuild 2211 BLAKE2B 8d7c9d7d79eee9a3a0f3144e046ba5f1ea722747f2afb4071f2b805746fd3232500d04b054676bf5aa9776d4668c23cc9ed0daf34fb74212a18feff71898c403 SHA512 cb581441ed74d0569d97621d9759eb6cde404a1f8336e6ca364b064b8c4658c10db39b581b4badcc7c97677018589c7e1e76325dfe02a88bff4c45b1613a2ca8
 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 aae78b2e1ab8..a17f2dc1c084 100644
--- a/net-analyzer/gsad/files/gsad-22.init
+++ b/net-analyzer/gsad/files/gsad-22.init
@@ -3,6 +3,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 : ${GSAD_USER:=gvm}
+: ${GSAD_GROUP:=gvm}
 : ${GSAD_TIMEOUT:=30}
 : ${GSAD_PIDFILE:="/run/gsad/gsad.pid"}
 
@@ -21,6 +22,10 @@ start_pre() {
         checkpath -d --mode 0755 --owner root /run/gsad
 }
 
+start_post() {
+        checkpath -f --mode 0644 --owner "${GSAD_USER}:${GSAD_GROUP}" /var/log/gvm/gsad.log
+}
+
 stop_post() {
 	if [ -f "${GSAD_PIDFILE}" ]; then
 		ebegin "Removing PID file"
@@ -28,4 +33,3 @@ stop_post() {
 		eend $?
 	fi
 }
-
diff --git a/net-analyzer/gsad/gsad-22.6.0.ebuild b/net-analyzer/gsad/gsad-22.6.0-r1.ebuild
index f8fe3475bfda..f8fe3475bfda 100644
--- a/net-analyzer/gsad/gsad-22.6.0.ebuild
+++ b/net-analyzer/gsad/gsad-22.6.0-r1.ebuild
diff --git a/net-analyzer/gvm/Manifest b/net-analyzer/gvm/Manifest
index 7a41c5004020..414c2ceffc67 100644
--- a/net-analyzer/gvm/Manifest
+++ b/net-analyzer/gvm/Manifest
@@ -1,5 +1,5 @@
-AUX gvm.init 550 BLAKE2B 20b5bfc7425abd0fc6a4e7c0b71641c4fe227f3ba43ee1416732b2e52f61944ab57a48d630787a1ad1a773a9cd4d7d569d709610c57de9f7d0c9b1537d8a0508 SHA512 2b63026a0cbc8d4be7c46fffca830d0e6cbe069fdef516448325c761adb44529bf70e9071c32a1ab3352d87b40830d3f9e4e7c629c27a6f4615b3ab6c4403b0e
+AUX gvm.init 547 BLAKE2B a9dd15fd123dc7a2a37b73651992b9ad56a0c8a1ae048f11d1ca82ecb4c085a9c5f395890bc1dc4883a00b9738647dfcdb996075b062463583c33491d0d7ff94 SHA512 d52f2b47ddafb012b76f0d4b96c73d358faba55259ed6718395328e1abfe391b09f4616053eac65f6de5bcf391e14ff3b5d4a4a5ad0f7ef87bf5fe3bd6b7b606
 AUX gvm.target 338 BLAKE2B 215e2bf35ad1be674a77093db9b4a010f6145f295af172959db6b88b6d11616af1fa8b81744a5dcfc54b8a1bdcb9e5bad7c8b7ea969a0ce07cc4881ff98d05f5 SHA512 3999a33fb28bc30619fa8b39290c9f4545568bf5d15b518455d2e896c07d1002cad51ba6391627b26894dd653999ad571a7fb354a87e2ac707bbb1753e35e1a1
 EBUILD gvm-21.4.ebuild 899 BLAKE2B d1088b804e9c6ef988e60e6e8fed8346f172ac364b59e7ff03ca5db8de22986db5f6c6e476d4d664c9cbd73cb32359a779002bb9eddd05c6a97d465cc666b4fb SHA512 045aa2ff19fdc6178d934df1f06606c1ad862c83569e4d12592671ac7d31ade18c27f7adf97f660f402ed50c150207b4e806bed1564500ba8c3158479e8f3d69
-EBUILD gvm-22.4.ebuild 1126 BLAKE2B 6b86293d6eff7935670f45ce4bbc42d53e48f7c9a004fdfe5972e3ab604139251f100e64f1f14b3d04e5fc649c2adb67c0e16b087bcc1183a984728e368f8882 SHA512 436bd77be522cedfc43092a532c8be5358d0fc9ca50e3beb72820f49e13425fd51590727f0b6a2f52713d26b88fcbc6e02803ed7d261e5ac8cb4b192f6232a9e
+EBUILD gvm-22.4-r1.ebuild 1126 BLAKE2B 6b86293d6eff7935670f45ce4bbc42d53e48f7c9a004fdfe5972e3ab604139251f100e64f1f14b3d04e5fc649c2adb67c0e16b087bcc1183a984728e368f8882 SHA512 436bd77be522cedfc43092a532c8be5358d0fc9ca50e3beb72820f49e13425fd51590727f0b6a2f52713d26b88fcbc6e02803ed7d261e5ac8cb4b192f6232a9e
 MISC metadata.xml 1095 BLAKE2B 2c01e221dbde7b0a8d83c0c0b70af67eaebe273199d5411f2c5b3da246193ed26d9c45fa5f901be6f22c557cf866a18238a16ec16b2d9d39971d1f88ad1bdb52 SHA512 521b8ff80e4d0d13cc7c008009ed283a422126c1cd560f10063f09c301b6821d81dd59463cf90cbc3d245260150e12ec9682de513a8dcae238fb3ef5cd094b51
diff --git a/net-analyzer/gvm/files/gvm.init b/net-analyzer/gvm/files/gvm.init
index bfd184221622..22a736c403b3 100644
--- a/net-analyzer/gvm/files/gvm.init
+++ b/net-analyzer/gvm/files/gvm.init
@@ -9,9 +9,9 @@
 name="Greenbone Vulnerability Manager"
 command="/bin/true"
 command_background="true"
-command_user="${GSAD_USER}:${GSAD_GROUP}"
+command_user="${GVM_USER}:${GVM_GROUP}"
 pidfile="/run/gvm/gvm.pid"
-retry="${GSAD_TIMEOUT}"
+retry="${GVM_TIMEOUT}"
 
 depend() {
 	after bootmisc
diff --git a/net-analyzer/gvm/gvm-22.4.ebuild b/net-analyzer/gvm/gvm-22.4-r1.ebuild
index 4639c27b5590..4639c27b5590 100644
--- a/net-analyzer/gvm/gvm-22.4.ebuild
+++ b/net-analyzer/gvm/gvm-22.4-r1.ebuild
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index f493a0a79048..f1a8a4c48b9b 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -6,13 +6,12 @@ AUX openvas.conf 29 BLAKE2B 0cb02f4b349d996b07ca19a531b64a35692ce5afb0d1fd4b58b6
 AUX openvas.conf-22 43 BLAKE2B 6796e4898eacde996fe22b8921ed6a8f4f7e7d1da06caaeca7888138614a53c2d83a7fc639c8f38245c86c1c96272aa7503f8faa42994b47c6ef6a3481c7ba28 SHA512 56254f0d7f39728e5d65efff4070d935b897793000251229b1aba20afdd9602302b77ac0252846a3586e4103b5ec7a4b72d3a653cecaa26b7cdd9128ef53605b
 AUX openvas.logrotate 328 BLAKE2B 596d30efa17aabb91270255a0f5b93796d4ed6a388db9e6525f1060dcfe54f389aa53e244e959e0aa22f99ef575c9882d4934140238c8a3d133cb1a1ec7a735c SHA512 a459bd61a549f1ae7ae079ffbca2b4290d3beafd0952a380429b152b04ebc25aea003c349a8859015345db48cfa0a2b7a887acde6d0484afb5141265a66dbee6
 AUX openvassd.logrotate 330 BLAKE2B faf900a6882bb23c29859080d0c140c9dde8dcab42f31c31bfd43342beedab0bfe711f4e918aba5c7f8e5bb91430e251e270d0bc2e6f49e84ce98cdbbfe6d023 SHA512 397c9fd0d63ab66b463f65b6d235ec3e4e6ca52a3c811ddd4efcaeffc05fed8f9cd97605f439a628c144ecc1cfcfd31290d2a9dc6e57e8197d063b4aee63d73b
-AUX redis-openvas.confd 523 BLAKE2B ad183d69731693602f73128af57b81c5ae90bbf82042f8ef1b2803fe0a6d1c6fac6e158b3f080d6b993354657c0dacd1048265934446c897709618f33bff0d85 SHA512 3535e302534f220f9756ed2ddb2b429dd96828c00e8b9858561e478ac943d9c40ecfacc917fdadf652ba15753008e23642fc0c934942aa2fa2180dee5b61569a
-AUX redis-openvas.initd 720 BLAKE2B bb14cdcc693c0fbb9da1ea14332e93bc56e883cbd0e8459cfffc279bd8dce2cb93aef3ec00885b97743b046eb6c6a79f0f75c4d20881ac6115a5980ebd5ce060 SHA512 870bffa5f3e898f912283b4bc40cec63579ed56dbda0cf1991a440bdf993bb22b18178575cab03efb05774bf39690eba32b9d9920987b716ff9277a834637f04
+AUX redis-openvas.confd 527 BLAKE2B 84bc4461630b19b02c724f72d22b0b4d04dd63a2257589c591d752c743aefea74fa4a918327826c77b32a47d372d3029981177674647589eabdf9d97037ac56d SHA512 85d24f64ef6b05c53ee2cf4f3ac33ac66e2a7e990c650249a2a6f3faf85276b9a4454cb5c17e51b747aef360c2648cfba352f04f75f3b3f88fc21b1339a04b5d
+AUX redis-openvas.initd 837 BLAKE2B 24b99abea71d574eb7ad32fd243f2a32ba17bf59eaad685b40a2647b1259a18e0baee62840dd9770f28d022ef46e84b0e1e8668487e26e2d1e0e100f959d644a SHA512 b5368b85d907cda5fdefc09cc9e3401b323c9e3599400a3085c9d58b4d68eca06185150b93ed927af6b020e7b69d351fc86b16117d7e5907278d8e645996bb49
 AUX redis-openvas.service 280 BLAKE2B 9a11408cec88a57ae71fc4a4fced63dc3d35157c979409f4db5037a9cca1c386b0521d30064a741fe5d6e8891c84bf561fcf609ef35082c6ca34ce98f4a1ee31 SHA512 3afd6b57efcbc9bd90fc88a9021094a0fc7f27bd0805077e71df1ba94de8d1687a209ac730f0014f9c3af5ddbd8a77b85ac07dd09bd98551a24f10a0791b24d1
 AUX redis-openvas.tmpfiles 63 BLAKE2B 8e3d29cef1ae0f815f7ef4da76b14168168675be4174ed1435521c26633a1f76088ab3cba5283e0c03d9f1e03abb085fdcfdb83d741f9132096df317f7f19c11 SHA512 936613951d7249c5536b4b20128bc4aef66fc05de95bece6cf2436117ed95d5dfba81cc7e16db9f765708b618a74ad83fcc52c7ccb8ccf480dd3cb4ce64cc986
 DIST openvas-scanner-21.4.4.tar.gz 460601 BLAKE2B 66d627e76912735539399aed637fdc07a7d13c9e4eb142498dcf181b8ea952dd93107bcc1f2ef577126178ff3dad1e5f6e50d67840692cd49f7352e3a726ce8f SHA512 f2fe1f802b14fc41ee0d7657d031d318b651c3ec9ef554b33379a7459d40c17b44525c8f666ccb9670868576c101766936dd0c700778e46683bf43f0683834b6
-DIST openvas-scanner-22.7.3-fix-automagic-dep-on-snmp.patch 2669 BLAKE2B 1ac0478c23d8102d0928552acefff01661db55949cf4f0540d9a8608078ff01e5d794f7a851095cfcdd49657593e7ba2340c665b3f87615ae4ca7cee2eb1248a SHA512 7dc3cf4d39733706516909e4724272abf17cd20b9a6104b6a03166056415905748c72ad629258a430e19aed553cc1659587c0a0b6c7991c35605ee82e9caea5b
-DIST openvas-scanner-22.7.3.tar.gz 962647 BLAKE2B d3ce0be58b41bef6c01c5e831307713fa95913dae70cb6e67d82c196793817f516429f2ef1efffcc58863165913524a10465f33aac5f283d94d21595aaad360c SHA512 c729fca47534e289c26f5c5ad1766fe0101b1fc287609d5b40c65108152b1069b759ecfd6375999b6384b2b90ffff420336f5ce134256bd1a5fec5b5523a8272
+DIST openvas-scanner-22.7.5.tar.gz 976268 BLAKE2B 0a8b2ce275de5baec614e18164fcc13029373233e3e6acc31124e0660c9c82a8aabf2913223983014518fefe534048fd8a23a7457727ffa165c8a3ea58cd44d0 SHA512 cdbafb80e74f948043cae87e27a10df5fb7af1bb4112a3fd593f60233fd3c9a46d3ffb80b1fce195bed7de6308228b3fe7fcbff6ed493791627bdd3767987261
 EBUILD openvas-scanner-21.4.4-r2.ebuild 2780 BLAKE2B ad007b59d5f9337adadfadff50648d67b741fcd35d14dcd731ab6b7301c7ac7141487081103c1f7a54d89a2d077eca2c94a391d4b95bae855d35c5975ec00164 SHA512 2f59c429409fd5eec2163c8eef9d0e97f8a5f555ae764fb51b3591e4630fa9462d6a393f28605453eea3b7c54736da01351f1ce67565787fabbbae74e136e251
-EBUILD openvas-scanner-22.7.3-r1.ebuild 4024 BLAKE2B 48c81d8b61ab6d949acc12bef6f9b3aed6d957eb7819b140a76ded9ba3324abd774c9fb4551d6cf9437efae89af8941c936af839ca1a32c7bc008ea007003616 SHA512 983249837943322a3227105eb17afb3f1047f7d9f2f6298d6360797b7e58e624d34b4c980120bad64091f86208d2575b0958e5f7d334b7bafc7185b489590c50
+EBUILD openvas-scanner-22.7.5.ebuild 3789 BLAKE2B a2b3affd3f92ae549b791d0dc68462a6690cd7d465cb7c12e1b9b58f369e8bd0526fcfeeb089c7df2f8f7198306c63c3415cdaedc3df253208205731676eae08 SHA512 47e51e18026eb6539148da144fabc41fc6bcb88bc9f57b7c011ca16581dbdd56d568238fdc7b0d1a9e3b6f2057c4e2ba208f6d9aabe2efdc0ff4a510980e3f9a
 MISC metadata.xml 1082 BLAKE2B a428b18c1fba3380a42e1120fc58c8c950900723f5cb11febdff5d86cd16bce0a17fcdb4c48867435a7c39243a7fa7e5c15ebb3fb0d6d44fc23ef56197530b6a SHA512 e41f348b1ae728e27efb71e5ebb9e468ac5d0b31526a4db922f1bc2d3f3029a5b75be2db6cbac14754107326c4af570e6673b2e66f44317677e319116daadaf6
diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.confd b/net-analyzer/openvas-scanner/files/redis-openvas.confd
index 2e9ec5cfbf16..6a75dfdc7d28 100644
--- a/net-analyzer/openvas-scanner/files/redis-openvas.confd
+++ b/net-analyzer/openvas-scanner/files/redis-openvas.confd
@@ -8,7 +8,7 @@ REDIS_GROUP="gvm"
 REDIS_CONF="/etc/gvm/redis-openvas.conf"
 
 # Redis dump directory.
-REDIS_DIR="/var/lib/gvm/redis"
+REDIS_DIR="/var/lib/openvas/redis"
 
 # Redis options.
 # (Redis expects the first argument to be the configuration file.)
diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.initd b/net-analyzer/openvas-scanner/files/redis-openvas.initd
index 5c50d29dae6a..058d99d063dc 100644
--- a/net-analyzer/openvas-scanner/files/redis-openvas.initd
+++ b/net-analyzer/openvas-scanner/files/redis-openvas.initd
@@ -1,8 +1,8 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-: ${REDIS_DIR:=/var/lib/gvm/redis}
+: ${REDIS_DIR:=/var/lib/openvas/redis}
 : ${REDIS_CONF:=/etc/gvm/redis-openvas.conf}
 : ${REDIS_OPTS:="${REDIS_CONF}"}
 : ${REDIS_USER:=gvm}
@@ -19,6 +19,10 @@ pidfile="/run/${RC_SVCNAME}/redis-server.pid"
 retry="${REDIS_TIMEOUT}"
 start_stop_daemon_args="--chdir \"${REDIS_DIR}\""
 
+start_post() {
+        checkpath -f --mode 0644 --owner ${REDIS_USER}:${REDIS_GROUP} /var/log/gvm/openvas.log
+}
+
 depend() {
 	use localmount logger
 	after keepalived
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.3-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-22.7.5.ebuild
index 096f3452f3ff..fa42f0f1eb67 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-22.7.3-r1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-22.7.5.ebuild
@@ -11,8 +11,6 @@ DESCRIPTION="Open Vulnerability Assessment Scanner"
 HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"
 SRC_URI="
 	https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/greenbone/openvas-scanner/commit/c9ba348e1a7fa99a0b41a0e53f251309f2768187.patch
-		-> ${PN}-22.7.3-fix-automagic-dep-on-snmp.patch
 "
 
 SLOT="0"
@@ -23,17 +21,17 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-user/gvm
-	dev-db/redis
-	dev-libs/glib:2
+	>=dev-db/redis-5.0.3
+	>=dev-libs/glib-2.42:2
 	>=dev-libs/json-glib-1.4.4
-	>=net-libs/gnutls-3.2.15
+	>=net-libs/gnutls-3.2.15:=
 	>=net-analyzer/gvm-libs-22.4
 	net-libs/libpcap
 	app-crypt/gpgme:=
-	dev-libs/libgcrypt:=
+	>=dev-libs/libgcrypt-1.6:=
 	dev-libs/libgpg-error
 	>=dev-libs/libksba-1.0.7
-	>=net-libs/libssh-0.6.0
+	>=net-libs/libssh-0.6.0:=
 	dev-libs/libbsd
 	snmp? ( net-analyzer/net-snmp:= )
 "
@@ -53,11 +51,6 @@ BDEPEND="
 	test? ( dev-libs/cgreen )
 "
 
-PATCHES=(
-	# Fix https://bugs.gentoo.org/911114
-	"${DISTDIR}"/${PN}-22.7.3-fix-automagic-dep-on-snmp.patch
-)
-
 src_prepare() {
 	cmake_src_prepare
 	# QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 7ec0b5bbe84a..26dc038f724c 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -1,12 +1,12 @@
 AUX ospd-openvas-22.confd 75 BLAKE2B 252dc02627b72869705b6ba9a5c900f9687d1f79168f3dbe1e99d03e6c8001e95403f1df0d51ae8dc3780402cf99f2bd1782217f537a2ade206b71d52cf254a8 SHA512 5b7abda759df3aaf3e32c9ab8c8ec6a4f46fdc7be8bb4380ec41bee7aa99e6f7368fa61f9a92ecab508a51fe7ebe52f519ec16cff78f1d579c853b8c5d476b40
-AUX ospd-openvas-22.initd 547 BLAKE2B 05f5b9b339948bddc6d9d8d88cbecc7dc5e674ec3a2629eb9553452d8e70251280b5eb18391833ee603f3056c244a31fbbf146dc75d12da867e3259a82924fa1 SHA512 45982400f75782fb8c839bbb5dee006d44385654bcc5a30425c82c377b092f61b5210b2e030639ed72bf593e6b3fb9f234e95c82e9844808a9666b5dc0d4c3d9
+AUX ospd-openvas-22.initd 596 BLAKE2B 5cd640050fcd374bfdefaf17c904fbfdd99ea795b0ff9b64c9f358ed45d55adc5a16a1d815d0020a2e04d473113907da926f9db7bd6132e28aa916ee1e8905aa SHA512 969f16b533539c7abc5cb5cf147400ebd1e3f334f650628ab4a80858f23ae473a330f325fa132cf1104edab7ac60f88d17c6097396dfaf3d8e263b16e3c562e2
 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
 AUX ospd-openvas.service.conf 208 BLAKE2B b392bddb4caa281087a238c79c368bdf38439c9ddaf470e034db60d9847269966e19d6a111218fe92e6c5f05dc414ab88c0fefd1916c0d5c5bca28b30d92824a SHA512 ea1e59e1c4e6d98ca0058f42bd7454768cafb8c410611350eaaa7e232d7c580f61986f41de5fdeb752b73bd9cafd04c1e9ab44975b8d177e63537ed991418fc4
 AUX ospd-openvas.service_notus.conf 479 BLAKE2B f0c63fdd48396c39001823890aafe08228b2b37d14b81b02350b9ab0c31c02905c4b407785ca7b325f1ef48f92e38bf6f4bba287c406a274974c51d402a35dce SHA512 5d95f366f7b139717897b668e86d3f98ef98d7744106ecf456e5ba6bcf37ea6baa19a7925a46853a5f31a76c94a2537309fd944d5b99b07da19c020128937153
 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
+DIST ospd-openvas-22.6.0.tar.gz 248449 BLAKE2B 83f4fc370e23249f62e358c9314341c17b39d618407c7f176b36981675707c749aacf07a1daf9e57ebd8a4673cb17b22bf2e63f7e1c3f55e2df57deab4986109 SHA512 f98e59d5898ae75bf6fbadfbcf57bb1c810143bba88bc4ffb5bc30d3780638577f73ffb265e80beaa9f3e67c6b7032264ca2c0375698c886a2f3ad101ac4310a
 EBUILD ospd-openvas-21.4.4-r4.ebuild 1902 BLAKE2B 67a71298b7506ca6906599d8e7c9edb8b6f98337f267913849a5cc112dc949559114914c0e8116cf8945e4b344ff2e15e1f4bcdab4980fa9bf849405b8b02c2f SHA512 f636d9181d96010c7367912d6421f2ab12d55df26bed987e77ab77e26d745002775ff2236c5325950e8ceaf6fc3b3746c9e0944602c0547f31b213bf8347afe3
-EBUILD ospd-openvas-22.5.3-r2.ebuild 2040 BLAKE2B c18daaeb6eb89cc5b0091978b324a15fc96a9ed8e581052570e286a6d55f65cd05a0bb0f39d9d88a78111cf05258d5f058e366c19e55f90ce853b7932c7e0ca3 SHA512 4526c3d6c28d86aa1edd65110c988bda0fc33d2b9cbec9c80a70f4626c421f54caf2ecd17d973126d9042b7e24ab32ad712d3d516e6121bf926eae6d72f4fa48
+EBUILD ospd-openvas-22.6.0.ebuild 2123 BLAKE2B 214e078e4966f95089cd2ab5f6b7301db5b1356fcdee7e68a475ba1c8688f9a3d24f273972eb29dc30514b0e6cd74ed28d5d8c9000afd6abbdaa47e5aba5aabc SHA512 13d1b72eb2e908c345067eebf1fa9d286ba96793a8fc3022adb3146d09a98e4cb522cf19ab7c216d2a62ebc95b7d681008e8d46af188f2f27ab61ee289e9f615
 MISC metadata.xml 1029 BLAKE2B 603e12bc771225baa50afc6e5254b64215055d9399c9d1862611150a49a74f397af610676ca273506f2359513b42d91786ef9f7c9100789437c00b8e59f6ccb2 SHA512 bf49f3444f277ae4b798a5c01d4c4dc5804187479774e85a9ea7481bae3b596df6f330979560ed43aa310cab72ba50dae4eeefe65a8e7dc6ada14659122ccaf7
diff --git a/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd
index 7c79d85d8e1f..d8ef2f27c214 100644
--- a/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd
+++ b/net-analyzer/ospd-openvas/files/ospd-openvas-22.initd
@@ -11,10 +11,11 @@ command=/usr/bin/ospd-openvas
 command_user="${GVM_USER}:${GVM_GROUP}"
 command_args="${OSPD_OPENVAS_OPTIONS} \
 	--config /etc/gvm/ospd-openvas.conf"
+pidfile=/run/ospd/ospd-openvas.pid
 retry="${OSPD_TIMEOUT}"
 
 depend() {
-	after bootmisc
+	after bootmisc redis-openvas
 	need localmount redis-openvas
 }
 
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.5.3-r2.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.6.0.ebuild
index f1be6523d1c9..799d7633ff7d 100644
--- a/net-analyzer/ospd-openvas/ospd-openvas-22.5.3-r2.ebuild
+++ b/net-analyzer/ospd-openvas/ospd-openvas-22.6.0.ebuild
@@ -18,14 +18,15 @@ IUSE="doc +notus"
 
 DEPEND="
 	acct-user/gvm
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/defusedxml-0.6[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.10[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
 	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.7.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-3.5.3[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
 	>=dev-python/python-gnupg-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
 	net-libs/paho-mqtt-c
 	app-misc/mosquitto
 "