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

[Florian Schmaus]

commit:     f89f5f93d8301291321b9c8fc2ecf9b6c567a3ec
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May  9 13:57:15 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May 10 19:53:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89f5f93

net-analyzer/gvmd: drop 9.0.1, 20.8.1

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gvmd/Manifest                         |   3 -
 .../gvmd/files/greenbone-certdata-sync.conf        |   1 -
 net-analyzer/gvmd/files/greenbone-nvt-sync.conf    |   1 -
 .../gvmd/files/greenbone-scapdata-sync.conf        |   1 -
 .../gvmd/files/gvmd-9.0.1-glibc_siglist.patch      |  96 ----------------
 net-analyzer/gvmd/files/gvmd-startpre.sh           |   7 --
 net-analyzer/gvmd/files/gvmd.logrotate             |  13 ---
 net-analyzer/gvmd/files/gvmd.service               |  21 ----
 net-analyzer/gvmd/gvmd-20.8.1.ebuild               | 125 ---------------------
 net-analyzer/gvmd/gvmd-9.0.1.ebuild                | 121 --------------------
 net-analyzer/gvmd/metadata.xml                     |   5 +-
 11 files changed, 1 insertion(+), 393 deletions(-)

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 0491908d3697..afe9b2d63f60 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,4 +1 @@
-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-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
-DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf

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/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@×××××.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.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-9.0.1.ebuild
deleted file mode 100644
index 2e848ce6b59a..000000000000
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ /dev/null
@@ -1,121 +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/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-db/postgresql:*[uuid]
-	dev-libs/libgcrypt:0=
-	dev-libs/libical
-	>=net-analyzer/gvm-libs-11.0.1
-	net-libs/gnutls:=[tools]
-	extras?   (
-		app-text/xmlstarlet
-		dev-texlive/texlive-latexextra )"
-
-RDEPEND="
-	${DEPEND}
-	acct-user/gvm
-	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 )"
-
-PATCHES=(
-	# Replace deprecated glibc sys_siglist with strsignal
-	"${FILESDIR}/${P}-glibc_siglist.patch"
-)
-
-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
-	# 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
-
-	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
-}

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@g.o</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>