gentoo auto-resync : 09:08:2023 - 15:30:17

6 files changed, 37 insertions, 29 deletions

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index d54678f06e1b..508a2613890f 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/notus-scanner/Manifest b/net-analyzer/notus-scanner/Manifest
index 04748e594cf0..c303521d6930 100644
--- a/net-analyzer/notus-scanner/Manifest
+++ b/net-analyzer/notus-scanner/Manifest
@@ -1,7 +1,6 @@
-AUX notus-scanner.confd 379 BLAKE2B 23aec44c8b7f20246bfb407fe5b79c0a229ea58c2a9965390db6ddb4dff9a8097b37599ac6cf4730aa32214d9b009970ccf1ca39d988b182421f0fb30a4985a2 SHA512 3fe1a15fa6ba6ac926a9449f88d632267dccef4099e0f1b66d06674518cdaea6ed624199afbe6558e3cb97c5ad912ea29d81de02d9e38d5a5e67f43caf966d03
-AUX notus-scanner.initd 607 BLAKE2B 230e0e6e6abb3e52a4af52e71a793d73537342d0583e28a1ac53c91c3ed13b250092e47e50b114d991209249a8281ff3cf80c753225ae7e0c1dfb912ad8613ab SHA512 680838ce4a0590448b5518d430c22e67305d9eea85cda18175303df5524b1b20ba95f7156502dd5b20afb0c070a7f3fb1f5c28094b5246ad7efa01a1092a4798
+AUX notus-scanner.initd 617 BLAKE2B 674d7327f3c9242137ca3b949b3e19f1c01d96388c0676afe501836bb069b9132d25e13e5541ec6b653a314ec29524e7d27889038512330e286f28b8684c18a4 SHA512 697a138ca27ac7556628188c9b3f6db807a72d7119587194e8cf181e7b5ff4b393be5adf1fc325498ffd97bdedf8eb6fbc4566bd858ee29d677992c3e3d9a0e1
 AUX notus-scanner.service.conf 93 BLAKE2B 17030f4836aa96f45fdc9be67fb1b1924680ec29193bfc03d470bc45bf973542ca1b2bbb13253eb20c1618132b4b07c3fcaadd39451cb583d4c8f6fcd6e26c65 SHA512 36d5fbe95cd02b728d048a0baeed03448899696d0b3344a166afc9eecd6620e8af347ecc86c014ec9211ce72cc55a202a84b9ea68a7662c268378c37a734b08f
-AUX notus-scanner.toml 273 BLAKE2B 742fd2f07418e020f37313fc275cf3ba44b3b3a701de7982eff3d5ebc74cdfe6618104799221d842bb2b7088b3444ecc4ce98aa28175da4a57876ea0c33e311a SHA512 bfa21bd4ee4c0cbcf8613a0fe5bcf31507aed94a74ddc139a6c1a5b1858f417ac40d00d0f8f1e849802632430b0a52c05231585237fbc397ffff03d1f013e5b6
+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.ebuild 1591 BLAKE2B 3b885ff5acec0e4d934c0fa30551ee5c5a18f163ad548ee4af2cdabbee503c79175317a6f15f3e49a4f2b64c0f65f235b8403d062148a3b61328bdbb947e2724 SHA512 9aae3a4f006e2faea2085d8cd34fd1e9aeed1d43249cefb8b57fceff1e871123cffc3b3d6b1e7ae9db39efffd0ddde90c8c1922da9c70d930d200dd87acf7571
+EBUILD notus-scanner-22.5.0-r1.ebuild 2172 BLAKE2B 8da54fd1724c475cdd7565233cf04b941b04183236276198aab767e947adf116cb862ef309d7d0fce0779e1f637564e262d92705684b925a06758336dd4ca3e8 SHA512 98ab3bfa135b453be0b75ff2e1bf91d417b78001e36465f4b544cad77fa5086f6e4c4d1afec957c4f2ef4c1cd6181e2ba022459a67925540f9a3199453c909a5
 MISC metadata.xml 735 BLAKE2B 78af413540fe6af7214b65b50b50aaf9cf59280037ada5228d38e529d90752b0516bf1d7514e7d9436edd93b50cd8a9dadc1e9fbf84a5c57a0ff0cb45b712cc8 SHA512 fdb4ce92c1eede58fe267ed2a4832dd1d4e7a1694591efb3d2ff372a621320275c4090317cb57c50724ceb7e386fa28965e45b724b311127ecd8665e2908cf92
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
index 630d765d70a5..59d016bf88af 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"
@@ -33,6 +33,17 @@ RDEPEND="
 	app-misc/mosquitto
 "
 
+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() {
@@ -41,9 +52,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 +67,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
 }