commit:     1b660bc1fa2a8bc217edbdddd787d0a7716b8f91
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 19:35:56 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 14:48:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b660bc1

net-analyzer/openvas-scanner: drop 6.0.1, 7.0.1, 20.8.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-analyzer/openvas-scanner/Manifest              |   3 -
 .../files/openvas-scanner-6.0.1-sbin.patch         |  21 ----
 net-analyzer/openvas-scanner/metadata.xml          |   2 -
 .../openvas-scanner/openvas-scanner-20.8.1.ebuild  | 132 --------------------
 .../openvas-scanner/openvas-scanner-6.0.1.ebuild   | 135 ---------------------
 .../openvas-scanner/openvas-scanner-7.0.1.ebuild   | 127 -------------------
 6 files changed, 420 deletions(-)

diff --git a/net-analyzer/openvas-scanner/Manifest 
b/net-analyzer/openvas-scanner/Manifest
index 7dac2d80b696..f305491728b5 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,4 +1 @@
-DIST openvas-scanner-20.8.1.tar.gz 431985 BLAKE2B 
60b328dc261bf48f37aa2727f4b63904c898467f989abef8f05e29329a24d0d98c13690005c5c7a8c93f899db709771ea60832927f169f6779707a1fac602368
 SHA512 
6114f37a91a3dd42c3693f10548a7727fb88fbe535ce511b164a440d5ace1c736d4c8a45db9a7e83b9abbd376c4d6b13afd3d23a995a5d089329a2bb8bd71cec
 DIST openvas-scanner-21.4.4.tar.gz 460601 BLAKE2B 
66d627e76912735539399aed637fdc07a7d13c9e4eb142498dcf181b8ea952dd93107bcc1f2ef577126178ff3dad1e5f6e50d67840692cd49f7352e3a726ce8f
 SHA512 
f2fe1f802b14fc41ee0d7657d031d318b651c3ec9ef554b33379a7459d40c17b44525c8f666ccb9670868576c101766936dd0c700778e46683bf43f0683834b6
-DIST openvas-scanner-6.0.1.tar.gz 522100 BLAKE2B 
af82b41736329bd90ba1ea73a0ace36d4115375f81a7aaff5d3bd50f21cfa3195cdf4012aa952da52c4103a31475de5c5790ef3e2e36180aa06737371fa0e5a0
 SHA512 
db4087fffe1d50e232fa1e51325cf7f142237e2bd3cc5dcaa1e7058a4871300f352f2c0e700eae72ea9412c347b072e9d1f2eca508b27cb30f36c6895ec95147
-DIST openvas-scanner-7.0.1.tar.gz 429012 BLAKE2B 
13fd0fef2ce88f6789da9f00e8f35329e915ebc74a29b3bd52af93c6b70292d055fa1159aec4041d79a785971a583eb514e8700d1d38a76775446e40af9b2fac
 SHA512 
201ea02b25bf247320437ae5c82bdc95db981cc6bd99fdece9403573434db122cdc8db7b82a08cba34b6d67d5794b2364f798847c79b421495666adc95a02571

diff --git 
a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch 
b/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch
deleted file mode 100644
index d5b8a2a6b62f..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-6.0.1-sbin.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/src/CMakeLists.txt       2019-07-21 23:16:18.608251465 +0300
-+++ b/src/CMakeLists.txt       2019-07-21 23:17:08.434210058 +0300
-@@ -175,7 +175,7 @@
- ## Install
- 
- install (TARGETS openvassd
--         RUNTIME DESTINATION ${SBINDIR}
-+         RUNTIME DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-          GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
-@@ -183,7 +183,7 @@
-          DESTINATION ${OPENVAS_SYSCONF_DIR})
- 
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-nvt-sync
--         DESTINATION ${SBINDIR}
-+         DESTINATION ${BINDIR}
-          PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
-                      GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- 
-

diff --git a/net-analyzer/openvas-scanner/metadata.xml 
b/net-analyzer/openvas-scanner/metadata.xml
index d89ae96ec8ec..20db261053a1 100644
--- a/net-analyzer/openvas-scanner/metadata.xml
+++ b/net-analyzer/openvas-scanner/metadata.xml
@@ -10,8 +10,6 @@
                <name>Proxy Maintainers</name>
        </maintainer>
        <use>
-               <flag name="cron">Install a cron job to update GVM's feed 
daily.</flag>
-               <flag name="extras">Html docs support</flag>
                <flag name="snmp">Build againts 
<pkg>net-analyzer/net-snmp</pkg> for "improved SNMP support"</flag>
        </use>
        <longdescription lang="en">

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild 
b/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
deleted file mode 100644
index 9dbdf06bee94..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-20.8.1.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/";
-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 extras snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       acct-group/gvm
-       acct-user/gvm
-       app-crypt/gpgme:=
-       dev-db/redis
-       dev-libs/glib
-       dev-libs/libgcrypt:=
-       dev-libs/libksba
-       >=net-analyzer/gvm-libs-20.8.0
-       snmp? ( net-analyzer/net-snmp:= )
-       net-libs/gnutls:=
-       net-libs/libpcap
-       net-libs/libssh:="
-
-RDEPEND="
-       ${DEPEND}"
-
-BDEPEND="
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       extras? (
-               app-doc/doxygen[dot]
-               app-doc/xmltoman
-               app-text/htmldoc
-               dev-perl/CGI
-               dev-perl/SQL-Translator
-       )
-       test? ( dev-libs/cgreen )"
-
-PATCHES=(
-       "${FILESDIR}"/${PN}-7.0.1-disable-automagic-dep.patch
-       "${FILESDIR}"/${PN}-7.0.1-fix-linking-with-lld.patch
-       #qa fix for rpath
-       "${FILESDIR}"/${P}-rpath-qa-fix.patch
-)
-
-src_prepare() {
-       cmake_src_prepare
-       # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0
-       sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" 
"${S}"/src/CMakeLists.txt || die
-       # QA-Fix | Remove !CLANG doxygen warnings for 7.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
-
-       #Remove tests that doesn't work in the network sandbox
-       if use test; then
-               sed -i 's/add_test (pcap-test pcap-test)/ /g' 
misc/CMakeLists.txt || die
-       fi
-}
-
-src_configure() {
-       local mycmakeargs=(
-               "-DLOCALSTATEDIR=${EPREFIX}/var"
-               "-DSYSCONFDIR=${EPREFIX}/etc"
-               "-DSBINDIR=${EPREFIX}/usr/bin"
-               "-DBUILD_WITH_SNMP=$(usex snmp)"
-       )
-       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
-       cmake_build rebuild_cache
-       if use test; then
-               cmake_build tests
-       fi
-}
-
-src_install() {
-       if use extras; then
-               local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-       fi
-       cmake_src_install
-
-       if use cron; then
-               # Install the cron job if they want it.
-               exeinto /etc/gvm
-               newexe "${FILESDIR}/gvm-feed-sync-${PV}.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
-       keepdir /var/lib/openvas/{gnupg,plugins}
-       fowners -R gvm:gvm /var/lib/openvas
-
-       insinto /etc/openvas
-       doins "${FILESDIR}/openvas.conf"
-}

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild 
b/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
deleted file mode 100644
index cabd334cd52f..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-6.0.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# 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
-
-MY_PN="openvas"
-MY_DN="openvassd"
-
-DESCRIPTION="Open Vulnerability Assessment Scanner"
-HOMEPAGE="https://www.greenbone.net/en/";
-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 extras"
-
-DEPEND="
-       app-crypt/gpgme:=
-       dev-db/redis
-       dev-libs/libgcrypt:=
-       dev-libs/libksba
-       >=net-analyzer/gvm-libs-10.0.1
-       net-analyzer/net-snmp
-       net-libs/gnutls:=
-       net-libs/libpcap
-       net-libs/libssh:=
-"
-
-RDEPEND="
-       ${DEPEND}"
-
-BDEPEND="
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       extras? ( app-doc/doxygen[dot]
-                 app-doc/xmltoman
-                 app-text/htmldoc
-                 dev-perl/CGI
-                 dev-perl/SQL-Translator
-       )"
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-PATCHES=(
-       # Install exec. to /usr/bin instead of /usr/sbin
-       "${FILESDIR}/${P}-sbin.patch"
-)
-
-src_prepare() {
-       cmake_src_prepare
-       # QA-Fix | Correct FHS/Gentoo policy paths for 6.0.1
-       sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" 
"${S}"/src/CMakeLists.txt || die
-       # QA-Fix | Remove !CLANG doxygen warnings for 6.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=(
-               "-DLOCALSTATEDIR=${EPREFIX}/var"
-               "-DSYSCONFDIR=${EPREFIX}/etc"
-       )
-       # Add release hardening flags for 6.0.1
-       append-cflags -Wno-format-truncation -Wformat -Wformat-security 
-D_FORTIFY_SOURCE=2 -fstack-protector
-       append-ldflags -Wl,-z,relro -Wl,-z,now
-       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
-               HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-       fi
-       cmake_build rebuild_cache
-}
-
-src_install() {
-       cmake_src_install
-
-       dodir /etc/openvas
-       insinto /etc/openvas
-       newins "${FILESDIR}/${MY_DN}.gvm.conf" openvassd.conf
-
-       insinto /etc/openvas
-       doins "${FILESDIR}"/redis.conf.example
-
-       dodir /etc/openvas/sysconfig
-       insinto /etc/openvas/sysconfig
-       doins "${FILESDIR}/${MY_DN}-daemon.conf"
-
-       if use cron; then
-               # Install the cron job if they want it.
-               exeinto /etc/gvm
-               doexe "${FILESDIR}/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
-
-       fowners -R gvm:gvm /etc/openvas
-
-       newinitd "${FILESDIR}/${MY_DN}.init" "${MY_DN}"
-       newconfd "${FILESDIR}/${MY_DN}-daemon.conf" "${MY_DN}"
-
-       dodir /etc/logrotate.d
-       insinto /etc/logrotate.d
-       newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-       systemd_dounit "${FILESDIR}/${MY_DN}.service"
-
-       # Set proper permissions on required files/directories
-       keepdir /var/log/gvm
-       fowners gvm:gvm /var/log/gvm
-       keepdir /var/lib/openvas/{gnupg,plugins}
-       fowners -R gvm:gvm /var/lib/openvas
-}

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild 
b/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
deleted file mode 100644
index 6aae6a5c5fe1..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-7.0.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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/";
-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 extras snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-       acct-user/gvm
-       app-crypt/gpgme:=
-       dev-db/redis
-       dev-libs/glib
-       dev-libs/libgcrypt:=
-       dev-libs/libksba
-       >=net-analyzer/gvm-libs-11.0.1
-       snmp? ( net-analyzer/net-snmp:= )
-       net-libs/gnutls:=
-       net-libs/libpcap
-       net-libs/libssh:="
-
-RDEPEND="
-       ${DEPEND}"
-
-BDEPEND="
-       sys-devel/bison
-       sys-devel/flex
-       virtual/pkgconfig
-       extras? (
-               app-doc/doxygen[dot]
-               app-doc/xmltoman
-               app-text/htmldoc
-               dev-perl/CGI
-               dev-perl/SQL-Translator
-       )
-       test? ( dev-libs/cgreen )"
-
-PATCHES=(
-       "${FILESDIR}"/${P}-disable-automagic-dep.patch
-       "${FILESDIR}"/${P}-fix-linking-with-lld.patch
-)
-
-BUILD_DIR="${WORKDIR}/${MY_PN}-${PV}_build"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-       cmake_src_prepare
-       # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0
-       sed -i -e "s*/doc/openvas-scanner/*/doc/openvas-scanner-${PV}/*g" 
"${S}"/src/CMakeLists.txt || die
-       # QA-Fix | Remove !CLANG doxygen warnings for 7.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"
-               "-DSBINDIR=${EPREFIX}/usr/bin"
-               "-DBUILD_WITH_SNMP=$(usex snmp)"
-       )
-       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
-       cmake_build rebuild_cache
-       if use test; then
-               cmake_build tests
-       fi
-}
-
-src_install() {
-       if use extras; then
-               local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-       fi
-       cmake_src_install
-
-       if use cron; then
-               # Install the cron job if they want it.
-               exeinto /etc/gvm
-               doexe "${FILESDIR}/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
-       keepdir /var/lib/openvas/{gnupg,plugins}
-       fowners -R gvm:gvm /var/lib/openvas
-
-       insinto /etc/openvas
-       doins "${FILESDIR}/openvas.conf"
-}

Reply via email to