[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/

["Florian Schmaus" <flow@gentoo.org>]

commit:     185faa639e85ec71c399afc38cd9f9e25f51242d
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Wed Aug  9 13:57:59 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 09:07:54 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185faa63

net-analyzer/gvmd: fix OpenRC script

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

 net-analyzer/gvmd/files/gvmd-22.init                      | 15 ++++-----------
 net-analyzer/gvmd/files/gvmd-daemon-22.conf               |  3 +++
 .../gvmd/{gvmd-22.6.0.ebuild => gvmd-22.6.0-r1.ebuild}    |  3 ---
 3 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init
index f1ac6ddbac72..8fd1a0bfb335 100644
--- a/net-analyzer/gvmd/files/gvmd-22.init
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -3,14 +3,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 : ${GVMD_USER:=gvm}
-: ${GVMD_GROUP:=gvm}
+: ${GVMD_GROUP:=$(id -ng ${GVMD_USER})}
 : ${GVMD_TIMEOUT:=30}
 
 name="Greenbone Vulnerability Manager"
 command=/usr/bin/gvmd
-command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
+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="/run/gvmd/gvmd.pid"
+pidfile="/var/run/gvmd/gvmd.pid"
 retry="${GVMD_TIMEOUT}"
 
 depend() {
@@ -19,12 +19,5 @@ depend() {
 }
 
 start_pre() {
-	mkdir /run/gvmd
-	for p in gvm-checking gvm-create-functions gvm-helping gvm-migrating gvm-serving; do
-		touch /run/gvmd/${p}
-	done
-	chown -R gvm:gvm /run/gvmd/
-
-	touch /run/feed-update.lock
-	chown gvm:gvm /run/feed-update.lock
+	checkpath -d --owner ${GVMD_USER} /var/run/gvmd
 }

diff --git a/net-analyzer/gvmd/files/gvmd-daemon-22.conf b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
index e1a5482747fc..061609e1c45c 100644
--- a/net-analyzer/gvmd/files/gvmd-daemon-22.conf
+++ b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
@@ -25,5 +25,8 @@ GVMD_LISTEN_MODE="--listen-mode=755"
 # Scanner listen address unix socket
 GVMD_SCANNER_HOST="--scanner-host=/run/ospd/ospd-openvas.sock"
 
+# Update vt
+GVMD_VT_UPDATE="--osp-vt-update=/run/ospd/ospd-openvas.sock"
+
 # TLS settings
 GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"

diff --git a/net-analyzer/gvmd/gvmd-22.6.0.ebuild b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
similarity index 97%
rename from net-analyzer/gvmd/gvmd-22.6.0.ebuild
rename to net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
index 22ce3ef705d4..d7a4a809642a 100644
--- a/net-analyzer/gvmd/gvmd-22.6.0.ebuild
+++ b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
@@ -112,9 +112,6 @@ src_install() {
 		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
 }