* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/notus-scanner/, net-analyzer/notus-scanner/files/
@ 2023-08-09 13:32 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-08-09 13:32 UTC (permalink / raw
To: gentoo-commits
commit: dcd9ff588ba87099a9716ffa536fe5d1dfc8669c
Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Mon Aug 7 23:48:42 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 13:28:23 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd9ff58
net-analyzer/notus-scanner: fix OpenRC script, disable hash verification
Hashsum verification needs the creation of a GnuPG keychain that has
to be done manually by the user after installation.
Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32215
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../notus-scanner/files/notus-scanner.confd | 11 ---------
.../notus-scanner/files/notus-scanner.initd | 21 +++++++++--------
.../notus-scanner/files/notus-scanner.toml | 2 +-
...2.5.0.ebuild => notus-scanner-22.5.0-r1.ebuild} | 26 ++++++++++++++++++----
4 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/net-analyzer/notus-scanner/files/notus-scanner.confd b/net-analyzer/notus-scanner/files/notus-scanner.confd
deleted file mode 100644
index 5000145abaeb..000000000000
--- a/net-analyzer/notus-scanner/files/notus-scanner.confd
+++ /dev/null
@@ -1,11 +0,0 @@
-# Notus Scanner command args
-
-NOTUS_SCANNER_OPTIONS="--log-file=/var/log/gvm/notus-scanner.log"
-
-NOTUS_SCANNER_MQTT_BROKER_ADDRESS="--mqtt-broker-address localhost"
-
-NOTUS_SCANNER_MQTT_BROKER_PORT="--mqtt-broker-port 1883"
-
-NOTUS_SCANNER_PRODUCTS_DIRECTORY="--products-directory /var/lib/notus/products"
-
-NOTUS_DISABLE_HASHSUM_VERIFICATION="--disable-hashsum-verification false"
diff --git a/net-analyzer/notus-scanner/files/notus-scanner.initd b/net-analyzer/notus-scanner/files/notus-scanner.initd
index e00e9118e32e..6db3422bccba 100644
--- a/net-analyzer/notus-scanner/files/notus-scanner.initd
+++ b/net-analyzer/notus-scanner/files/notus-scanner.initd
@@ -1,17 +1,19 @@
#!/sbin/openrc-run
-# Copyright 2023Gentoo Authors
+# Copyright 2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+: ${GVM_USER:=gvm}
+: ${GVM_GROUP:=$(id -ng ${GVM_USER})}
+: ${NOTUS_TIMEOUT:=30}
+
name="Greenbone Notus Scanner"
command=/usr/bin/notus-scanner
+command_user="${GVM_USER}:${GVM_GROUP}"
pidfile="/run/notus-scanner/${RC_SVCNAME}.pid"
-command_args="${NOTUS_SCANNER_OPTIONS} \
- ${NOTUS_SCANNER_MQTT_BROKER_ADDRESS} \
- ${NOTUS_SCANNER_MQTT_BROKER_PORT} \
- ${NOTUS_SCANNER_PRODUCTS_DIRECTORY} \
- ${NOTUS_DISABLE_HASHSUM_VERIFICATION} \
- --pid-file ${pidfile} \
- --config /etc/gvm/notus-scanner.toml"
+configfile="/etc/gvm/notus-scanner.toml"
+command_args="--pid-file ${pidfile} \
+ --config ${configfile}"
+retry="${NOTUS_TIMEOUT}"
depend() {
after bootmisc
@@ -19,5 +21,6 @@ depend() {
}
start_pre() {
- checkpath -d /var/run/notus-scanner
+ checkpath -d --owner ${GVM_USER} /var/run/notus-scanner
}
+
diff --git a/net-analyzer/notus-scanner/files/notus-scanner.toml b/net-analyzer/notus-scanner/files/notus-scanner.toml
index cff33c77afc8..a266784ed163 100644
--- a/net-analyzer/notus-scanner/files/notus-scanner.toml
+++ b/net-analyzer/notus-scanner/files/notus-scanner.toml
@@ -5,4 +5,4 @@ products-directory = "/var/lib/notus/products"
pid-file = "/run/notus-scanner/notus-scanner.pid"
log-file = "/var/log/gvm/notus-scanner.log"
log-level = "INFO"
-disable-hashsum-verification = false
+disable-hashsum-verification = true
diff --git a/net-analyzer/notus-scanner/notus-scanner-22.5.0.ebuild b/net-analyzer/notus-scanner/notus-scanner-22.5.0-r1.ebuild
similarity index 65%
rename from net-analyzer/notus-scanner/notus-scanner-22.5.0.ebuild
rename to net-analyzer/notus-scanner/notus-scanner-22.5.0-r1.ebuild
index 630d765d70a5..7ebe6a06c3fb 100644
--- a/net-analyzer/notus-scanner/notus-scanner-22.5.0.ebuild
+++ b/net-analyzer/notus-scanner/notus-scanner-22.5.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_11 )
DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 systemd
+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"
@@ -32,6 +32,18 @@ RDEPEND="
${DEPEND}
app-misc/mosquitto
"
+FORCE_PRINT_ELOG="yes"
+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
@@ -41,9 +53,11 @@ python_compile() {
python_install() {
distutils-r1_python_install
+
insinto /etc/gvm
- doins "${FILESDIR}/${PN}.toml"
- fowners gvm:gvm "/etc/gvm/${PN}.toml"
+ 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
@@ -54,10 +68,14 @@ python_install() {
fi
newinitd "${FILESDIR}/${PN}.initd" "${PN}"
- newconfd "${FILESDIR}/${PN}.confd" "${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
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/notus-scanner/, net-analyzer/notus-scanner/files/
@ 2023-10-07 15:11 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-10-07 15:11 UTC (permalink / raw
To: gentoo-commits
commit: f904dd92c2efced943ec6d1248262e0ceace7c78
Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Sat Oct 7 14:24:52 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Oct 7 15:10:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f904dd92
net-analyzer/notus-scanner: add 22.6.0, drop 22.5.0-r1
Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33230
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/notus-scanner/Manifest | 2 +-
.../files/notus-scanner-22.6.0-remove-tests.patch | 136 +++++++++++++++++++++
.../notus-scanner/files/notus-scanner.initd | 7 +-
...2.5.0-r1.ebuild => notus-scanner-22.6.0.ebuild} | 17 ++-
4 files changed, 154 insertions(+), 8 deletions(-)
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 653ff84e4195..07960cf59467 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -1 +1 @@
-DIST notus-scanner-22.5.0.tar.gz 320894 BLAKE2B 3bf0cb633ad2636d9430705459d841b717139b162bd39f30a6bf06dafe1647b94c0e791b05390d340f97a4ff83351cbd71be6d5b1793dda82c6cad9250ce18c2 SHA512 48576d26a65c439fb00b345d97ba9917c3c2bf99ab5c94ed4488e4638c0442fdcd721ed8a08be147481a01bffc3eadec25029c0d6cd1aed2381221250b16c19d
+DIST notus-scanner-22.6.0.tar.gz 324001 BLAKE2B db55ddd290d86e0e350824cbdf62caa78a29162fcf64196f70b25a8a8353a82b06509dc1d7d5240b88ee2aa2606f0d6d27075a7414c175093667914b8c8f372a SHA512 56c462be472668f959fff71ed928ca81c555f03d04325e63c35665a18d4b893ac62de9e7ddd060aba0cc6a34ca7c495defc39e788553cb7524c1f6658202bf7e
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
similarity index 87%
rename from net-analyzer/notus-scanner/notus-scanner-22.5.0-r1.ebuild
rename to net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
index bd27df745477..136c08284b4a 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}]
"
@@ -46,6 +44,13 @@ DISABLE_AUTOFORMATTING=true
distutils_enable_tests unittest
+src_prepare() {
+ if use test; then
+ PATCHES+=( "${FILESDIR}"/${P}-remove-tests.patch )
+ fi
+ default
+}
+
python_compile() {
distutils-r1_python_compile
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/notus-scanner/, net-analyzer/notus-scanner/files/
@ 2023-11-21 8:01 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-11-21 8:01 UTC (permalink / raw
To: gentoo-commits
commit: e313183da3c591caeaa7e1516ce3171fe9532ccd
Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Mon Nov 20 14:12:58 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 08:00:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e313183d
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 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33917
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/notus-scanner/Manifest | 2 +-
...tch => notus-scanner-22.6.2-remove-tests.patch} | 69 ++--------------------
...r-22.6.0.ebuild => notus-scanner-22.6.2.ebuild} | 7 +--
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
similarity index 51%
rename from net-analyzer/notus-scanner/files/notus-scanner-22.6.0-remove-tests.patch
rename to 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
similarity index 92%
rename from net-analyzer/notus-scanner/notus-scanner-22.6.0.ebuild
rename to 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="
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-11-21 8:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-21 8:01 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/notus-scanner/, net-analyzer/notus-scanner/files/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2023-10-07 15:11 Florian Schmaus
2023-08-09 13:32 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox