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

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

commit:     5cd96ba01a5d6b5eb0bf5856d572524393097d60
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Sat Dec  7 16:49:30 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Dec  7 21:28:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cd96ba0

net-analyzer/gvmd: drop 23.6.2, revbump 23.9.0 to add posgresql-17 on init

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gvmd/Manifest                         |   1 -
 net-analyzer/gvmd/files/gvmd-22.init               |   6 +-
 net-analyzer/gvmd/files/gvmd.service.conf          |   2 +
 net-analyzer/gvmd/gvmd-23.6.2.ebuild               | 128 ---------------------
 .../{gvmd-23.9.0.ebuild => gvmd-23.9.0-r1.ebuild}  |   0
 5 files changed, 5 insertions(+), 132 deletions(-)

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 4e5f9de70d16..e1cf6df84a5b 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,2 +1 @@
-DIST gvmd-23.6.2.tar.gz 1065818 BLAKE2B 65b999c42628eec4816aea984ba1ab0383a9147ba04f934b21b5763db10dac2679cfab821520e69be42accdaad061fbb0692c9d6cd8f30db592d9466c3cdc351 SHA512 935af9a842d7b82a8467ccbb9edf1c9e8ea05c4f8a4e263c3692a2d8993209312af3d760943e32c77f8c12d2220771b9731b10dba59c89d2570682a3e363767d
 DIST gvmd-23.9.0.tar.gz 1087527 BLAKE2B a65ebf9aec0f5a29ade63b4aadcecdbbe0e342642b30c426257ef4de0f901b40a1ceaf0586a6ced38d94f4e404913da1b8eb53d8704e6c4ffe5c9791c70be011 SHA512 07c72679ed62f05e001c40f20eda8c5eef7512176d4eba1371047c4f1a0371625f1e380e81e306f7f764f918658f8223c8209b19a1a271f129e0677862517971

diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init
index fdae00af6317..834a84668c90 100644
--- a/net-analyzer/gvmd/files/gvmd-22.init
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 : ${GVMD_USER:=gvm}
@@ -14,8 +14,8 @@ pidfile="/run/gvmd/gvmd.pid"
 retry="${GVMD_TIMEOUT}"
 
 depend() {
-	after bootmisc postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16
-	want postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16
+	after bootmisc postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16 postgresql-17
+	want postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15 postgresql-16 postgresql-17
 	need localmount net ospd-openvas
 }
 

diff --git a/net-analyzer/gvmd/files/gvmd.service.conf b/net-analyzer/gvmd/files/gvmd.service.conf
index 2e22ddab18c3..8edc19c97eae 100644
--- a/net-analyzer/gvmd/files/gvmd.service.conf
+++ b/net-analyzer/gvmd/files/gvmd.service.conf
@@ -7,6 +7,7 @@ After=postgresql-13.service
 After=postgresql-14.service
 After=postgresql-15.service
 After=postgresql-16.service
+After=postgresql-17.service
 Wants=postgresql-9.6.service
 Wants=postgresql-10.service
 Wants=postgresql-11.service
@@ -15,6 +16,7 @@ Wants=postgresql-13.service
 Wants=postgresql-14.service
 Wants=postgresql-15.service
 Wants=postgresql-16.service
+Wants=postgresql-17.service
 PartOf=gvm.target
 
 [Service]

diff --git a/net-analyzer/gvmd/gvmd-23.6.2.ebuild b/net-analyzer/gvmd/gvmd-23.6.2.ebuild
deleted file mode 100644
index 85facb7d6bcb..000000000000
--- a/net-analyzer/gvmd/gvmd-23.6.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-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"
-
-LICENSE="AGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:1=
-	dev-libs/libbsd
-	>=dev-db/postgresql-9.6:=[uuid]
-	>=dev-libs/glib-2.42:2
-	>=dev-libs/libical-1.0.0:=
-	>=net-analyzer/gvm-libs-22.9
-	>=net-libs/gnutls-3.2.15:=[tools]
-"
-
-# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
-# and xmlstartlet are used for (PDF) report generator at runtime.
-RDEPEND="
-	${DEPEND}
-	app-text/xmlstarlet
-	dev-perl/XML-Twig
-	dev-texlive/texlive-latexextra
-	>=net-analyzer/ospd-openvas-22.4
-	>=dev-db/pg-gvm-22.4
-"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		app-text/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/${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 doc; 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"
-		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
-		"-DGVM_DEFAULT_DROP_USER=gvm"
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	if use doc; 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 doc; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_src_install
-
-	insinto /etc/gvm/sysconfig
-	newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf"
-	if ! use prefix; then
-		fowners -R gvm:gvm /etc/gvm
-	fi
-
-	newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
-	newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/lib/gvm/gvmd
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/gvm
-	fi
-
-	systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \
-			${PN}.service
-}
-
-pkg_postinst() {
-	elog "If you are upgrading from a previous version, you need to update the database version."
-	elog "Please, create the running directory and give write permission to the database user"
-	elog "then run gvmd as the gvm user with --migrate option:"
-	elog "~# mkdir /run/gvmd"
-	elog "~# setfacl -m u:gvm:rwx /run/gvmd/"
-	elog "~# sudo -u gvm gvmd --migrate"
-}

diff --git a/net-analyzer/gvmd/gvmd-23.9.0.ebuild b/net-analyzer/gvmd/gvmd-23.9.0-r1.ebuild
similarity index 100%
rename from net-analyzer/gvmd/gvmd-23.9.0.ebuild
rename to net-analyzer/gvmd/gvmd-23.9.0-r1.ebuild