public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/
@ 2019-10-28  4:05 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2019-10-28  4:05 UTC (permalink / raw
  To: gentoo-commits

commit:     511272cb60c6fdea44268972c99fc7e5cebf554d
Author:     Hasan ÇALIŞIR <hasan.calisir <AT> psauxit <DOT> com>
AuthorDate: Mon Aug 12 15:14:47 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Oct 28 04:02:18 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=511272cb

net-analyzer/gvmd: new package.

openvas-manager with version 8 has been renamed in
Greenbone vulnerability manager (gvmd).
Version bump to 8.0.1. This also fixes bug 684186
and introduces the new USE flags 'postgres','sqlite'.

Closes: https://bugs.gentoo.org/684186
Closes: https://bugs.gentoo.org/692004
Reported-by: Anton Bolshakov <blshkv <AT> pentoo.ch>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Hasan ÇALIŞIR <hasan.calisir <AT> psauxit.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-analyzer/gvmd/Manifest                         |   1 +
 .../gvmd/files/greenbone-certdata-sync.conf        |   1 +
 net-analyzer/gvmd/files/greenbone-nvt-sync.conf    |   1 +
 .../gvmd/files/greenbone-scapdata-sync.conf        |   1 +
 net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch      |  56 ++++++++++
 net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch   |  34 ++++++
 net-analyzer/gvmd/files/gvmd-daemon.conf           |  29 +++++
 net-analyzer/gvmd/files/gvmd-startpre.sh           |   5 +
 net-analyzer/gvmd/files/gvmd.init                  |  24 +++++
 net-analyzer/gvmd/files/gvmd.logrotate             |  13 +++
 net-analyzer/gvmd/files/gvmd.service               |  21 ++++
 net-analyzer/gvmd/gvmd-8.0.1.ebuild                | 120 +++++++++++++++++++++
 net-analyzer/gvmd/metadata.xml                     |  25 +++++
 13 files changed, 331 insertions(+)

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
new file mode 100644
index 00000000000..328c523e067
--- /dev/null
+++ b/net-analyzer/gvmd/Manifest
@@ -0,0 +1 @@
+DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8

diff --git a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
new file mode 100644
index 00000000000..d31a7331d34
--- /dev/null
+++ b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000000..967c41dec2e
--- /dev/null
+++ b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000000..4a7426bc805
--- /dev/null
+++ b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
@@ -0,0 +1 @@
+COMMUNITY_SCAP_RSYNC_FEED="rsync://feed.openvas.org:/scap-data"

diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
new file mode 100644
index 00000000000..bf21acb7b01
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
@@ -0,0 +1,56 @@
+--- a/src/CMakeLists.txt	2019-07-17 17:11:52.000000000 +0300
++++ b/src/CMakeLists.txt	2019-07-21 22:43:17.299106863 +0300
+@@ -248,12 +248,12 @@
+ ## Install
+ 
+ install (TARGETS ${BINARY_NAME}
+-         RUNTIME DESTINATION ${SBINDIR}
++         RUNTIME DESTINATION ${BINDIR}
+          LIBRARY DESTINATION ${LIBDIR}
+          ARCHIVE DESTINATION ${LIBDIR}/static)
+ 
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gvmd
+-         DESTINATION ${SBINDIR})
++         DESTINATION ${BINDIR})
+ 
+ if (BACKEND STREQUAL POSTGRESQL)
+   install (TARGETS gvm-pg-server
+--- a/CMakeLists.txt	2019-07-22 11:31:13.430827400 +0300
++++ b/CMakeLists.txt	2019-07-22 11:32:29.034765809 +0300
+@@ -571,17 +571,17 @@
+          PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-portnames-update
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+@@ -593,13 +593,13 @@
+                      WORLD_READ WORLD_EXECUTE)
+ 
+ install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres
+-         DESTINATION ${SBINDIR}
++         DESTINATION ${BINDIR}
+          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ 
+ if (BACKEND STREQUAL SQLITE3)
+   install (FILES ${CMAKE_SOURCE_DIR}/tools/database-statistics-sqlite
+-           DESTINATION ${SBINDIR}
++           DESTINATION ${BINDIR}
+            PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
+                        GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ endif (BACKEND STREQUAL SQLITE3)

diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
new file mode 100644
index 00000000000..40b1e009557
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
@@ -0,0 +1,34 @@
+--- a/tools/greenbone-certdata-sync.in	2019-07-17 17:11:52.000000000 +0300
++++ b/tools/greenbone-certdata-sync.in	2019-07-22 21:11:36.173099530 +0300
+@@ -494,13 +494,11 @@
+ fi
+ (
+   flock -n 9
+-  date > $LOCK_FILE
+   if [ $? -eq 1 ] ; then
+     log_notice "Sync in progress, exiting."
+     exit 1
+   fi
+   sync_certdata
+-  echo -n > $LOCK_FILE
+-) 9>$LOCK_FILE
++)
+ 
+ exit 0
+--- a/tools/greenbone-scapdata-sync.in	2019-07-17 17:11:52.000000000 +0300
++++ b/tools/greenbone-scapdata-sync.in	2019-07-22 21:12:49.193161531 +0300
+@@ -517,13 +517,11 @@
+ fi
+ (
+   flock -n 9
+-  date > $LOCK_FILE
+   if [ $? -eq 1 ] ; then
+     log_notice "Sync in progress, exiting."
+     exit 1
+   fi
+   sync_scapdata
+-  echo -n > $LOCK_FILE
+-) 9>$LOCK_FILE
++)
+ 
+ exit 0

diff --git a/net-analyzer/gvmd/files/gvmd-daemon.conf b/net-analyzer/gvmd/files/gvmd-daemon.conf
new file mode 100644
index 00000000000..d97da00c768
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-daemon.conf
@@ -0,0 +1,29 @@
+# GVMD command args
+
+# e.g --foreground
+GVMD_OPTIONS=""
+
+# Manager listen address unix socket
+# Failing under non-root user (looking for solution)
+GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/var/run/gvmd.sock"
+
+# Manager listen address TCP
+GVMD_LISTEN_ADDRESS_TCP="--listen=127.0.0.1"
+
+# Manager listen port
+GVMD_PORT="--port=9390"
+
+# Manager unix socket listen owner
+GVMD_LISTEN_OWNER="--listen-owner=gvm"
+
+# Manager unix socket listen group
+GVMD_LISTEN_GROUP="--listen-group=gvm"
+
+# Manager unix socket listen mode
+GVMD_LISTEN_MODE="--listen-mode=755"
+
+# Scanner listen address unix socket
+GVMD_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock"
+
+# TLS settings
+GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"

diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh
new file mode 100644
index 00000000000..d04daa09b0a
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-startpre.sh
@@ -0,0 +1,5 @@
+#!/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}

diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init
new file mode 100644
index 00000000000..9686c9b5398
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd.init
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 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_background="true"
+command_user="${GVMD_USER}:${GVMD_GROUP}"
+pidfile="/run/gvmd.pid"
+retry="${GVMD_TIMEOUT}"
+
+depend() {
+	after bootmisc
+	need localmount net openvassd
+}
+
+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
new file mode 100644
index 00000000000..453462575f8
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd.logrotate
@@ -0,0 +1,13 @@
+# 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
new file mode 100644
index 00000000000..2e3ad84c85a
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd.service
@@ -0,0 +1,21 @@
+[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-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
new file mode 100644
index 00000000000..2c6da5d39c1
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake-utils flag-o-matic 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 postgres sqlite"
+REQUIRED_USE="|| ( postgres sqlite )"
+
+DEPEND="
+	dev-libs/libgcrypt:0=
+	dev-libs/libical
+	>=net-analyzer/gvm-libs-10.0.1
+	net-libs/gnutls:=[tools]
+	extras?   ( app-text/xmlstarlet
+		    dev-texlive/texlive-latexextra )
+	postgres? ( dev-db/postgresql:* )
+	sqlite?   ( dev-db/sqlite:3 )"
+
+RDEPEND="
+	${DEPEND}
+	!net-analyzer/openvas-manager
+	~net-analyzer/openvas-scanner-6.0.1"
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	extras? ( app-doc/doxygen[dot]
+		  app-doc/xmltoman
+		  app-text/htmldoc
+		  dev-libs/libxslt
+	)"
+
+PATCHES=(
+	# Install exec. to /usr/bin instead of /usr/sbin
+	"${FILESDIR}/${P}-sbin.patch"
+	# Fix permissions for user gvm.
+	"${FILESDIR}/${P}-tmplock.patch"
+)
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1
+	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 8.0.1
+	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=(
+		"-DCMAKE_INSTALL_PREFIX=${EPREFIX}/usr"
+		"-DLOCALSTATEDIR=${EPREFIX}/var"
+		"-DSYSCONFDIR=${EPREFIX}/etc"
+	)
+	# Add release hardening flags for 8.0.1
+	append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
+	append-ldflags -Wl,-z,relro -Wl,-z,now
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use extras; then
+		cmake-utils_src_make -C "${BUILD_DIR}" doc
+		cmake-utils_src_make doc-full -C "${BUILD_DIR}" doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+	fi
+	cmake-utils_src_make rebuild_cache
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	dodir /etc/gvm
+	insinto /etc/gvm
+	doins -r "${FILESDIR}"/*sync*
+
+	dodir /etc/gvm/sysconfig
+	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
new file mode 100644
index 00000000000..36ce32a69a9
--- /dev/null
+++ b/net-analyzer/gvmd/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hasan.calisir@psauxit.com</email>
+		<name>Hasan ÇALIŞIR</name>
+	</maintainer>
+	<maintainer type="project">
+		<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 
+	remote scanner is coupled with the Open Scanner Protocol (OSP).
+	</longdescription>
+	<upstream>
+		<remote-id type="github">greenbone/gvmd</remote-id>
+	</upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/
@ 2021-03-22 13:36 Joonas Niilola
  0 siblings, 0 replies; 6+ messages in thread
From: Joonas Niilola @ 2021-03-22 13:36 UTC (permalink / raw
  To: gentoo-commits

commit:     d831d64c3623228f5beaec89e5f856da137c51e7
Author:     Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Thu Mar 18 21:30:40 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 22 13:33:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d831d64c

net-analyzer/gvmd: version bump to 20.8.1

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-analyzer/gvmd/Manifest               |   2 +
 net-analyzer/gvmd/files/gvmd-startpre.sh |   2 +
 net-analyzer/gvmd/gvmd-20.8.1.ebuild     | 125 +++++++++++++++++++++++++++++++
 3 files changed, 129 insertions(+)

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index de6f6ae1f9b..b5200b5bbfd 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1 +1,3 @@
+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

diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh
index d04daa09b0a..5ba4b5c273c 100644
--- a/net-analyzer/gvmd/files/gvmd-startpre.sh
+++ b/net-analyzer/gvmd/files/gvmd-startpre.sh
@@ -3,3 +3,5 @@
 # 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/gvmd-20.8.1.ebuild b/net-analyzer/gvmd/gvmd-20.8.1.ebuild
new file mode 100644
index 00000000000..272afbb0fa7
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-20.8.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake flag-o-matic 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" "$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
+
+	#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/"
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/
@ 2022-05-04  9:29 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2022-05-04  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     bf80824644ed64dcbb691284941ea978e3bac58d
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Wed May  4 09:20:54 2022 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed May  4 09:27:47 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf808246

net-analyzer/gvmd: upstream systemd/logrotate, fix doc dir, minor fixes

Use the systemd service file and logrotate configuration from
upstream. Fix doc directory. Drop CMAKE_MAKEFILE_GENERATOR. Shorten
HOMEPAGE. Fix upstream systemd service file. Drop gvmd-startpre.sh
script.

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

 net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh       |  8 --------
 net-analyzer/gvmd/files/gvmd-21.4.5.init              |  9 ++++++++-
 .../{gvmd-21.4.5.ebuild => gvmd-21.4.5-r1.ebuild}     | 19 +++++++------------
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh b/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
deleted file mode 100644
index 85e6f008abe0..000000000000
--- a/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
index ae9a170921b2..047ad8446a4f 100644
--- a/net-analyzer/gvmd/files/gvmd-21.4.5.init
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5.init
@@ -19,5 +19,12 @@ depend() {
 }
 
 start_pre() {
-	/bin/bash /etc/gvm/gvmd-startpre.sh
+	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/gvmd-21.4.5.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild
similarity index 82%
rename from net-analyzer/gvmd/gvmd-21.4.5.ebuild
rename to net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild
index 4d133ecc4f04..4c49deefa350 100644
--- a/net-analyzer/gvmd/gvmd-21.4.5.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild
@@ -3,11 +3,10 @@
 
 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/ https://github.com/greenbone/gvmd/"
+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"
@@ -49,8 +48,8 @@ BDEPEND="
 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
+	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
@@ -64,6 +63,9 @@ src_prepare() {
 		   done
 		fi
 	fi
+
+	# https://github.com/greenbone/gvmd/pull/1819
+	sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die
 }
 
 src_configure() {
@@ -72,6 +74,7 @@ src_configure() {
 		"-DSYSCONFDIR=${EPREFIX}/etc"
 		"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
 		"-DSBINDIR=${EPREFIX}/usr/bin"
+		"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
 	)
 	cmake_src_configure
 }
@@ -97,19 +100,11 @@ src_install() {
 	insinto /etc/gvm/sysconfig
 	doins "${FILESDIR}/${PN}-daemon.conf"
 
-	exeinto /etc/gvm
-	newexe "${FILESDIR}"/${P}-startpre.sh gvmd-startpre.sh
-
 	fowners -R gvm:gvm /etc/gvm
 
 	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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/
@ 2023-07-03  8:15 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-07-03  8:15 UTC (permalink / raw
  To: gentoo-commits

commit:     43b636fbcabce31bdee124d2851bf4ac8d4356ec
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Sat May 20 16:58:36 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 08:15:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b636fb

net-analyzer/gvmd: add 22.5.1

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        |  30 +++++++
 net-analyzer/gvmd/files/gvmd-daemon-22.conf |  29 +++++++
 net-analyzer/gvmd/files/gvmd.service.conf   |  21 +++++
 net-analyzer/gvmd/gvmd-22.5.1.ebuild        | 129 ++++++++++++++++++++++++++++
 net-analyzer/gvmd/metadata.xml              |   4 +
 6 files changed, 214 insertions(+)

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index afe9b2d63f60..39e788d9caa4 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1 +1,2 @@
 DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
+DIST gvmd-22.5.1.tar.gz 1031083 BLAKE2B 8c999b86e049828aadbdafcf14aad98772f05f5be3bcd7bed2176fbfddf83042d8092e6cc56325db1b5edc1ba6e33a4b508e8de593b7c4962096911e3f464ade SHA512 483bda9d05b77db2047fe4ba8e37ac062baade55234573665ed46441ff3ea220a2485829a1357f5a60ea27e304c8906ff12db7a1d41917b09d9243b4a9e763d6

diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init
new file mode 100644
index 000000000000..f1ac6ddbac72
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -0,0 +1,30 @@
+#!/sbin/openrc-run
+# Copyright 1999-2023 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 postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15
+	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-daemon-22.conf b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
new file mode 100644
index 000000000000..e1a5482747fc
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
@@ -0,0 +1,29 @@
+# GVMD command args
+
+# e.g --foreground
+GVMD_OPTIONS=""
+
+# Manager listen address unix socket
+# Failing under non-root user (looking for solution)
+GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/run/gvmd/gvmd.sock"
+
+# Manager listen address TCP
+GVMD_LISTEN_ADDRESS_TCP="--listen=127.0.0.1"
+
+# Manager listen port
+GVMD_PORT="--port=9390"
+
+# Manager unix socket listen owner
+GVMD_LISTEN_OWNER="--listen-owner=gvm"
+
+# Manager unix socket listen group
+GVMD_LISTEN_GROUP="--listen-group=gvm"
+
+# Manager unix socket listen mode
+GVMD_LISTEN_MODE="--listen-mode=755"
+
+# Scanner listen address unix socket
+GVMD_SCANNER_HOST="--scanner-host=/run/ospd/ospd-openvas.sock"
+
+# TLS settings
+GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"

diff --git a/net-analyzer/gvmd/files/gvmd.service.conf b/net-analyzer/gvmd/files/gvmd.service.conf
new file mode 100644
index 000000000000..5aa19bf2efd4
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd.service.conf
@@ -0,0 +1,21 @@
+[Unit]
+After=postgresql-9.6.service
+After=postgresql-10.service
+After=postgresql-11.service
+After=postgresql-12.service
+After=postgresql-13.service
+After=postgresql-14.service
+After=postgresql-15.service
+Wants=postgresql-9.6.service
+Wants=postgresql-10.service
+Wants=postgresql-11.service
+Wants=postgresql-12.service
+Wants=postgresql-13.service
+Wants=postgresql-14.service
+Wants=postgresql-15.service
+PartOf=gvm.target
+
+[Service]
+Type=exec
+ExecStart=
+ExecStart=/usr/bin/gvmd --foreground --osp-vt-update=/run/ospd/ospd-openvas.sock --listen-group=gvm 

diff --git a/net-analyzer/gvmd/gvmd-22.5.1.ebuild b/net-analyzer/gvmd/gvmd-22.5.1.ebuild
new file mode 100644
index 000000000000..22ce3ef705d4
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-22.5.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2023 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"
+
+SLOT="0"
+LICENSE="AGPL-3+"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	acct-user/gvm
+	app-crypt/gpgme:1=
+	>=dev-db/postgresql-9.6:=[uuid]
+	>=dev-libs/glib-2.42:2
+	>=dev-libs/libical-1.0.0
+	>=net-analyzer/gvm-libs-20.08.0
+	>=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="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	doc? (
+		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/${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
+
+	dosbin "${FILESDIR}"/gvm-sync-all
+	systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
+
+	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/metadata.xml b/net-analyzer/gvmd/metadata.xml
index f0294aac8dd0..362c0017dc23 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>foti.giuseppe@gmail.com</email>
+		<name>Giuseppe Foti</name>
+	</maintainer>
 	<maintainer type="person" proxied="yes">
 		<email>jonas.licht@gmail.com</email>
 		<name>Jonas Licht</name>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/
@ 2023-11-21  8:01 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2023-11-21  8:01 UTC (permalink / raw
  To: gentoo-commits

commit:     21363affa0377224cfa044aa669510f252ba9905
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Wed Nov 15 06:10:30 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 08:00:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21363aff

net-analyzer/gvmd: add 23.1.0, drop 22.9.0

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33833
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gvmd/Manifest                                   | 2 +-
 net-analyzer/gvmd/files/gvmd-22.init                         | 4 ++--
 net-analyzer/gvmd/files/gvmd.service.conf                    | 2 ++
 net-analyzer/gvmd/{gvmd-22.9.0.ebuild => gvmd-23.1.0.ebuild} | 0
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 7da58754e390..7a42f0db917e 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1 +1 @@
-DIST gvmd-22.9.0.tar.gz 1040655 BLAKE2B b2d7ebd6d29a44eef34000cf1c158cc1053398a685f5db3fe001d3074aad79fef4ee940572f172acdc4b9cef7c31a43742e9aed3f6a228b97e5d6ca79ee77f84 SHA512 231deb33023a2812dbeb7a4dd670c622a5012002c5b478bae906d1877a2dd036777c61247eb3128cbffd7cbb021c11a12f81b1bf16bf61b960ad4fa498f62c7e
+DIST gvmd-23.1.0.tar.gz 1050719 BLAKE2B 9ff3e679ac4c4ff0e4a5eb1ee9ed4c9d243a96b5c4d63934576ec86d70f15f6ff6dee839e29c0de50af3a829e141fa416ac993935f0a683ca135f68f17e1489a SHA512 77d08067a168065bb3b4fd10ba94c48a3207378c9b8c0be42a9570c390c92b985ebf94c53cbbe04f78c2a802de430d599593e1971bc7b93d3f0652bfe59022a4

diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init
index 9b2a5a6f69a7..fdae00af6317 100644
--- a/net-analyzer/gvmd/files/gvmd-22.init
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -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
-	want postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15
+	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
 	need localmount net ospd-openvas
 }
 

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

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/
@ 2024-12-07 21:33 Florian Schmaus
  0 siblings, 0 replies; 6+ messages in thread
From: Florian Schmaus @ 2024-12-07 21:33 UTC (permalink / raw
  To: gentoo-commits

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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-12-07 21:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-22 13:36 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-12-07 21:33 Florian Schmaus
2023-11-21  8:01 Florian Schmaus
2023-07-03  8:15 Florian Schmaus
2022-05-04  9:29 Florian Schmaus
2019-10-28  4:05 Joonas Niilola

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox