gentoo auto-resync : 03:04:2024 - 20:14:28

10 files changed, 251 insertions, 11 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 6b59e1b98f82..10d03bc518e4 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 43c6d9376c65..1ad48d9ef28b 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -3,6 +3,8 @@ AUX gvmd-daemon-22.conf 892 BLAKE2B 1b8c15d6c889e471d86d6a12f7795c0d126f905c55e2
 AUX gvmd.service.conf 608 BLAKE2B 95845701a20d93c1e09c960b912f32b063f9bdf90c955bf7483661f2cce7788367458480f3800abc7f4904702a0dfb7124fff0c5f38f7d495e0fa3d89e5ae9d0 SHA512 5c67480ac44f619fc0d88ec2140a1e4c6b7defdba2c18338df05f72db1c8c642d1a91a2ca35fcf3cef8719cd360cdf335a4010f932607cbcc2a4a3ce660ce3a7
 DIST gvmd-23.1.0.tar.gz 1050719 BLAKE2B 9ff3e679ac4c4ff0e4a5eb1ee9ed4c9d243a96b5c4d63934576ec86d70f15f6ff6dee839e29c0de50af3a829e141fa416ac993935f0a683ca135f68f17e1489a SHA512 77d08067a168065bb3b4fd10ba94c48a3207378c9b8c0be42a9570c390c92b985ebf94c53cbbe04f78c2a802de430d599593e1971bc7b93d3f0652bfe59022a4
 DIST gvmd-23.4.0.tar.gz 1064194 BLAKE2B a74ed75c69f3f793058133ec6aca93ddba34efc51267b20333916d7291484f1b1eefa5527f3bb34137584a290e4d7d150d799f9f9b0f1473dfa8c3b4d83f9cfb SHA512 0c5b0d933444d25253e234f387e9063ebbeb379d330cab9ca4eaaddc0effe6fbda312b8de51b5f9784141d149f83b6f0069d7e1f72674857b8d041ab9bff6dfd
+DIST gvmd-23.5.2.tar.gz 1064064 BLAKE2B 84d2861f274a71b8a681cb1bfff01ee06f6bc9ab8ae0cb430e65b3f36e9f75076365efa9d5b5d6a5954d328fbc5e3aa6b942a4e1e875ca640ac814dbcc8d98be SHA512 4708fe0033d5244a988560ca9cbe8b0d5be0006690cc5c943eec3cd534329d776a556766a57257a07d40132fa5239455b9f71b4d0e9a5a4ba66d63436c2bc9f4
 EBUILD gvmd-23.1.0.ebuild 3231 BLAKE2B 85902d68a3c051b9fed5542a1fcd29a7ce00ea9b53959d5a0fad77747beea281c370e5164d44a556fa5de3363b6d6c4574f786df4deaf9ec1a051611d09b0e67 SHA512 05a4863b41b012730830a73a3bae507a2ae11e443f189b3058bd585c635d65d639a9c21671c65139f3c3916909d64e66cce01c34113be2cb261acd6380194d97
 EBUILD gvmd-23.4.0.ebuild 3232 BLAKE2B f1e6d93401d0c1a4232f28216bd1d952e31d06e1d812c4136874d4126e41fa4aa55a8e6a3727ed4c0b493bb9665aaf5fcee397e4182e5c53d83e8d596efaf04a SHA512 f19e2801a61fc620c24e2dcd3799f0bd4d5af2b0375c1ab23586a43dd50213e71851f4c17b35085a293849225ffaecfc66bbedcf0fa8216004817eda28ddb44d
+EBUILD gvmd-23.5.2.ebuild 3232 BLAKE2B d9017f0cb42483e40cad245b756bc3fe0406cd217e2914dedc835970fb0b8f45eb63e3812952a6182b9625cd86fa3dfb2396c440f89d47afdaf45282b218c727 SHA512 ec18968eceffdd1035e1912dca90b608a0c39b1d174cf507c5b74634231de7dee948735d7464f8c11188ed777827a399755c6915e9bad8f5252c3530f93debcb
 MISC metadata.xml 1138 BLAKE2B 5abfda85605cdc2bacbfc1295b9b443ceecda1a3bd51423a1c35c4799d42f8aec6c4d5c8bc29293a800193016bc0065361ff55616859064c061b105b31fb0f18 SHA512 f09448bd5acd5ed22611ac455c94a3ae0a0531a9aeec6bad638c48cfeb627fef5214c0734d04951ef18ee96046b8e89b812c198e6147fb21f8d5dd495ed4bb67
