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

[Florian Schmaus]

commit:     6381b8f34898c822a1c36f9826443433fe0ac9ee
Author:     Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Sat Apr 30 16:12:25 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May  2 14:25:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6381b8f3

net-analyzer/gvmd: bump to 21.4.5, drop 21.4.4

Co-authored-by: Florian Schmaus <flow <AT> gentoo.org>
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gvmd/Manifest                         |  2 +-
 net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh    |  8 ++++
 net-analyzer/gvmd/files/gvmd-21.4.5.init           | 23 ++++++++++++
 .../{gvmd-21.4.4.ebuild => gvmd-21.4.5.ebuild}     | 43 +++++++++-------------
 4 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index f4c9e78b54dc..0491908d3697 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,4 +1,4 @@
 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.4.tar.gz 1031202 BLAKE2B bbb1b2cfba31fafa3e44453b493e78f916ffb9a27c0072ba8f9655b6936d678417258133e87cd9b160b5d3768058f2f8ebb1a7523860c4965a4eadac2bfb5aeb SHA512 4bff2cafab6672d30cac03c306083c703a42b299020fa662165143ef604a00cad0f1ce7e144005f2c9acb4dd5e2dd61ac0542b088328e8428f91a830fbbe5eed
+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/gvmd-21.4.5-startpre.sh b/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
new file mode 100644
index 000000000000..85e6f008abe0
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Greenbone Vulnerability Manager Systemd ExecStartPre
+mkdir -p /run/gvmd
+touch /run/gvmd/gvm-{checking,create-functions,helping,migrating,serving}
+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-21.4.5.init b/net-analyzer/gvmd/files/gvmd-21.4.5.init
new file mode 100644
index 000000000000..ae9a170921b2
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5.init
@@ -0,0 +1,23 @@
+#!/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() {
+	/bin/bash /etc/gvm/gvmd-startpre.sh
+}

diff --git a/net-analyzer/gvmd/gvmd-21.4.4.ebuild b/net-analyzer/gvmd/gvmd-21.4.5.ebuild
similarity index 76%
rename from net-analyzer/gvmd/gvmd-21.4.4.ebuild
rename to net-analyzer/gvmd/gvmd-21.4.5.ebuild
index ea78308c4ab3..4d133ecc4f04 100644
--- a/net-analyzer/gvmd/gvmd-21.4.4.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5.ebuild
@@ -8,13 +8,12 @@ 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"
+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"
+IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
@@ -23,29 +22,29 @@ DEPEND="
 	app-crypt/gpgme:1=
 	dev-db/postgresql:*[uuid]
 	dev-libs/glib:2
-	dev-libs/libgcrypt:0=
 	dev-libs/libical:=
-	>=net-analyzer/gvm-libs-${PV}
+	>=net-analyzer/gvm-libs-21.4.4
 	net-libs/gnutls:=[tools]
-	extras?   (
+	doc?   (
 		app-text/xmlstarlet
-		dev-texlive/texlive-latexextra )"
-
+		dev-texlive/texlive-latexextra )
+"
 RDEPEND="
 	${DEPEND}
-	net-analyzer/ospd-openvas"
-
+	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 )"
+	test? ( dev-libs/cgreen )
+"
 
 src_prepare() {
 	cmake_src_prepare
@@ -53,7 +52,7 @@ src_prepare() {
 	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 use doc; then
 		if ! tc-is-clang; then
 		   local f
 		   for f in doc/*.in
@@ -79,7 +78,7 @@ 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
@@ -90,26 +89,20 @@ src_compile() {
 }
 
 src_install() {
-	if use extras; then
+	if use doc; 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
+	newexe "${FILESDIR}"/${P}-startpre.sh 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
@@ -121,7 +114,5 @@ src_install() {
 	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/"
+	rm -r "${D}/run" || die
 }