gentoo resync : 12.05.2022

12 files changed, 77 insertions, 164 deletions

diff --git a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
deleted file mode 100644
index d31a7331d341..000000000000
--- a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_CERT_RSYNC_FEED="rsync://feed.openvas.org:/cert-data"
diff --git a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
deleted file mode 100644
index 967c41dec2e3..000000000000
--- a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_NVT_RSYNC_FEED="rsync://feed.openvas.org:/nvt-feed"
diff --git a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
deleted file mode 100644
index 4a7426bc8057..000000000000
--- a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_SCAP_RSYNC_FEED="rsync://feed.openvas.org:/scap-data"
diff --git a/net-analyzer/gvmd/files/gvm-sync-all b/net-analyzer/gvmd/files/gvm-sync-all
new file mode 100644
index 000000000000..d12b860e7fcb
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+case ${USER} in
+    root)
+        exec su --shell /bin/bash --command "$0 $@" gvm
+        ;;
+    gvm)
+        ;;
+    *)
+        >&2 echo "Must be run as root or gvm user not ${USER}"
+        exit 1
+        ;;
+esac
+
+while getopts d OPTION "$@"; do
+        case ${OPTION} in
+                d)
+                        set -x
+                        ;;
+        esac
+done
+shift $((OPTIND - 1))
+
+greenbone-nvt-sync
+# Note that Greenbone recommends to sync CERT *after* SCAP, as the
+# former depends on the later. See
+# https://github.com/greenbone/gvmd/blob/main/INSTALL.md#keeping-the-feeds-up-to-date
+for FEED_TYPE in SCAP CERT GVMD_DATA; do
+    greenbone-feed-sync --type ${FEED_TYPE}
+done
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.service b/net-analyzer/gvmd/files/gvm-sync-all.service
new file mode 100644
index 000000000000..a82e2950f3fd
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Update all feeds of the Greenbone Vulerability Management (GMV) suite
+After=network-online.target
+
+[Service]
+ExecStart=/usr/sbin/gvm-sync-all
+User=gvm
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.timer b/net-analyzer/gvmd/files/gvm-sync-all.timer
new file mode 100644
index 000000000000..9faf470e013c
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite
+
+[Timer]
+OnCalendar=daily
+RandomizedDelaySec=2hour
+
+[Install]
+WantedBy=timers.target
diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5.init b/net-analyzer/gvmd/files/gvmd-21.4.5.init
new file mode 100644
index 000000000000..047ad8446a4f
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5.init
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${GVMD_USER:=gvm}
+: ${GVMD_GROUP:=gvm}
+: ${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_user="${GVMD_USER}:${GVMD_GROUP}"
+pidfile="/run/gvmd/gvmd.pid"
+retry="${GVMD_TIMEOUT}"
+
+depend() {
+	after bootmisc
+	need localmount net ospd-openvas
+}
+
+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
+}
diff --git a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
deleted file mode 100644
index 186bd882bdd8..000000000000
--- a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From ed07f5a23dd0644d0bbd3f2ddc1cec3b6ce922c6 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Tue, 1 Sep 2020 10:03:34 +0200
-Subject: [PATCH] Replace deprecated sys_siglist with strsignal
-
-Required to work with glibc >= 2.32.
-
-https://sourceware.org/pipermail/libc-announce/2020/000029.html
-
-  The deprecated arrays sys_siglist, _sys_siglist, and sys_sigabbrev
-  are no longer available to newly linked binaries, and their declarations
-  have been removed from <string.h>. They are exported solely as
-  compatibility symbols to support old binaries. All programs should use
-  strsignal instead.
-
---- ./src/manage.c	2020-05-12 18:54:26.000000000 +0200
-+++ ./src/manage.c	2020-10-27 13:32:20.423421085 +0100
-@@ -3283,7 +3283,7 @@
-               {
-                 g_debug ("%s: Received %s signal.",
-                          __FUNCTION__,
--                         sys_siglist[get_termination_signal()]);
-+                         strsignal(get_termination_signal()));
-               }
-             if (global_current_report)
-               {
-@@ -3305,7 +3305,7 @@
-         {
-           g_debug ("%s: Received %s signal.",
-                    __FUNCTION__,
--                   sys_siglist[get_termination_signal()]);
-+                   strsignal(get_termination_signal()));
-           if (global_current_report)
-             {
-               set_report_scan_run_status (global_current_report,
---- ./src/gvmd.c	2020-05-12 18:54:26.000000000 +0200
-+++ ./src/gvmd.c	2020-10-27 13:34:47.606424207 +0100
-@@ -922,7 +922,7 @@
-   if (sigaction (signal, &action, NULL) == -1)
-     {
-       g_critical ("%s: failed to register %s handler",
--                  __FUNCTION__, sys_siglist[signal]);
-+                  __FUNCTION__, strsignal(termination_signal));
-       exit (EXIT_FAILURE);
-     }
- }
-@@ -953,7 +953,7 @@
-   if (sigaction (signal, &action, NULL) == -1)
-     {
-       g_critical ("%s: failed to register %s handler",
--                  __FUNCTION__, sys_siglist[signal]);
-+                  __FUNCTION__, strsignal(termination_signal));
-       exit (EXIT_FAILURE);
-     }
- }
-@@ -1258,7 +1258,7 @@
-       if (termination_signal)
-         {
-           g_debug ("Received %s signal",
--                   sys_siglist[termination_signal]);
-+                   strsignal(termination_signal));
-           cleanup ();
-           /* Raise signal again, to exit with the correct return value. */
-           setup_signal_handler (termination_signal, SIG_DFL, 0);
-@@ -1347,7 +1347,7 @@
-       if (termination_signal)
-         {
-           g_debug ("Received %s signal",
--                   sys_siglist[termination_signal]);
-+                   strsignal(termination_signal));
-           cleanup ();
-           /* Raise signal again, to exit with the correct return value. */
-           setup_signal_handler (termination_signal, SIG_DFL, 0);
---- ./src/manage_sql.c	2020-05-12 18:54:26.000000000 +0200
-+++ ./src/manage_sql.c	2020-10-27 13:36:19.071426148 +0100
-@@ -18711,7 +18711,7 @@
- void
- manage_cleanup_process_error (int signal)
- {
--  g_debug ("Received %s signal", sys_siglist[signal]);
-+  g_debug ("Received %s signal", strsignal(signal));
-   if (sql_is_open ())
-     {
-       if (current_scanner_task)
---- ./src/gmpd.c	2020-05-12 18:54:26.000000000 +0200
-+++ ./src/gmpd.c	2020-10-27 13:46:29.687439101 +0100
-@@ -496,8 +496,7 @@
-         {
-           g_debug ("%s: Received %s signal.",
-                    __FUNCTION__,
--                   sys_siglist[get_termination_signal()]);
--
-+                   strsignal(get_termination_signal()));
-           goto client_free;
-         }
- 
diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh
deleted file mode 100644
index 5ba4b5c273c9..000000000000
--- a/net-analyzer/gvmd/files/gvmd-startpre.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Greenbone Vulnerability Manager Systemd ExecStartPre
-touch /var/run/gvm-{checking,create-functions,helping,migrating,serving}
-chown -R gvm:gvm /var/run/gvm-{checking,create-functions,helping,migrating,serving}
-touch /var/run/feed-update.lock
-chown gvm:gvm /var/run/feed-update.lock
diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init
deleted file mode 100644
index 098232afa1e5..000000000000
--- a/net-analyzer/gvmd/files/gvmd.init
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${GVMD_USER:=gvm}
-: ${GVMD_GROUP:=gvm}
-: ${GVMD_TIMEOUT:=30}
-
-name="Greenbone Vulnerability Manager"
-command=/usr/bin/gvmd
-command_args="--foreground ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
-command_background="true"
-command_user="${GVMD_USER}:${GVMD_GROUP}"
-pidfile="/run/gvmd.pid"
-retry="${GVMD_TIMEOUT}"
-
-depend() {
-	after bootmisc
-	need localmount net ospd-openvas
-}
-
-start_pre() {
-	/bin/bash /etc/gvm/gvmd-startpre.sh
-}
diff --git a/net-analyzer/gvmd/files/gvmd.logrotate b/net-analyzer/gvmd/files/gvmd.logrotate
deleted file mode 100644
index 453462575f8b..000000000000
--- a/net-analyzer/gvmd/files/gvmd.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# Daemon ignore HUP so we use 'copytruncate' instead of 'create' 
-# with safe file size to prevent losing log entries.
-
-/var/log/gvm/gvmd.log {
-	compress
-	missingok
-	notifempty
-	sharedscripts
-	copytruncate
-	maxsize 10M
-}
diff --git a/net-analyzer/gvmd/files/gvmd.service b/net-analyzer/gvmd/files/gvmd.service
deleted file mode 100644
index 2e3ad84c85a5..000000000000
--- a/net-analyzer/gvmd/files/gvmd.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=Greenbone Vulnerability Manager
-After=network.target
-After=openvassd.service
-Wants=openvassd.service
-Before=gsad.service
-
-[Service]
-Type=forking
-PrivateTmp=yes
-User=gvm
-Group=gvm
-PermissionsStartOnly=true
-EnvironmentFile=-/etc/gvm/sysconfig/gvmd-daemon.conf
-ExecStartPre=-/etc/gvm/gvmd-startpre.sh
-ExecStart=/usr/bin/gvmd $GVMD_OPTIONS $GVMD_LISTEN_ADDRESS_TCP $GVMD_PORT $GVMD_SCANNER_HOST $GVMD_GNUTLS_PRIORITIES
-Restart=on-failure
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target