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 2DC91158090 for ; Mon, 9 May 2022 12:07:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3442CE08F2; Mon, 9 May 2022 12:07:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 D8345E08F1 for ; Mon, 9 May 2022 12:07:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 04C7D34151B for ; Mon, 9 May 2022 12:07:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 63B60450 for ; Mon, 9 May 2022 12:07:23 +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: <1652098036.65e6c54c1352d9fc3aa0f88d6f835f58e0a74c6c.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-scanner/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r1.ebuild net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild X-VCS-Directories: net-analyzer/openvas-scanner/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 65e6c54c1352d9fc3aa0f88d6f835f58e0a74c6c X-VCS-Branch: master Date: Mon, 9 May 2022 12:07:23 +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: fdc2f48f-e88a-422e-acba-617aadc096f8 X-Archives-Hash: fc1b1d49a9a1d4144bb9b39727bdc236 commit: 65e6c54c1352d9fc3aa0f88d6f835f58e0a74c6c Author: Florian Schmaus gentoo org> AuthorDate: Mon May 9 11:44:07 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon May 9 12:07:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65e6c54c net-analyzer/openvas-scanner: drop USE cron, minor fixes Signed-off-by: Florian Schmaus gentoo.org> ...-r1.ebuild => openvas-scanner-21.4.4-r2.ebuild} | 36 +++++++++------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild similarity index 81% rename from net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r1.ebuild rename to net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild index 9ddbf782d358..59b7fae51932 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild @@ -3,24 +3,22 @@ EAPI=8 -CMAKE_MAKEFILE_GENERATOR="emake" inherit cmake toolchain-funcs MY_PN="openvas" MY_DN="openvassd" DESCRIPTION="Open Vulnerability Assessment Scanner" -HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/openvas-scanner/" +HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/" SRC_URI="https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz" SLOT="0" LICENSE="GPL-2 GPL-2+" KEYWORDS="~amd64 ~x86" -IUSE="cron doc snmp test" +IUSE="doc snmp test" RESTRICT="!test? ( test )" DEPEND=" - acct-group/gvm acct-user/gvm app-crypt/gpgme:= dev-db/redis @@ -32,11 +30,9 @@ DEPEND=" snmp? ( net-analyzer/net-snmp:= ) net-libs/gnutls:= net-libs/libpcap - net-libs/libssh:=" - -RDEPEND=" - ${DEPEND}" - + net-libs/libssh:= +" +RDEPEND="${DEPEND}" BDEPEND=" sys-devel/bison sys-devel/flex @@ -48,7 +44,8 @@ BDEPEND=" dev-perl/CGI dev-perl/SQL-Translator ) - test? ( dev-libs/cgreen )" + test? ( dev-libs/cgreen ) +" PATCHES=( "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch @@ -109,24 +106,19 @@ src_install() { fi cmake_src_install - if use cron; then - # Install the cron job if they want it. - exeinto /etc/gvm - newexe "${FILESDIR}/gvm-feed-sync-20.8.1.sh" gvm-feed-sync.sh - fowners gvm:gvm /etc/gvm/gvm-feed-sync.sh - - insinto /etc/cron.d - newins "${FILESDIR}"/gvm-feed-sync.cron gvm - fi - insinto /etc/logrotate.d newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}" # Set proper permissions on required files/directories keepdir /var/log/gvm - fowners gvm:gvm /var/log/gvm + if ! use prefix; then + fowners gvm:gvm /var/log/gvm + fi + keepdir /var/lib/openvas/{gnupg,plugins} - fowners -R gvm:gvm /var/lib/openvas + if ! use prefix; then + fowners -R gvm:gvm /var/lib/openvas + fi insinto /etc/openvas doins "${FILESDIR}/openvas.conf"