gentoo auto-resync : 07:10:2023 - 18:01:02

9 files changed, 163 insertions, 147 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 94334b0c7020..fd1bdc775410 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 30b91c758cfa..9c1d850088b1 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -2,14 +2,12 @@ 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 743 BLAKE2B 7c2a20b96c0810c3b542d33e37dbdf874c61168287f4fcb22b151e2a12b65dd9d1586dfcc228c941136f4a204df5661f9547dcb3c440a57fd80e412a81cdfc6f SHA512 17da410edae524b28ae66fed6adc15cd553f2c7bac6d34eff06288e5ae476dffa88efbb484accbf25a5045fb36cf23bb5583ad0adcb3480f9450d5bf150dbb40
+AUX gvmd-22.init 851 BLAKE2B a5b00b3a682bb742427815a23074dad6f267002bc2221df3764e59e175ee5387af5563158a5cb423dbeb26f6e271065c4bc16b9d1c935bee1f44e26b0468893c SHA512 eb9fdcdeac169ee8b9ed39b97521673a69f0cd0e9093390bd8ddb40781d3136f1cefbedb5139f8137f51ec47a30db82b250a0a28212aeebdf9a0beab828d5cb5
 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
-DIST gvmd-22.5.5.tar.gz 1034891 BLAKE2B 86382768133d18be08d5536ad02e501affa9c3c70ed592bffa85d0d043b1dfdb6201efcf6cbe7561a987aa7975a17236e8cd6c9382a0ffe9e123d18b221932c2 SHA512 65813ff623e62c9c8b46870617cfeaed7bc4ccc54ce5b4423e0eb93b3e91fbdcf47fc47f71a182d0aa3305267e0bde4d06975d40691ec1199780c10e6d815cf0
-DIST gvmd-22.6.0.tar.gz 1039082 BLAKE2B 0e6e53ce990090e212e035f2224bfa84c906f130dd5a33f5e57a53b3a5b82afac725db4412c5d0f3de0abc2fada5120845eaf3b93db18aa1137c948a14964594 SHA512 de6688dfd19b9bb779a963b3f8607818dad13da4024b7e0a0e80649cb11bbcf0a65bf1b72eaf5408ead2dabff2e806a0f7dd8472c6f314774b82fcd01fb37b37
+DIST gvmd-22.9.0.tar.gz 1040655 BLAKE2B b2d7ebd6d29a44eef34000cf1c158cc1053398a685f5db3fe001d3074aad79fef4ee940572f172acdc4b9cef7c31a43742e9aed3f6a228b97e5d6ca79ee77f84 SHA512 231deb33023a2812dbeb7a4dd670c622a5012002c5b478bae906d1877a2dd036777c61247eb3128cbffd7cbb021c11a12f81b1bf16bf61b960ad4fa498f62c7e
 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-r1.ebuild 3199 BLAKE2B 4e0edb383313e7e908b0695696b7655de37559b68e1dd9921872c7dea31d7ecf7bf6491893d46cfdc6fa85908220dc789345712ad6a889ed3b11682955675a67 SHA512 9ba7d36a8c9159bf61fad884a08c0e321f5627eb1e7d9a5ad0828ab0fd6ce95e8892e89e6bccf20f61ac84460d5b74e04ba3ec2cba45cb3a16ba45591b8c066a
+EBUILD gvmd-22.9.0.ebuild 3214 BLAKE2B 4d01c545dc0939ff62be05f120c981a88d2a90005499e69c403fe2cc96a402b1b3e0d7336964eb0701cc648a9d6278f4f0be3ebdedef1d4918e96d0615c76e06 SHA512 ab652d859d97c273a42f2036f69b35622e5f5d6da98183f659c5e7566a555a17c61e52688c76338a00b53f9f8010eafc0cde24abfe075827d5a90f08037df2b6
 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 8fd1a0bfb335..9b2a5a6f69a7 100644