diff --git a/net-analyzer/gvmd/gvmd-23.5.2.ebuild b/net-analyzer/gvmd/gvmd-23.5.2.ebuild
new file mode 100644
index 000000000000..963a13a3b4ad
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-23.5.2.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake systemd toolchain-funcs
+
+DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
+SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/gvm
+	app-crypt/gpgme:1=
+	dev-libs/libbsd
+	>=dev-db/postgresql-9.6:=[uuid]
+	>=dev-libs/glib-2.42:2
+	>=dev-libs/libical-1.0.0:=
+	>=net-analyzer/gvm-libs-22.9
+	>=net-libs/gnutls-3.2.15:=[tools]
+"
+
+# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
+# and xmlstartlet are used for (PDF) report generator at runtime.
+RDEPEND="
+	${DEPEND}
+	app-text/xmlstarlet
+	dev-perl/XML-Twig
+	dev-texlive/texlive-latexextra
+	>=net-analyzer/ospd-openvas-22.4
+	>=dev-db/pg-gvm-22.4
+"
+BDEPEND="
+	app-alternatives/yacc
+	app-alternatives/lex
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		app-text/xmltoman
+		app-text/htmldoc
+		dev-libs/libxslt
+	)
+	test? ( dev-libs/cgreen )
+"
+
+src_prepare() {
+	cmake_src_prepare
+	# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
+	sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die
+	sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die
+	# QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
+	if use doc; then
+		if ! tc-is-clang; then
+		   local f
+		   for f in doc/*.in
+		   do
+			sed -i \
+				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
+				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
+				"${f}" || die "couldn't disable CLANG parsing"
+		   done
+		fi
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
+		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
+		"-DGVM_DEFAULT_DROP_USER=gvm"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	if use doc; then
+		cmake_build -C "${BUILD_DIR}" doc
+		cmake_build doc-full -C "${BUILD_DIR}" doc
+	fi
+	if use test; then
+		cmake_build tests
+	fi
+	cmake_build rebuild_cache
+}
+
+src_install() {
+	if use doc; then
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake_src_install
+
+	insinto /etc/gvm/sysconfig
+	newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf"
+	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm
+	fi
+
+	newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
+	newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/gvm/gvmd
+	if ! use prefix; then
+		fowners -R gvm:gvm /var/lib/gvm
+	fi
+
+	systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \
+			${PN}.service
+}
+
+pkg_postinst() {
+	elog "If you are upgrading from a previous version, you need to update the database version."
+	elog "Please, create the running directory and give write permission to the database user"
+	elog "then run gvmd as the gvm user with --migrate option:"
+	elog "~# mkdir /run/gvmd"
+	elog "~# setfacl -m u:gvm:rwx /run/gvmd/"
+	elog "~# sudo -u gvm gvmd --migrate"
+}
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 2d705e28d417..653dc7df25a7 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -3,5 +3,5 @@ AUX notus-scanner.initd 749 BLAKE2B 7297894e9bb740ed842870b9a09ed838eada8e5be16b
 AUX notus-scanner.service.conf 93 BLAKE2B 17030f4836aa96f45fdc9be67fb1b1924680ec29193bfc03d470bc45bf973542ca1b2bbb13253eb20c1618132b4b07c3fcaadd39451cb583d4c8f6fcd6e26c65 SHA512 36d5fbe95cd02b728d048a0baeed03448899696d0b3344a166afc9eecd6620e8af347ecc86c014ec9211ce72cc55a202a84b9ea68a7662c268378c37a734b08f
 AUX notus-scanner.toml 272 BLAKE2B 41cd9a81754ee06604373e8d4644362167ed7165c36d2c1c6b2b991bdf5efdea3f620a83ee489f113b9b3500e638d516565b3f8dd830df14a3abb551399dae20 SHA512 476d795b53ce5ef1eabc335122298b2a8c23b5476822cc7f062a6849ecb0e322cd73fabf8d1928c30e557109c08a1c920413da73fade7d5e68c55511bd2d1f6d
 DIST notus-scanner-22.6.2.tar.gz 316406 BLAKE2B c24ec5e4fd9f8fc181145d64580d04f7045ccf1a7570f855f0a8a79bcea842fe7a73d91fadecd61c10b94cb3ee68ecae98b0f91b4059b84258765be98c95057f SHA512 ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522
-EBUILD notus-scanner-22.6.2.ebuild 2131 BLAKE2B 28285bead20b54e79dde0e69b2d3b03bd215932c5e4a8290d1504630219914a80af3e2867fad6a733b2f20762acf4dc0d606ecc369653fbc1d46f5c1b6b3c5ee SHA512 a9c82cfc52304cf4bec4a77e13d8d5c18dfc1b999e1bbc4072ed861212c8a764e30cd89da4a540348eb83daaeb880e24a95ceee8f5df36ecc63dc149d3bd6762
+EBUILD notus-scanner-22.6.2.ebuild 2131 BLAKE2B d754be7534a460285cddf9387039523f998e5342c71ad0db5780a0766d06e89402f36eee19de6d0621f2b1d94ded87086f66b508741f7a8b0b1e3e25d4f96198 SHA512 6be8b83e4a6a8edeb0511b03b387420c171349921ac4a38d260b72e26f51f71e98e99d930d034ae5177f7e0a917a62afe9b67e5b001a649f67f5dd4f84095531
 MISC metadata.xml 735 BLAKE2B 78af413540fe6af7214b65b50b50aaf9cf59280037ada5228d38e529d90752b0516bf1d7514e7d9436edd93b50cd8a9dadc1e9fbf84a5c57a0ff0cb45b712cc8 SHA512 fdb4ce92c1eede58fe267ed2a4832dd1d4e7a1694591efb3d2ff372a621320275c4090317cb57c50724ceb7e386fa28965e45b724b311127ecd8665e2908cf92
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
index 1e63401e469d..f62ecf25aaa3 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
@@ -20,7 +20,7 @@ DEPEND="
 	net-libs/paho-mqtt-c
 	>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
 	>=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}]
-	<dev-python/packaging-23.3[${PYTHON_USEDEP}]
+	<dev-python/packaging-24.1[${PYTHON_USEDEP}]
 	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
 	<dev-python/tomli-3[${PYTHON_USEDEP}]
 "
diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index a4824c0af603..e95d58393162 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,12 +1,13 @@
 AUX README.gentoo 130 BLAKE2B 80e91985525fae01255681488368efee7e1c83ed3309815bb4752ee0f51fea4c127a52e99363804dd9b6a3258ff31cb2cbfa746f72e9fe1ff698867c770ef977 SHA512 5797af28a282b480408c7c60a66ca49ce032d911f54048a097bb6092869a91a62577fdb817f634a8a9629a77ef463f913b4721190f6636c344bba104c354d545
+AUX openvas-scanner-23.0.1-link-pcap.patch 959 BLAKE2B db54d427cbdf080546c14a2becd79b9adb1ae2c99489be628467404236dd71965654213d60eb3b118544eb341a88d3b0c9aaa539473212ce31ee5a55dfc7acc8 SHA512 dc255b1ce8b49e73daa6274e049249b6c7941f6f5a2a3bc0402b538de3e7879f3b65e2428048d4eb36ce72a4e2768458646973c54e7ad2085b9ee3216cb41822
 AUX openvas.conf-22 43 BLAKE2B 6796e4898eacde996fe22b8921ed6a8f4f7e7d1da06caaeca7888138614a53c2d83a7fc639c8f38245c86c1c96272aa7503f8faa42994b47c6ef6a3481c7ba28 SHA512 56254f0d7f39728e5d65efff4070d935b897793000251229b1aba20afdd9602302b77ac0252846a3586e4103b5ec7a4b72d3a653cecaa26b7cdd9128ef53605b
 AUX openvas.logrotate 328 BLAKE2B 596d30efa17aabb91270255a0f5b93796d4ed6a388db9e6525f1060dcfe54f389aa53e244e959e0aa22f99ef575c9882d4934140238c8a3d133cb1a1ec7a735c SHA512 a459bd61a549f1ae7ae079ffbca2b4290d3beafd0952a380429b152b04ebc25aea003c349a8859015345db48cfa0a2b7a887acde6d0484afb5141265a66dbee6
 AUX redis-openvas.confd 527 BLAKE2B 84bc4461630b19b02c724f72d22b0b4d04dd63a2257589c591d752c743aefea74fa4a918327826c77b32a47d372d3029981177674647589eabdf9d97037ac56d SHA512 85d24f64ef6b05c53ee2cf4f3ac33ac66e2a7e990c650249a2a6f3faf85276b9a4454cb5c17e51b747aef360c2648cfba352f04f75f3b3f88fc21b1339a04b5d
 AUX redis-openvas.initd 809 BLAKE2B bed6e09975c82fa190fa9caa833a49632085686c5d2b57e229b1fbede98676fe451010de08ef4f2a338f6878685982905bb8edb4ec467988e0c36a746e07dcc9 SHA512 aef62b465f0adc2958fcad81a579a8af337d2fac55e1c4efc1e82ccb1f609f96c0582e18f447c8272e2684fd2498f7bd9beee5cac6d19337afd42a1634d3c93b
 AUX redis-openvas.service 280 BLAKE2B 9a11408cec88a57ae71fc4a4fced63dc3d35157c979409f4db5037a9cca1c386b0521d30064a741fe5d6e8891c84bf561fcf609ef35082c6ca34ce98f4a1ee31 SHA512 3afd6b57efcbc9bd90fc88a9021094a0fc7f27bd0805077e71df1ba94de8d1687a209ac730f0014f9c3af5ddbd8a77b85ac07dd09bd98551a24f10a0791b24d1
 AUX redis-openvas.tmpfiles 63 BLAKE2B 8e3d29cef1ae0f815f7ef4da76b14168168675be4174ed1435521c26633a1f76088ab3cba5283e0c03d9f1e03abb085fdcfdb83d741f9132096df317f7f19c11 SHA512 936613951d7249c5536b4b20128bc4aef66fc05de95bece6cf2436117ed95d5dfba81cc7e16db9f765708b618a74ad83fcc52c7ccb8ccf480dd3cb4ce64cc986
-DIST openvas-scanner-22.7.8.tar.gz 1069693 BLAKE2B 7b046102efe81092102933d3aa50479e4d3dca3a376d94cef4305519335e4e01add8971485272a0f79cb10ef7cfebf12657b13832e4e6eb7860df3a05c99259f SHA512 acd2dd738f0f5ccda7bea248decaf68e571864666c6749e372dac1f0ec152dcfa2945adb98fad509d4f00dc09f34b91b3dc1760c22f6458ca45eeeb6af2c886b
 DIST openvas-scanner-22.7.9.tar.gz 1069904 BLAKE2B 908810997880d1267f41df59905acc2ac2d491ab8453001ae8e2cc6881958150e8866b07b4e335888e8e574b5a347b33880bd24c9b8d140edd6c384e498e5dc9 SHA512 279a781fe698496fb88efd28c0ee6ede66a0180237b60c4d7b083fe10c7b7ac054ec04b08c9b33e6dd142f60529faedfef4441421cc04e95eaa08865e47b58dd
-EBUILD openvas-scanner-22.7.8.ebuild 3658 BLAKE2B 5ea5e455775a21b3dc96c5eb40a194f7a1848be0cfccac5539312caf9aa9c1c4557c61a7bed92c85672ff63b82aa76dbc58912cbe0ad5bebe450b6210acbb054 SHA512 b0e6e8fe6fff2a8096146562646650e6f3fd5886c267fa8484383c25e4f76becfdd091c25bd7a5922c1afdddca9b0a49f031f316f18c3b92d9544aa3bbbb9d98
+DIST openvas-scanner-23.0.1.tar.gz 1387550 BLAKE2B 22f0b7f10fbb8be7d0897ce1895035ec9e330adee2a56d7c724e9e9fd54808ed10de5f05b3bb02918e44e45a7f85035e7d63fdd89345dcdb09d5180740823c74 SHA512 e2107ca762abcbb20d4506d2cc4479d5fbf5efd744a598ec63ea3c66ae6a6f1743deeb4b7aa9863b78c186c8a4d4b5f2212d241cef51b91c6c5bcd0879c45dc7
 EBUILD openvas-scanner-22.7.9.ebuild 3657 BLAKE2B 38af296726719db9d3c3727aa271475ae255296ac8a36151022cb25dcb8c8066e34c2dff6bdc00e8c8777163f4262dd38fda3b4887a08de3ad8113eb4777e7c8 SHA512 55a156026a45e02d50e4684c93d9284de88cbd1da725f6b1a17453f472c6dcc19e99dffc6b2780a23804a26db3743331c3e486e3290073e267a389620fdb3d04
+EBUILD openvas-scanner-23.0.1.ebuild 3780 BLAKE2B bfefffbd95c2be01ae02aabc773ebc231ce372543199ff90d3baf2e0df6002692e5e4e99db38b0a2d5f2b3226e9756f1551a947e0c28f78f79c2124a3d94a7e2 SHA512 932807fc8f505db39f376dd9897c895bd9ccdc18870ca94a84036a30714a919e366da06f20bc24eb9b67ca7562f4075b287d8c70177e7524a403d9ad937b52ad
 MISC metadata.xml 1082 BLAKE2B a428b18c1fba3380a42e1120fc58c8c950900723f5cb11febdff5d86cd16bce0a17fcdb4c48867435a7c39243a7fa7e5c15ebb3fb0d6d44fc23ef56197530b6a SHA512 e41f348b1ae728e27efb71e5ebb9e468ac5d0b31526a4db922f1bc2d3f3029a5b75be2db6cbac14754107326c4af570e6673b2e66f44317677e319116daadaf6
diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch
new file mode 100644
index 000000000000..9d7294708360
--- /dev/null
+++ b/net-analyzer/openvas-scanner/files/openvas-scanner-23.0.1-link-pcap.patch
@@ -0,0 +1,16 @@
+Fixes underlinking pcatp lib in nasl/CMakeLists.txt
+Upstream PR: https://github.com/greenbone/openvas-scanner/pull/1611
+
+diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
+index 975154a..dd1b925 100644
+--- a/nasl/CMakeLists.txt
++++ b/nasl/CMakeLists.txt
+@@ -188,7 +188,7 @@ set_target_properties (openvas_nasl_shared PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ set_target_properties (openvas_nasl_shared PROPERTIES SOVERSION "${PROJECT_VERSION_MAJOR}")
+ set_target_properties (openvas_nasl_shared PROPERTIES VERSION "${PROJECT_VERSION_STRING}")
+ # line below is needed so it also works with no-undefined which is e.g. used by Mandriva
+-target_link_libraries (openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS}
++target_link_libraries (openvas_nasl_shared openvas_misc_shared pcap ${GLIB_LDFLAGS}
+                          ${LIBOPENVAS_MISC_LDFLAGS}
+                          ${GLIB_JSON_LDFLAGS} 
+                          ${GCRYPT_LDFLAGS} ${GPGME_LDFLAGS} m
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.8.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
index 57daa813f540..8e66176a615b 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-22.7.8.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-23.0.1.ebuild
@@ -21,18 +21,19 @@ RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-user/gvm
+	app-crypt/gpgme:=
 	>=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-analyzer/gvm-libs-22.4
-	net-libs/libpcap
-	app-crypt/gpgme:=
 	>=dev-libs/libgcrypt-1.6:=
 	dev-libs/libgpg-error
 	>=dev-libs/libksba-1.0.7
-	>=net-libs/libssh-0.6.0:=
 	dev-libs/libbsd
+	>=net-libs/libssh-0.6.0:=
+	>=dev-libs/json-glib-1.4.4
+	>=net-analyzer/gvm-libs-22.4
+	>=net-libs/gnutls-3.6.4:=
+	net-libs/libpcap
+	>=net-misc/curl-7.74.0[ssl]
 	snmp? ( net-analyzer/net-snmp:= )
 "
 RDEPEND="${DEPEND}"
@@ -50,6 +51,10 @@ BDEPEND="
 	)
 	test? ( dev-libs/cgreen )
 "
+PATCHES=(
+	# See https://github.com/greenbone/openvas-scanner/pull/1611
+	"${FILESDIR}"/openvas-scanner-23.0.1-link-pcap.patch
+)
 
 src_prepare() {
 	cmake_src_prepare
@@ -82,7 +87,6 @@ src_configure() {
 		"-DSBINDIR=${EPREFIX}/usr/bin"
 		"-DOPENVAS_FEED_LOCK_PATH=${EPREFIX}/var/lib/openvas/feed-update.lock"
 		"-DOPENVAS_RUN_DIR=/run/ospd"
-		"-DINSTALL_OLD_SYNC_SCRIPT=OFF"
 		"-DBUILD_WITH_NETSNMP=$(usex snmp)"
 	)
 	cmake_src_configure
diff --git a/net-analyzer/ospd-openvas/Manifest b/net-analyzer/ospd-openvas/Manifest
index 327820acb366..2a090e8b427b 100644
--- a/net-analyzer/ospd-openvas/Manifest
+++ b/net-analyzer/ospd-openvas/Manifest
@@ -4,5 +4,7 @@ AUX ospd-openvas.logrotate 333 BLAKE2B 9265d7b1ace6a43204bbb31ab3b9e5896d91282b1
 AUX ospd-openvas.service.conf 208 BLAKE2B b392bddb4caa281087a238c79c368bdf38439c9ddaf470e034db60d9847269966e19d6a111218fe92e6c5f05dc414ab88c0fefd1916c0d5c5bca28b30d92824a SHA512 ea1e59e1c4e6d98ca0058f42bd7454768cafb8c410611350eaaa7e232d7c580f61986f41de5fdeb752b73bd9cafd04c1e9ab44975b8d177e63537ed991418fc4
 AUX ospd-openvas.service_notus.conf 479 BLAKE2B f0c63fdd48396c39001823890aafe08228b2b37d14b81b02350b9ab0c31c02905c4b407785ca7b325f1ef48f92e38bf6f4bba287c406a274974c51d402a35dce SHA512 5d95f366f7b139717897b668e86d3f98ef98d7744106ecf456e5ba6bcf37ea6baa19a7925a46853a5f31a76c94a2537309fd944d5b99b07da19c020128937153
 DIST ospd-openvas-22.6.2.tar.gz 246360 BLAKE2B 22c95cafdc6c223465805f30b522d357c28b9da3df74743cdee3cc608215d730da9101c37d2498e9680f506ed1301e12d9af3c8bab1c2a1847c034c7d6c10ca8 SHA512 a405779b9ea89b1300122c39553f8f9bf079b8610dc61ec6244affa9c9273725234a4a556df05e3013045681678646226cf12af66f051def8b042b84bb639ffe
+DIST ospd-openvas-22.7.0.tar.gz 246142 BLAKE2B bb5ea9bdc82929958466d2002ce28e63e5ff8c72561758f328c05f0d8c6431f7e305772707027f764fd881334d3c0b993d7f1727f8d7d16da83cc34b9a608895 SHA512 5a2c533589dc7a27a1be1b834243054eaf1bdb250fc41a98b0b35e6e60b8a2793e0e1d7dcd8bbf638bf23da1636efb5a80310df75727990768035743300ca8b1
 EBUILD ospd-openvas-22.6.2.ebuild 2327 BLAKE2B 5e9b938d6a798e73f950420e291591bb0fe48cdb3086beff560289a986b3617c4d2d1cd69549b7624b15a5d9c938ec36a3f4abb4ca5acca5e479f555a358b6a2 SHA512 63fdd9ebb30fa44f1591711f123779022a635c59c21995ea5fb4a59c09cbe2fa863760185d0cff9caae20eedfaa8324c44a76c868bde5c99f0cecd4c9bd47abf
+EBUILD ospd-openvas-22.7.0.ebuild 2370 BLAKE2B b03060cfc3406090aa2cf3ff86e3ea19d2f17734942be0d9b4710511c88202376394ecb7a10c215341d4ee9ef8c4df92e67dd822c9b4fcc0dd26bfa7a6d77ba1 SHA512 502cebc84d27b9bb047c47091678702d78ce60ab7e152007bb34ef2153cfb65e3399baddc7eeae401e62f12e17ee4c09d360881c92405b3bb4198c4c1acb9b2f
 MISC metadata.xml 1029 BLAKE2B 603e12bc771225baa50afc6e5254b64215055d9399c9d1862611150a49a74f397af610676ca273506f2359513b42d91786ef9f7c9100789437c00b8e59f6ccb2 SHA512 bf49f3444f277ae4b798a5c01d4c4dc5804187479774e85a9ea7481bae3b596df6f330979560ed43aa310cab72ba50dae4eeefe65a8e7dc6ada14659122ccaf7
diff --git a/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild b/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild
new file mode 100644
index 000000000000..99c6e7b40fe7
--- /dev/null
+++ b/net-analyzer/ospd-openvas/ospd-openvas-22.7.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+DISTUTILS_USE_PEP517=poetry
+inherit distutils-r1 systemd
+
+DESCRIPTION="This is an OSP server implementation to allow GVM to remotely control OpenVAS"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/ospd-openvas"
+SRC_URI="https://github.com/greenbone/ospd-openvas/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc +notus"
+
+DEPEND="
+	acct-user/gvm
+	>=dev-python/defusedxml-0.6[${PYTHON_USEDEP}]
+	<dev-python/defusedxml-0.8[${PYTHON_USEDEP}]
+	>=dev-python/deprecated-1.2.10[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.5.2[${PYTHON_USEDEP}]
+	<dev-python/lxml-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.4[${PYTHON_USEDEP}]
+	<dev-python/packaging-25.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.5.1[${PYTHON_USEDEP}]
+	>=dev-python/redis-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gnupg-0.4.8[${PYTHON_USEDEP}]
+	<dev-python/python-gnupg-0.6.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
+"
+RDEPEND="
+	${DEPEND}
+	app-admin/sudo
+	>=net-analyzer/openvas-scanner-22.4
+	notus? ( >=net-analyzer/notus-scanner-22.4 )
+"
+
+distutils_enable_tests unittest
+
+python_compile() {
+	if use doc; then
+		bash "${S}"/docs/generate || die
+		HTML_DOCS=( "${S}"/docs/. )
+	fi
+	distutils-r1_python_compile
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	insinto /etc/gvm
+	doins config/${PN}.conf
+	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm
+	fi
+
+	newinitd "${FILESDIR}/${PN}-22.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}-22.confd" "${PN}"
+
+	systemd_dounit config/${PN}.service
+
+	if use notus; then
+		systemd_install_serviced "${FILESDIR}/ospd-openvas.service_notus.conf" \
+			${PN}.service
+	else
+		systemd_install_serviced "${FILESDIR}/ospd-openvas.service.conf" \
+			${PN}.service
+	fi
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/ospd-openvas.logrotate" ospd-openvas
+
+	# OSPD OpenVAS attempts to call openvas via sudo as network security
+	# scanning often requires priviliged operations.
+	insinto /etc/sudoers.d
+	newins - openvas <<-EOF
+	gvm  ALL = NOPASSWD: /usr/bin/openvas
+EOF
+	fperms 0750 /etc/sudoers.d
+	fperms 0440 /etc/sudoers.d/openvas
+}