From 5b68b3c83eeba9cd1f69f8bce1194794975b84d3 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Tue, 21 Nov 2023 11:12:11 +0000
Subject: gentoo auto-resync : 21:11:2023 - 11:12:11

---
 net-analyzer/notus-scanner/Manifest                |   6 +-
 .../files/notus-scanner-22.6.0-remove-tests.patch  | 136 ---------------------
 .../files/notus-scanner-22.6.2-remove-tests.patch  |  75 ++++++++++++
 .../notus-scanner/notus-scanner-22.6.0.ebuild      |  82 -------------
 .../notus-scanner/notus-scanner-22.6.2.ebuild      |  81 ++++++++++++
 5 files changed, 159 insertions(+), 221 deletions(-)
 delete mode 100644 net-analyzer/notus-scanner/files/notus-scanner-22.6.0-remove-tests.patch
 create mode 100644 net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch
 delete mode 100644 net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
 create mode 100644 net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild

(limited to 'net-analyzer/notus-scanner')

diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index e7ad7f05f150..4c8d8519b381 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -1,7 +1,7 @@
-AUX notus-scanner-22.6.0-remove-tests.patch 5439 BLAKE2B aaf85b04fb8a365869bf846224b0f698e4577226e7f77cdc121272c24dbca2f76b3a31fa54c17fc14eb6946e53c853c5b9a3305d20c119f5438c2090b366a107 SHA512 8d806a9417a29da80ecf9290f5708c6ee50de005e4579fefa3d37db4aba1f50effc9e6e573d7269c734855ca30fcc24f6ed06dbf84665144bc397faea544a6b7
+AUX notus-scanner-22.6.2-remove-tests.patch 2971 BLAKE2B fea309c613fc54a387639e000acc9ba65f364439c9bec3357a0e098544fd735510d2e1bbc52a405b9f5d39080343e815f79bedee83a801a1c620383b38ab2048 SHA512 9125ba1ce257236fb91ccdf62a04fc2b56fbd075270df757c74a45bf3733f0c601dac798f63e1521e8f6e08cfe91163f9bcc3cdfd4fdb60bfb375c5444a2154d
 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.6.0.tar.gz 324001 BLAKE2B db55ddd290d86e0e350824cbdf62caa78a29162fcf64196f70b25a8a8353a82b06509dc1d7d5240b88ee2aa2606f0d6d27075a7414c175093667914b8c8f372a SHA512 56c462be472668f959fff71ed928ca81c555f03d04325e63c35665a18d4b893ac62de9e7ddd060aba0cc6a34ca7c495defc39e788553cb7524c1f6658202bf7e
-EBUILD notus-scanner-22.6.0.ebuild 2159 BLAKE2B a103cef226c1b0dbb0ac54f6f1114a4e009c2ef5a526029e4dd7bf3a0ff8aec7bfcce5402703ea2b053ab7ff23b15f624729ba7d489fb61f6c5675350ac664d8 SHA512 944e25336ca4d8d8acf0801ffc3e6a41c85e1794f477e00b4d7dd3d0515c7743abfd5a562f4d19047bd59511dacfaaa1439a7228836739810250802fe456805a
+DIST notus-scanner-22.6.2.tar.gz 316406 BLAKE2B c24ec5e4fd9f8fc181145d64580d04f7045ccf1a7570f855f0a8a79bcea842fe7a73d91fadecd61c10b94cb3ee68ecae98b0f91b4059b84258765be98c95057f SHA512 ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522
+EBUILD notus-scanner-22.6.2.ebuild 2132 BLAKE2B 6200608b7260ab486a22d7687cbe51858d690d17ee7706b6d7077b92f3862850891addf79b982ea9f0f658827af7648cc1cfbf6d7c25cc3697000c708247c703 SHA512 367b384cee91f494072be5911372a884f28628a34d81c6d7389829147b871c15c9ce3a75781a3c205e747030d74cf2bc9cee034d01e2a799c81e5f13376cb887
 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
deleted file mode 100644
index 7b3332051546..000000000000
--- a/net-analyzer/notus-scanner/files/notus-scanner-22.6.0-remove-tests.patch
+++ /dev/null
@@ -1,136 +0,0 @@
-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-22.6.2-remove-tests.patch b/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch
new file mode 100644
index 000000000000..e2d3192ed295
--- /dev/null
+++ b/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch
@@ -0,0 +1,75 @@
+Remove tests that use files not allowed by Sandbox.
+Patch by Giuseppe Foti
+
+--- a/tests/cli/test_cli_parser.py
++++ b/tests/cli/test_cli_parser.py
+@@ -28,69 +28,6 @@ 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_config_file_provide_mqtt_broker_address(self):
+         with tempfile.NamedTemporaryFile() as fp:
+             fp.write(b"[notus-scanner]\nmqtt-broker-address='1.2.3.4'")
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
deleted file mode 100644
index c0dcb14e48c9..000000000000
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 readme.gentoo-r1 systemd
-
-DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks"
-HOMEPAGE="https://github.com/greenbone/notus-scanner"
-SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3 AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	acct-user/gvm
-	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.2[${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}]
-"
-
-RDEPEND="
-	${DEPEND}
-	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:
-https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
-https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
-
-To enable feed validation, edit /etc/gvm/${PN}.toml
-and set
-disable-hashsum-verification = false"
-DISABLE_AUTOFORMATTING=true
-
-distutils_enable_tests unittest
-
-python_compile() {
-	distutils-r1_python_compile
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	insinto /etc/gvm
-	use prefix || fowners -R gvm:gvm /etc/gvm
-	newins "${FILESDIR}/${PN}.toml" "${PN}.toml"
-	use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/notus
-	keepdir /var/lib/notus/products
-	keepdir /var/lib/notus/advisories
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/notus
-	fi
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-
-	systemd_dounit config/${PN}.service
-
-	systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \
-			${PN}.service
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
new file mode 100644
index 000000000000..81f845b916f0
--- /dev/null
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 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 readme.gentoo-r1 systemd
+
+DESCRIPTION="Notus is a vulnerability scanner for creating results from local security checks"
+HOMEPAGE="https://github.com/greenbone/notus-scanner"
+SRC_URI="https://github.com/greenbone/notus-scanner/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="AGPL-3 AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	acct-user/gvm
+	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/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
+	<dev-python/tomli-3[${PYTHON_USEDEP}]
+"
+
+RDEPEND="
+	${DEPEND}
+	app-misc/mosquitto
+"
+
+PATCHES=(
+	"${FILESDIR}"/notus-scanner-22.6.2-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:
+https://greenbone.github.io/docs/latest/22.4/source-build/index.html#feed-validation
+https://wiki.gentoo.org/wiki/Greenbone_Vulnerability_Management#Notus_Scanner
+
+To enable feed validation, edit /etc/gvm/${PN}.toml
+and set
+disable-hashsum-verification = false"
+DISABLE_AUTOFORMATTING=true
+
+distutils_enable_tests unittest
+
+python_compile() {
+	distutils-r1_python_compile
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	insinto /etc/gvm
+	use prefix || fowners -R gvm:gvm /etc/gvm
+	newins "${FILESDIR}/${PN}.toml" "${PN}.toml"
+	use prefix || fowners gvm:gvm "/etc/gvm/${PN}.toml"
+
+	# Set proper permissions on required files/directories
+	keepdir /var/lib/notus
+	keepdir /var/lib/notus/products
+	keepdir /var/lib/notus/advisories
+	if ! use prefix; then
+		fowners -R gvm:gvm /var/lib/notus
+	fi
+
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+
+	systemd_dounit config/${PN}.service
+
+	systemd_install_serviced "${FILESDIR}/notus-scanner.service.conf" \
+			${PN}.service
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
-- 
cgit v1.2.3