--- a/net-analyzer/gvmd/files/gvmd-22.init
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -10,14 +10,15 @@ name="Greenbone Vulnerability Manager"
 command=/usr/bin/gvmd
 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="/var/run/gvmd/gvmd.pid"
+pidfile="/run/gvmd/gvmd.pid"
 retry="${GVMD_TIMEOUT}"
 
 depend() {
 	after bootmisc postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15
+	want postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15
 	need localmount net ospd-openvas
 }
 
 start_pre() {
-	checkpath -d --owner ${GVMD_USER} /var/run/gvmd
+	checkpath -d --owner ${GVMD_USER} /run/gvmd
 }
diff --git a/net-analyzer/gvmd/gvmd-22.5.5.ebuild b/net-analyzer/gvmd/gvmd-22.5.5.ebuild
deleted file mode 100644
index 22ce3ef705d4..000000000000
--- a/net-analyzer/gvmd/gvmd-22.5.5.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2023 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-db/postgresql-9.6:=[uuid]
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/libical-1.0.0
-	>=net-analyzer/gvm-libs-20.08.0
-	>=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="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen[dot]
-		app-doc/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
-
-	dosbin "${FILESDIR}"/gvm-sync-all
-	systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
-
-	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/gvmd/gvmd-22.6.0-r1.ebuild b/net-analyzer/gvmd/gvmd-22.9.0.ebuild
index d7a4a809642a..19e29eb08e9c 100644
--- a/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
+++ b/net-analyzer/gvmd/gvmd-22.9.0.ebuild
@@ -18,12 +18,14 @@ 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-20.08.0
+	>=net-analyzer/gvm-libs-22.7
 	>=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="
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 62bb6f540d4c..e7ad7f05f150 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -1,6 +1,7 @@
-AUX notus-scanner.initd 617 BLAKE2B 674d7327f3c9242137ca3b949b3e19f1c01d96388c0676afe501836bb069b9132d25e13e5541ec6b653a314ec29524e7d27889038512330e286f28b8684c18a4 SHA512 697a138ca27ac7556628188c9b3f6db807a72d7119587194e8cf181e7b5ff4b393be5adf1fc325498ffd97bdedf8eb6fbc4566bd858ee29d677992c3e3d9a0e1
+AUX notus-scanner-22.6.0-remove-tests.patch 5439 BLAKE2B aaf85b04fb8a365869bf846224b0f698e4577226e7f77cdc121272c24dbca2f76b3a31fa54c17fc14eb6946e53c853c5b9a3305d20c119f5438c2090b366a107 SHA512 8d806a9417a29da80ecf9290f5708c6ee50de005e4579fefa3d37db4aba1f50effc9e6e573d7269c734855ca30fcc24f6ed06dbf84665144bc397faea544a6b7
+AUX notus-scanner.initd 749 BLAKE2B 7297894e9bb740ed842870b9a09ed838eada8e5be16b5553d0e7fbc80cc082b4ed72d15df5a40213dcd5e982b5a9810666ce9c7b7a6b97e829e56e1a3d45ec31 SHA512 86102907c4b14eef442f16dd1e5fef9dd6a7a3f9c442aad95333f1059de676974498f7be4b3308bfef2242faf2cda22d61af768b7842fa6b1a34c206722118df
 AUX notus-scanner.service.conf 93 BLAKE2B 17030f4836aa96f45fdc9be67fb1b1924680ec29193bfc03d470bc45bf973542ca1b2bbb13253eb20c1618132b4b07c3fcaadd39451cb583d4c8f6fcd6e26c65 SHA512 36d5fbe95cd02b728d048a0baeed03448899696d0b3344a166afc9eecd6620e8af347ecc86c014ec9211ce72cc55a202a84b9ea68a7662c268378c37a734b08f
 AUX notus-scanner.toml 272 BLAKE2B 41cd9a81754ee06604373e8d4644362167ed7165c36d2c1c6b2b991bdf5efdea3f620a83ee489f113b9b3500e638d516565b3f8dd830df14a3abb551399dae20 SHA512 476d795b53ce5ef1eabc335122298b2a8c23b5476822cc7f062a6849ecb0e322cd73fabf8d1928c30e557109c08a1c920413da73fade7d5e68c55511bd2d1f6d
