net-analyzer/notus-scanner: add 22.6.2, drop 22.6.0

Closes: https://bugs.gentoo.org/916716
Signed-off-by: Giuseppe Foti <foti.giuseppe@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33917
Signed-off-by: Florian Schmaus <flow@gentoo.org>

3 files changed, 8 insertions, 70 deletions

diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 07960cf59467..79d92d27ff5d 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -1 +1 @@
-DIST notus-scanner-22.6.0.tar.gz 324001 BLAKE2B db55ddd290d86e0e350824cbdf62caa78a29162fcf64196f70b25a8a8353a82b06509dc1d7d5240b88ee2aa2606f0d6d27075a7414c175093667914b8c8f372a SHA512 56c462be472668f959fff71ed928ca81c555f03d04325e63c35665a18d4b893ac62de9e7ddd060aba0cc6a34ca7c495defc39e788553cb7524c1f6658202bf7e
+DIST notus-scanner-22.6.2.tar.gz 316406 BLAKE2B c24ec5e4fd9f8fc181145d64580d04f7045ccf1a7570f855f0a8a79bcea842fe7a73d91fadecd61c10b94cb3ee68ecae98b0f91b4059b84258765be98c95057f SHA512 ecbbb79950908641c2b83d379d141b189b8e0e27cac17753cbb381a5f4ebf28d7100f60bd24fc284c2681abc889f6fee36a64f469ac0b37323940eaeae7e7522
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.2-remove-tests.patch
index 7b3332051546..e2d3192ed295 100644
--- a/net-analyzer/notus-scanner/files/notus-scanner-22.6.0-remove-tests.patch
+++ b/net-analyzer/notus-scanner/files/notus-scanner-22.6.2-remove-tests.patch
@@ -1,9 +1,9 @@
-Removes tests needing to work with files which are disallowed by the sandbox.
+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,68 +28,68 @@ class CliParserTestCase(unittest.TestCase):
+@@ -28,69 +28,6 @@ class CliParserTestCase(unittest.TestCase):
      def parse_args(self, args: List[str]) -> Arguments:
          return self.parser.parse_arguments(args)
  
@@ -69,68 +69,7 @@ Patch by Giuseppe Foti
 -        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:
+             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.2.ebuild
index c0dcb14e48c9..81f845b916f0 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=poetry
 inherit distutils-r1 readme.gentoo-r1 systemd
 
@@ -20,8 +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.2[${PYTHON_USEDEP}]
-	>=dev-python/rope-1.9.0[${PYTHON_USEDEP}]
+	<dev-python/packaging-23.3[${PYTHON_USEDEP}]
 	>=dev-python/paho-mqtt-1.5.1[${PYTHON_USEDEP}]
 	<dev-python/tomli-3[${PYTHON_USEDEP}]
 "
@@ -32,7 +31,7 @@ RDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${P}-remove-tests.patch
+	"${FILESDIR}"/notus-scanner-22.6.2-remove-tests.patch
 )
 
 DOC_CONTENTS="