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 29521158089 for ; Tue, 14 Nov 2023 07:53:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D43352BC030; Tue, 14 Nov 2023 07:53:21 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4C062BC030 for ; Tue, 14 Nov 2023 07:53:21 +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 A6A50335D75 for ; Tue, 14 Nov 2023 07:53:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E560A1389 for ; Tue, 14 Nov 2023 07:53:18 +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: <1699948346.4d46e157b5c68d44e955627f61c95164ad0ea57b.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/gvmd/Manifest net-analyzer/gvmd/files/gvm-sync-all net-analyzer/gvmd/files/gvm-sync-all.service net-analyzer/gvmd/files/gvm-sync-all.timer net-analyzer/gvmd/files/gvmd-21.4.5.init net-analyzer/gvmd/files/gvmd-daemon.conf net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild X-VCS-Directories: net-analyzer/gvmd/ net-analyzer/gvmd/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 4d46e157b5c68d44e955627f61c95164ad0ea57b X-VCS-Branch: master Date: Tue, 14 Nov 2023 07:53:18 +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: b68e994b-fcbb-4043-b1c7-a76338695cfb X-Archives-Hash: fc458df2efe3f4e6dee5f6123ea461dd commit: 4d46e157b5c68d44e955627f61c95164ad0ea57b Author: Giuseppe Foti gmail com> AuthorDate: Mon Nov 13 19:57:00 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Tue Nov 14 07:52:26 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d46e157 net-analyzer/gvmd: drop 21.4.5-r5 Signed-off-by: Giuseppe Foti gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33801 Signed-off-by: Florian Schmaus gentoo.org> net-analyzer/gvmd/Manifest | 1 - net-analyzer/gvmd/files/gvm-sync-all | 31 ------- net-analyzer/gvmd/files/gvm-sync-all.service | 7 -- net-analyzer/gvmd/files/gvm-sync-all.timer | 9 -- net-analyzer/gvmd/files/gvmd-21.4.5.init | 30 ------- net-analyzer/gvmd/files/gvmd-daemon.conf | 29 ------ net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild | 129 --------------------------- 7 files changed, 236 deletions(-) diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest index 86e27e18ee6d..7da58754e390 100644 --- a/net-analyzer/gvmd/Manifest +++ b/net-analyzer/gvmd/Manifest @@ -1,2 +1 @@ -DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec DIST gvmd-22.9.0.tar.gz 1040655 BLAKE2B b2d7ebd6d29a44eef34000cf1c158cc1053398a685f5db3fe001d3074aad79fef4ee940572f172acdc4b9cef7c31a43742e9aed3f6a228b97e5d6ca79ee77f84 SHA512 231deb33023a2812dbeb7a4dd670c622a5012002c5b478bae906d1877a2dd036777c61247eb3128cbffd7cbb021c11a12f81b1bf16bf61b960ad4fa498f62c7e diff --git a/net-analyzer/gvmd/files/gvm-sync-all b/net-analyzer/gvmd/files/gvm-sync-all deleted file mode 100644 index d12b860e7fcb..000000000000 --- a/net-analyzer/gvmd/files/gvm-sync-all +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -case ${USER} in - root) - exec su --shell /bin/bash --command "$0 $@" gvm - ;; - gvm) - ;; - *) - >&2 echo "Must be run as root or gvm user not ${USER}" - exit 1 - ;; -esac - -while getopts d OPTION "$@"; do - case ${OPTION} in - d) - set -x - ;; - esac -done -shift $((OPTIND - 1)) - -greenbone-nvt-sync -# Note that Greenbone recommends to sync CERT *after* SCAP, as the -# former depends on the later. See -# https://github.com/greenbone/gvmd/blob/main/INSTALL.md#keeping-the-feeds-up-to-date -for FEED_TYPE in SCAP CERT GVMD_DATA; do - greenbone-feed-sync --type ${FEED_TYPE} -done diff --git a/net-analyzer/gvmd/files/gvm-sync-all.service b/net-analyzer/gvmd/files/gvm-sync-all.service deleted file mode 100644 index a82e2950f3fd..000000000000 --- a/net-analyzer/gvmd/files/gvm-sync-all.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Update all feeds of the Greenbone Vulerability Management (GMV) suite -After=network-online.target - -[Service] -ExecStart=/usr/sbin/gvm-sync-all -User=gvm diff --git a/net-analyzer/gvmd/files/gvm-sync-all.timer b/net-analyzer/gvmd/files/gvm-sync-all.timer deleted file mode 100644 index 9faf470e013c..000000000000 --- a/net-analyzer/gvmd/files/gvm-sync-all.timer +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite - -[Timer] -OnCalendar=daily -RandomizedDelaySec=2hour - -[Install] -WantedBy=timers.target diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5.init b/net-analyzer/gvmd/files/gvmd-21.4.5.init deleted file mode 100644 index 047ad8446a4f..000000000000 --- a/net-analyzer/gvmd/files/gvmd-21.4.5.init +++ /dev/null @@ -1,30 +0,0 @@ -#!/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() { - 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.conf b/net-analyzer/gvmd/files/gvmd-daemon.conf deleted file mode 100644 index d97da00c7688..000000000000 --- a/net-analyzer/gvmd/files/gvmd-daemon.conf +++ /dev/null @@ -1,29 +0,0 @@ -# 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/gvmd-21.4.5-r5.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild deleted file mode 100644 index 05dd1b3e920e..000000000000 --- a/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2022 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-group/gvm - acct-user/gvm - app-crypt/gpgme:1= - dev-db/postgresql:*[uuid] - dev-libs/glib:2 - dev-libs/libical:= - >=net-analyzer/gvm-libs-21.4.4 - net-libs/gnutls:=[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 -" -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 - - # https://github.com/greenbone/gvmd/pull/1819 - sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die - - # Upstream 3ebab6044818f1710b73c04e94fd9bea148c9853 - sed -i \ - -e 's/^RuntimeDirectory=gvm/RuntimeDirectory=gvmd/' \ - -e 's/GVM_RUN_DIR/GVMD_RUN_DIR/' \ - config/gvmd.service.in || die - - # https://github.com/greenbone/gvmd/pull/1824 - sed -i '/^install (DIRECTORY DESTINATION ${GVMD_RUN_DIR})/d' CMakeLists.txt || die -} - -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 - doins "${FILESDIR}/${PN}-daemon.conf" - if ! use prefix; then - fowners -R gvm:gvm /etc/gvm - fi - - newinitd "${FILESDIR}/${P}.init" "${PN}" - newconfd "${FILESDIR}/${PN}-daemon.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} -}