-DIST notus-scanner-22.5.0.tar.gz 320894 BLAKE2B 3bf0cb633ad2636d9430705459d841b717139b162bd39f30a6bf06dafe1647b94c0e791b05390d340f97a4ff83351cbd71be6d5b1793dda82c6cad9250ce18c2 SHA512 48576d26a65c439fb00b345d97ba9917c3c2bf99ab5c94ed4488e4638c0442fdcd721ed8a08be147481a01bffc3eadec25029c0d6cd1aed2381221250b16c19d
-EBUILD notus-scanner-22.5.0-r1.ebuild 2172 BLAKE2B bd6834cbf4ec1e93898db364c6eb5565c064f7fe4b36bb9140d4f7c0333ea044919a9d952a2d8c337d0bfa42f63df9d005c5473e113b912d17cf2141ecded001 SHA512 8fa7d1fc55f20cd8e948efc00ddb5f9da83f8a0f1a1b43ddbd948a48c9562f15209cb15c2fa0ed9e05455f8e22ece555ec6495de35cb009e80f315949121cd4f
+DIST notus-scanner-22.6.0.tar.gz 324001 BLAKE2B db55ddd290d86e0e350824cbdf62caa78a29162fcf64196f70b25a8a8353a82b06509dc1d7d5240b88ee2aa2606f0d6d27075a7414c175093667914b8c8f372a SHA512 56c462be472668f959fff71ed928ca81c555f03d04325e63c35665a18d4b893ac62de9e7ddd060aba0cc6a34ca7c495defc39e788553cb7524c1f6658202bf7e
+EBUILD notus-scanner-22.6.0.ebuild 2159 BLAKE2B a103cef226c1b0dbb0ac54f6f1114a4e009c2ef5a526029e4dd7bf3a0ff8aec7bfcce5402703ea2b053ab7ff23b15f624729ba7d489fb61f6c5675350ac664d8 SHA512 944e25336ca4d8d8acf0801ffc3e6a41c85e1794f477e00b4d7dd3d0515c7743abfd5a562f4d19047bd59511dacfaaa1439a7228836739810250802fe456805a
 MISC metadata.xml 735 BLAKE2B 78af413540fe6af7214b65b50b50aaf9cf59280037ada5228d38e529d90752b0516bf1d7514e7d9436edd93b50cd8a9dadc1e9fbf84a5c57a0ff0cb45b712cc8 SHA512 fdb4ce92c1eede58fe267ed2a4832dd1d4e7a1694591efb3d2ff372a621320275c4090317cb57c50724ceb7e386fa28965e45b724b311127ecd8665e2908cf92
