From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 314FD158090 for ; Wed, 4 May 2022 09:29:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5ED0AE07C5; Wed, 4 May 2022 09:29:49 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 399AFE07C5 for ; Wed, 4 May 2022 09:29:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 343DE3412DF for ; Wed, 4 May 2022 09:29:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 85728177 for ; Wed, 4 May 2022 09:29:46 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1651656467.bf80824644ed64dcbb691284941ea978e3bac58d.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/files/, net-analyzer/gvmd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh net-analyzer/gvmd/files/gvmd-21.4.5.init net-analyzer/gvmd/gvmd-21.4.5-r1.ebuild net-analyzer/gvmd/gvmd-21.4.5.ebuild X-VCS-Directories: net-analyzer/gvmd/ net-analyzer/gvmd/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: bf80824644ed64dcbb691284941ea978e3bac58d X-VCS-Branch: master Date: Wed, 4 May 2022 09:29:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b01335ba-2285-4d8a-9520-1bb289d74701 X-Archives-Hash: 9b74abaf181c235390918ca872307db9 commit: bf80824644ed64dcbb691284941ea978e3bac58d Author: Florian Schmaus gentoo org> AuthorDate: Wed May 4 09:20:54 2022 +0000 Commit: Florian Schmaus gentoo 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 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