gentoo resync : 12.05.2022

16 files changed, 136 insertions, 350 deletions

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index fe48e42b01e1..f7cec0254d79 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,15 +1,8 @@
-AUX greenbone-certdata-sync.conf 64 BLAKE2B e485a0f69df180834b2e2bd00da13dd86b9faa32215d2dba28f725436c0c907f2c23bb5bdca741195d400d4d8df3679362eb614aafdd7d89304c00180f2843ed SHA512 17df9386fc1dccf2fbe3b8d1fd499171f6681b61afe7b4c11ff9debc008798b31d1d02d59463031482d94e10833f0e71bde27cbbe422f23738c77b7c6ada79d2
-AUX greenbone-nvt-sync.conf 62 BLAKE2B cac8a82e44394f509aa325d940db0e67ab6cedeb0536f3f184064cef05c8cac5ee9d6c69181b7f2344d352fb28b732b454039d97b7ffe44a3d31c20fefebd3b6 SHA512 964779adc39cbed191bccf02ccc408a263860002d2dbddee755cf0d015336814b0b3c83f88a02cc0c5959657be5c49eb94380cd6ba15844e4b6088e49cd7a3f0
-AUX greenbone-scapdata-sync.conf 64 BLAKE2B 8bfa8fde583762aeb76d90d16694bc6344e23bbc0c607ff493a8e03ff02ee6534c5464fae5d6595a23e6014287b9dc66de7e5164358780ac68a7c1cd83a04309 SHA512 37dbbd3f92f8baee8e89c274d820e03cba5ed5469a826f118897035c2f7719a915a71a6069eb6bf7f9a72e798b7837af9a6f25709215683d9d264292b5ccad66
-AUX gvmd-9.0.1-glibc_siglist.patch 3599 BLAKE2B 91844507e01a3a7faa017ae98ae066b856993bfeaef7404fa884add53ccb8954eb7c3eebb74a1de1a01a6ec61960347595ba9418e9a2b814598288d488a92a03 SHA512 c3fb56954c55181cbfc52828a0d87703e237b945e5c5239b3dd429910d8a65ceef41b2ee7a7df522c8e9da9e86cd07fc383fb62fdccd73ab9380ae139fea2a7f
+AUX gvm-sync-all 727 BLAKE2B d92b004173747814bf063c5aa05fcfd5b37c04ab7eb9d044da2141d46bbf119ed96bf4328d5f4f9dd9cb14b59d05ab1ed5fc18e089deac7d95eba14a7950db5e SHA512 f4bed74b8be86e7fd27e2b86443539bfecb9e33ca959f743dca5267a6371934d4108804066be9ea64d917339df9d5921e066c3ca4d213a971b63eced77fced8b
+AUX gvm-sync-all.service 170 BLAKE2B 31aa75ba8733c73a2db4afbaf49eb5c40da3aaf9d4f11aad4b06dc2dc07dc927a54d2c2c8397eaeb43318430063b69fe2d803f16613af88887f8aad2638ee2f1 SHA512 8d9b862f729c64394b8801d36fefe4dfab0e0a80b603a19ed112f7a37e77c5a5cf906abafdd819b79df8dabc089b846e463c53317b0803e96dc2a5878a5639f2
+AUX gvm-sync-all.timer 183 BLAKE2B f91b69c6b2a5024c6cd9d678676071f7d5e175a3b35e0e34ffc03be7630df7519948c6c3285c7b265c73c0b7b4485706bba5673f89234c478ad6cd43d7305ddc SHA512 3716c8057bab3926b57e5e9868f4e00ec95940e5a9ea0506e16a152a76cb9b388ba5f0c8404245dcba5ba26bc789f0670781c41568d53a82412cd19689aca2c6
+AUX gvmd-21.4.5.init 771 BLAKE2B ade6f5e9da956d430062c4af610a496e449d5958897493a4b64323c2a2c74a47c5caf1d273c9a1186ce091048b63f0f685b33da9beecd2e6adbc9dce4b9196e4 SHA512 c481fb8352b34f4035c258858ef61ca90e36761210527360db8cda4c8687b2cb6fa1130f4f8a1b0f6046b3f39066c89e34c2c3c00b2090c8bd60bed57bb92197
 AUX gvmd-daemon.conf 813 BLAKE2B b4d73d6a5cc17325f56b250bf1e63fab808bf7e36a0b357641de87d54a3238fd68cf34cba08ce606827e3441e042c514cfc4ce73ff88b70cd4dea080dd68eb97 SHA512 1fcce48ed1d53489f4509138b3570790574003931289e65ab0f767a51da1e5d6c8d33c44da8d967f6c0442f0bee500bf46554a49b113fe0bc933dffd3fb121eb
-AUX gvmd-startpre.sh 295 BLAKE2B 324f84dbf577a81e86d9be1061637691bbe55dd04db47139ca0addaf11d397e1d16195b97c65ccddfaf82810b28f1a3f67d8d0a78f68cbda45f30218c4352164 SHA512 9796c0f6aa972e4f6af6fef506df2c072bba89de3856f9a66c9eb27ec0e407712d7c1afabd2a0e96d539aa3815a73fa5d4cd55d6128f17d5db83d1ef5a4a8900
-AUX gvmd.init 614 BLAKE2B e5c4bd192941b98f6e42dd1644a61b6d1fa6651c8932a7f85d3680f07272b2acabca91d0723c6b9057734fb41916ec52021161b9ff9a1512fbed04299a2d9941 SHA512 8eb0daf424fa9346674757f1d3f94a4708df9748d5e6c5a1b1ab8233651462bf1a93eda7899963484a7cdf2396eba30603ddb079bc4ae2855bc49097ea88f82d
-AUX gvmd.logrotate 325 BLAKE2B 4df59e6d9484b9e60d54cb3633ffc9888ad8550bb1d1f23123da21b1269125cd7354426b97ce42e06bf547d23788cefaac5ef51f7aa83d6cc34076bce4ab7339 SHA512 e1eeef173bfab7c750efcc7faa42cf7a1cfb9e6b137716063f273bc709c1346f11262dadbdb0c49822d885dc00177d8ccb91c0491ddc33cfee0a3827f11908f6
-AUX gvmd.service 505 BLAKE2B 32736b0f8f45b87e1e2c6f578d6f6b891b3642dab3bba6c56657ac61c0c55f81f8bf809c5d6508945972dcaf31b4e75729c7686409a2ebaea4b7a132d8d557d9 SHA512 ea9132367ee28814ed6e36c0b1fb1ce4700e5735d77e0889947618aba511c3adbc968167b4968d1fa28bd41959575a49b8b2ddb9b116957c729f51ece33dfd98
-DIST gvm-report-formats-0.1.tar.gz 58962 BLAKE2B 45cb5a7b81b68524254947503921f871577b86c2d7696758b365205b5ed8e4516840f704d3bcb8da6925a536db8e01fb9f0d922a3a2233dd4d4fa21e4308dc1b SHA512 8ae128ca087b7d1ecd2b84cb43e67b8f920001699268b9ce70d1f703f1dac68d8905354f5a8203808982291fdeb80fb11569a0bb559df0263296c603c691b422
-DIST gvmd-20.8.1.tar.gz 1024660 BLAKE2B c2981d73efe4bb32008c82ba9a017f58ade18efe00d85c1876a872ae9c6260e801697ef7c7bc9c0862e92043167ecd58d082b97c746308d983ffac7991146d83 SHA512 e946be6c67970fdb0e4e6fbb2ac9445576c280c3ac7503ff42aac2c079e817ee587a37477956917b576bafab3e7caa281da5befa6502b044562051ae976889b2
-DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
-EBUILD gvmd-20.8.1.ebuild 2948 BLAKE2B b3f1fba8a6a363a1535d4cd1228ed325582c4586fc0c2924a334283a310ce4251ac2af783828ccd26458ee4ce647be791ca548c1df02577770c6e85efbec7332 SHA512 5d5773687743bd112eb701eb1a83f5c89c71263864854cb5be9cd428be006499a8a313c8aeafdccfd4c21675e3d5fa137aae60332577e1ca026cbdfb8ea343a7
-EBUILD gvmd-9.0.1.ebuild 2732 BLAKE2B 9b683384b52b0fee3660bf8866c469cadac0e013911059aae9cb433d15336ab58befeb8f78083bde539ad6ea48d80ed0e43e9d9338e8b527086d4eaf91ca7b79 SHA512 61c3718c93745689322236e4570b0ea1c1bb6cd40a6f7c17d433d0534d0406a3c2a7f01325e08f4a6ba7af6a6e427faf913d65cd03dfa76903921dca788576fd
-MISC metadata.xml 1074 BLAKE2B 543d24a2af843ae2ca65802d3d48eeb8e36434c209edec270d5263e2f8639ac86001c5f9a5259df2111d148f56f41fdebaebffdf8b247c93a961defe83c79f25 SHA512 17c3e0fd62bab4a0676e9a3d171a8bac1e2368239d5882866dda101bc2247de96cbfba7d1b5c463e8383ec7552524f021b57a3676eb0b97deccca4624d3a29d3
+DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
+EBUILD gvmd-21.4.5-r5.ebuild 3198 BLAKE2B 9edf07dcf189b01b98e27aa2230e082d53bb5491da674fecd0d743475ba0bbb87cde73ea8fffe8b320aee002abd489b942ac34687e955a1c3818a9b347752581 SHA512 7eccbc904374ce4713e22c209e0ec3720e3c81e38b5d21391f6c84bde92b97f68c7f65a1af787e79cf97264b597ed112c793ac208f3d54234fbf821dd792d21a
+MISC metadata.xml 1011 BLAKE2B 5edc107135ad9743311cb0ddd8e3f45ba83b3c2252678e013e93dd3794f95105eb758c8e6154c177941cd620c3eced40e83b8f68f111b287a548725185357e43 SHA512 c8494a6c93a3731c315caa23c6c7b9d45a9413e5ce9b4d4d5a3558ff40fb190473a4e12076a3c3ff740f157931fca76ad26dbac25c2fb734f67982f6b4e00060
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
diff --git a/net-analyzer/gvmd/gvmd-20.8.1.ebuild b/net-analyzer/gvmd/gvmd-20.8.1.ebuild
deleted file mode 100644
index 87213ec32152..000000000000
--- a/net-analyzer/gvmd/gvmd-20.8.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/j-licht/gvmd_report_formats/archive/v0.1.tar.gz -> gvm-report-formats-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-group/gvm
-	acct-user/gvm
-	dev-db/postgresql:*[uuid]
-	dev-libs/libgcrypt:0=
-	dev-libs/libical
-	>=net-analyzer/gvm-libs-20.8.0
-	net-libs/gnutls:=[tools]
-	extras?   (
-		app-text/xmlstarlet
-		dev-texlive/texlive-latexextra )"
-
-RDEPEND="
-	${DEPEND}
-	net-analyzer/ospd-openvas"
-
-BDEPEND="
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig
-	extras? (
-		app-doc/doxygen[dot]
-		app-doc/xmltoman
-		app-text/htmldoc
-		dev-libs/libxslt
-	)
-	test? ( dev-libs/cgreen )"
-
-src_prepare() {
-	cmake_src_prepare
-	# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
-	sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" doc/CMakeLists.txt || die
-	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" CMakeLists.txt || die
-	# QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
-	if use extras; then
-		if ! tc-is-clang; then
-		   local f
-		   for f in doc/*.in
-		   do
-			sed -i \
-				-e "s*CLANG_ASSISTED_PARSING = NO*#CLANG_ASSISTED_PARSING = NO*g" \
-				-e "s*CLANG_OPTIONS*#CLANG_OPTIONS*g" \
-				"${f}" || die "couldn't disable CLANG parsing"
-		   done
-		fi
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		"-DLOCALSTATEDIR=${EPREFIX}/var"
-		"-DSYSCONFDIR=${EPREFIX}/etc"
-		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
-		"-DSBINDIR=${EPREFIX}/usr/bin"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use extras; then
-		cmake_build -C "${BUILD_DIR}" doc
-		cmake_build doc-full -C "${BUILD_DIR}" doc
-	fi
-	if use test; then
-		cmake_build tests
-	fi
-	cmake_build rebuild_cache
-}
-
-src_install() {
-	if use extras; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_src_install
-
-	#QA-Fix
-	rm -r "${D}/usr/etc" || die
-
-	insinto /etc/gvm
-	doins -r "${FILESDIR}"/*sync*
-
-	insinto /etc/gvm/sysconfig
-	doins "${FILESDIR}/${PN}-daemon.conf"
-
-	exeinto /etc/gvm
-	doexe "${FILESDIR}"/gvmd-startpre.sh
-
-	fowners -R gvm:gvm /etc/gvm
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/gvm/gvmd
-	fowners -R gvm:gvm /var/lib/gvm
-
-	#add report formats from old version for migration
-	insinto /usr/share/gvm/gvmd/
-	doins -r "${WORKDIR}/gvmd_report_formats-0.1/report_formats/"
-}
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild
index 2e848ce6b59a..05dd1b3e920e 100644
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild
@@ -1,60 +1,59 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-CMAKE_MAKEFILE_GENERATOR="emake"
 inherit cmake systemd toolchain-funcs
 
 DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/"
+HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
 SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-LICENSE="GPL-2+"
+LICENSE="AGPL-3+"
 KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
+	acct-group/gvm
+	acct-user/gvm
+	app-crypt/gpgme:1=
 	dev-db/postgresql:*[uuid]
-	dev-libs/libgcrypt:0=
-	dev-libs/libical
-	>=net-analyzer/gvm-libs-11.0.1
+	dev-libs/glib:2
+	dev-libs/libical:=
+	>=net-analyzer/gvm-libs-21.4.4
 	net-libs/gnutls:=[tools]
-	extras?   (
-		app-text/xmlstarlet
-		dev-texlive/texlive-latexextra )"
-
+"
+# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
+# and xmlstartlet are used for (PDF) report generator at runtime.
 RDEPEND="
 	${DEPEND}
-	acct-user/gvm
-	net-analyzer/ospd-openvas"
-
+	app-text/xmlstarlet
+	dev-perl/XML-Twig
+	dev-texlive/texlive-latexextra
+	net-analyzer/ospd-openvas
+"
 BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
 	virtual/pkgconfig
-	extras? (
+	doc? (
 		app-doc/doxygen[dot]
 		app-doc/xmltoman
 		app-text/htmldoc
 		dev-libs/libxslt
 	)
-	test? ( dev-libs/cgreen )"
-
-PATCHES=(
-	# Replace deprecated glibc sys_siglist with strsignal
-	"${FILESDIR}/${P}-glibc_siglist.patch"
-)
+	test? ( dev-libs/cgreen )
+"
 
 src_prepare() {
 	cmake_src_prepare
 	# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
-	sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "${S}"/doc/CMakeLists.txt || die
-	sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "${S}"/CMakeLists.txt || die
+	sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die
+	sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die
 	# QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
-	if use extras; then
+	if use doc; then
 		if ! tc-is-clang; then
 		   local f
 		   for f in doc/*.in
@@ -66,6 +65,18 @@ src_prepare() {
 		   done
 		fi
 	fi
+
+	# https://github.com/greenbone/gvmd/pull/1819
+	sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die
+
+	# Upstream 3ebab6044818f1710b73c04e94fd9bea148c9853
+	sed -i \
+		-e 's/^RuntimeDirectory=gvm/RuntimeDirectory=gvmd/' \
+		-e 's/GVM_RUN_DIR/GVMD_RUN_DIR/' \
+		config/gvmd.service.in || die
+
+	# https://github.com/greenbone/gvmd/pull/1824
+	sed -i '/^install (DIRECTORY DESTINATION ${GVMD_RUN_DIR})/d' CMakeLists.txt || die
 }
 
 src_configure() {
@@ -74,13 +85,15 @@ src_configure() {
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
 		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
+		"-DGVM_DEFAULT_DROP_USER=gvm"
 	)
 	cmake_src_configure
 }
 
 src_compile() {
 	cmake_src_compile
-	if use extras; then
+	if use doc; then
 		cmake_build -C "${BUILD_DIR}" doc
 		cmake_build doc-full -C "${BUILD_DIR}" doc
 	fi
@@ -91,31 +104,26 @@ src_compile() {
 }
 
 src_install() {
-	if use extras; then
+	if use doc; then
 		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
 	fi
 	cmake_src_install
 
-	insinto /etc/gvm
-	doins -r "${FILESDIR}"/*sync*
-
 	insinto /etc/gvm/sysconfig
 	doins "${FILESDIR}/${PN}-daemon.conf"
+	if ! use prefix; then
+		fowners -R gvm:gvm /etc/gvm
+	fi
 
-	exeinto /etc/gvm
-	doexe "${FILESDIR}"/gvmd-startpre.sh
-
-	fowners -R gvm:gvm /etc/gvm
-
-	newinitd "${FILESDIR}/${PN}.init" "${PN}"
+	newinitd "${FILESDIR}/${P}.init" "${PN}"
 	newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
 
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	systemd_dounit "${FILESDIR}/${PN}.service"
-
 	# Set proper permissions on required files/directories
 	keepdir /var/lib/gvm/gvmd
-	fowners -R gvm:gvm /var/lib/gvm
+	if ! use prefix; then
+		fowners -R gvm:gvm /var/lib/gvm
+	fi
+
+	dosbin "${FILESDIR}"/gvm-sync-all
+	systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
 }
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index d60e9b09e0d8..f0294aac8dd0 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -9,14 +9,11 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<use>
-		<flag name="extras">Html docs support</flag>
-	</use>
 	<longdescription lang="en">
 	The Greenbone Vulnerability Manager is the central management service between security scanners and the user clients.
 	It manages the storage of any vulnerability management configurations and of the scan results.
 	Access to data, control commands and workflows is offered via the XML-based Greenbone Management Protocol (GMP).
-	The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other 
+	The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other
 	remote scanner is coupled with the Open Scanner Protocol (OSP).
 	</longdescription>
 	<upstream>