diff --git a/net-analyzer/notus-scanner/files/notus-scanner-22.6.0-remove-tests.patch b/net-analyzer/notus-scanner/files/notus-scanner-22.6.0-remove-tests.patch
new file mode 100644
index 000000000000..7b3332051546
--- /dev/null
+++ b/net-analyzer/notus-scanner/files/notus-scanner-22.6.0-remove-tests.patch
@@ -0,0 +1,136 @@
+Removes tests needing to work with files which are disallowed by the sandbox.
+Patch by Giuseppe Foti
+
+--- a/tests/cli/test_cli_parser.py
++++ b/tests/cli/test_cli_parser.py
+@@ -28,68 +28,68 @@ class CliParserTestCase(unittest.TestCase):
+     def parse_args(self, args: List[str]) -> Arguments:
+         return self.parser.parse_arguments(args)
+ 
+-    def test_mqtt_broker(self):
+-        args = self.parse_args(["--mqtt-broker-address=localhost"])
+-        self.assertEqual("localhost", args.mqtt_broker_address)
+-
+-        args = self.parse_args(["-b", "localhost"])
+-        self.assertEqual("localhost", args.mqtt_broker_address)
+-
+-    def test_mqtt_broker_port(self):
+-        args = self.parse_args(["--mqtt-broker-port=12345"])
+-        self.assertEqual(args.mqtt_broker_port, 12345)
+-
+-        args = self.parse_args(["-p", "12345"])
+-        self.assertEqual(args.mqtt_broker_port, 12345)
+-
+-    def test_correct_upper_case_log_level(self):
+-        args = self.parse_args(["--log-level=ERROR"])
+-        self.assertEqual("ERROR", args.log_level)
+-
+-    def test_correct_lower_case_log_level(self):
+-        args = self.parse_args(["-L", "info"])
+-        self.assertEqual("INFO", args.log_level)
+-
+-    def test_advisories_directory(self):
+-        args = self.parse_args(["--products-directory=/tmp"])
+-        self.assertEqual(Path("/tmp"), args.products_directory)
+-
+-    def test_pid_file(self):
+-        args = self.parse_args(["--pid-file=/foo/bar"])
+-        self.assertEqual(args.pid_file, "/foo/bar")
+-
+-    def test_log_file(self):
+-        args = self.parse_args(["--log-file=/foo/bar"])
+-        self.assertEqual(args.log_file, "/foo/bar")
+-
+-        args = self.parse_args(["-l", "/foo/bar"])
+-        self.assertEqual(args.log_file, "/foo/bar")
+-
+-    def test_foreground(self):
+-        args = self.parse_args(["--foreground"])
+-        self.assertTrue(args.foreground)
+-
+-        args = self.parse_args(["-f"])
+-        self.assertTrue(args.foreground)
+-
+-    def test_disable_hashsum_verification(self):
+-        args = self.parse_args(["--disable-hashsum-verification=true"])
+-        self.assertTrue(args.disable_hashsum_verification)
+-
+-    def test_defaults(self):
+-        args = self.parse_args([])
+-
+-        self.assertEqual(
+-            args.products_directory, Path(DEFAULT_PRODUCTS_DIRECTORY)
+-        )
+-        self.assertIsNone(args.config)
+-        self.assertIsNone(args.log_file)
+-        self.assertEqual(args.log_level, DEFAULT_LOG_LEVEL)
+-        self.assertEqual(args.mqtt_broker_port, DEFAULT_MQTT_BROKER_PORT)
+-        self.assertEqual(args.mqtt_broker_address, DEFAULT_MQTT_BROKER_ADDRESS)
+-        self.assertEqual(args.pid_file, DEFAULT_PID_FILE)
+-        self.assertEqual(args.disable_hashsum_verification, False)
+-        self.assertFalse(args.foreground)
++#    def test_mqtt_broker(self):
++#        args = self.parse_args(["--mqtt-broker-address=localhost"])
++#        self.assertEqual("localhost", args.mqtt_broker_address)
++
++#        args = self.parse_args(["-b", "localhost"])
++#        self.assertEqual("localhost", args.mqtt_broker_address)
++
++#    def test_mqtt_broker_port(self):
++#        args = self.parse_args(["--mqtt-broker-port=12345"])
++#        self.assertEqual(args.mqtt_broker_port, 12345)
++
++#        args = self.parse_args(["-p", "12345"])
++#        self.assertEqual(args.mqtt_broker_port, 12345)
++
++#    def test_correct_upper_case_log_level(self):
++#        args = self.parse_args(["--log-level=ERROR"])
++#        self.assertEqual("ERROR", args.log_level)
++
++#    def test_correct_lower_case_log_level(self):
++#        args = self.parse_args(["-L", "info"])
++#        self.assertEqual("INFO", args.log_level)
++
++#    def test_advisories_directory(self):
++#        args = self.parse_args(["--products-directory=/tmp"])
++#        self.assertEqual(Path("/tmp"), args.products_directory)
++
++#    def test_pid_file(self):
++#        args = self.parse_args(["--pid-file=/foo/bar"])
++#        self.assertEqual(args.pid_file, "/foo/bar")
++
++#    def test_log_file(self):
++#        args = self.parse_args(["--log-file=/foo/bar"])
++#        self.assertEqual(args.log_file, "/foo/bar")
++
++#        args = self.parse_args(["-l", "/foo/bar"])
++#        self.assertEqual(args.log_file, "/foo/bar")
++
++#    def test_foreground(self):
++#        args = self.parse_args(["--foreground"])
++#        self.assertTrue(args.foreground)
++
++#        args = self.parse_args(["-f"])
++#        self.assertTrue(args.foreground)
++
++#    def test_disable_hashsum_verification(self):
++#        args = self.parse_args(["--disable-hashsum-verification=true"])
++#        self.assertTrue(args.disable_hashsum_verification)
++
++#    def test_defaults(self):
++#        args = self.parse_args([])
++
++#        self.assertEqual(
++#            args.products_directory, Path(DEFAULT_PRODUCTS_DIRECTORY)
++#        )
++#        self.assertIsNone(args.config)
++#        self.assertIsNone(args.log_file)
++#        self.assertEqual(args.log_level, DEFAULT_LOG_LEVEL)
++#        self.assertEqual(args.mqtt_broker_port, DEFAULT_MQTT_BROKER_PORT)
++#        self.assertEqual(args.mqtt_broker_address, DEFAULT_MQTT_BROKER_ADDRESS)
++#        self.assertEqual(args.pid_file, DEFAULT_PID_FILE)
++#        self.assertEqual(args.disable_hashsum_verification, False)
++#        self.assertFalse(args.foreground)
+ 
+     def test_config_file_provide_mqtt_broker_address(self):
+         with tempfile.NamedTemporaryFile() as fp:
diff --git a/net-analyzer/notus-scanner/files/notus-scanner.initd b/net-analyzer/notus-scanner/files/notus-scanner.initd
index 6db3422bccba..8af378b20fd6 100644
--- a/net-analyzer/notus-scanner/files/notus-scanner.initd
+++ b/net-analyzer/notus-scanner/files/notus-scanner.initd
@@ -21,6 +21,11 @@ depend() {
 }
 
 start_pre() {
-        checkpath -d --owner ${GVM_USER} /var/run/notus-scanner
+        checkpath -d --owner ${GVM_USER} /run/notus-scanner
 }
 
+start_post() {
+	ewaitfile 10 ${pidfile}
+	checkpath -d --owner root:root /run/notus-scanner
+	checkpath -f --owner root:root ${pidfile}
+}
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.5.0-r1.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
index bd27df745477..c0dcb14e48c9 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.5.0-r1.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_11 )
+PYTHON_COMPAT=( python3_{10..11} )
 DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1 readme.gentoo-r1 systemd
 
@@ -14,16 +14,14 @@ SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar
 SLOT="0"
 LICENSE="AGPL-3 AGPL-3+"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	acct-user/gvm
 	net-libs/paho-mqtt-c
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/python-gnupg-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9[${PYTHON_USEDEP}]
+	>=dev-python/python-gnupg-0.5.1[${PYTHON_USEDEP}]
 	<dev-python/packaging-23.2[${PYTHON_USEDEP}]
-	>=dev-python/sentry-sdk-1.22.2[${PYTHON_USEDEP}]
-	>=dev-python/rope-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rope-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
 	<dev-python/tomli-3[${PYTHON_USEDEP}]
 "
@@ -33,6 +31,10 @@ RDEPEND="
 	app-misc/mosquitto
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-tests.patch
+)
+
 DOC_CONTENTS="
 For validating the feed content, a GnuPG keychain with the Greenbone Community Feed integrity key needs to be created.
 Please, read here on how to create it: