public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Florian Schmaus" <flow@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-scanner/files/, net-analyzer/openvas-scanner/
Date: Tue, 14 Nov 2023 07:53:19 +0000 (UTC)	[thread overview]
Message-ID: <1699948348.da4a7f1c80ae570c902b2ad45917f29abc37352b.flow@gentoo> (raw)

commit:     da4a7f1c80ae570c902b2ad45917f29abc37352b
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Mon Nov 13 20:10:11 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 07:52:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da4a7f1c

net-analyzer/openvas-scanner: drop 21.4.4-r2

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

 net-analyzer/openvas-scanner/Manifest              |   1 -
 .../openvas-scanner-20.8.1-rpath-qa-fix.patch      |  14 ---
 ...envas-scanner-7.0.1-disable-automagic-dep.patch |  33 ------
 ...penvas-scanner-7.0.1-fix-linking-with-lld.patch |  33 ------
 net-analyzer/openvas-scanner/files/openvas.conf    |   1 -
 .../openvas-scanner/files/openvassd.logrotate      |  13 ---
 .../openvas-scanner-21.4.4-r2.ebuild               | 125 ---------------------
 7 files changed, 220 deletions(-)

diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest
index a67ed4e9be68..85069d96a398 100644
--- a/net-analyzer/openvas-scanner/Manifest
+++ b/net-analyzer/openvas-scanner/Manifest
@@ -1,2 +1 @@
-DIST openvas-scanner-21.4.4.tar.gz 460601 BLAKE2B 66d627e76912735539399aed637fdc07a7d13c9e4eb142498dcf181b8ea952dd93107bcc1f2ef577126178ff3dad1e5f6e50d67840692cd49f7352e3a726ce8f SHA512 f2fe1f802b14fc41ee0d7657d031d318b651c3ec9ef554b33379a7459d40c17b44525c8f666ccb9670868576c101766936dd0c700778e46683bf43f0683834b6
 DIST openvas-scanner-22.7.6.tar.gz 1027968 BLAKE2B 393b14dbb2c4fefb08a4b24597b5b1be8ade48d047dbf8b7aa8240cb14a7cf59829d9f68911ff726c5312d250ac1b14bb56478662d8c68a3006ec40212dd340b SHA512 83de4f546557d8e72fe63374940ef10bf365e2414fadeb32f23b5a621bf09a27bb2e75473e06413d3951d308ce7ac9b431cd270a17cfec9d64984228d65f0f09

diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-20.8.1-rpath-qa-fix.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-20.8.1-rpath-qa-fix.patch
deleted file mode 100644
index 79e8692f4d6d..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-20.8.1-rpath-qa-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 69c68375..5bc000c0 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,8 @@ endif (NOT CMAKE_BUILD_TYPE)
- 
- OPTION (ENABLE_COVERAGE "Enable support for coverage analysis" OFF)
- 
-+set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-+
- ## Retrieve git revision (at configure time)
- include (GetGit)
- 
-

diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-disable-automagic-dep.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-disable-automagic-dep.patch
deleted file mode 100644
index fd3e4610f8a4..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-disable-automagic-dep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
-index b594679c..81c5e4a9 100644
---- a/nasl/CMakeLists.txt
-+++ b/nasl/CMakeLists.txt
-@@ -100,14 +100,20 @@ execute_process (COMMAND gpgme-config --cflags
-   OUTPUT_VARIABLE GPGME_CFLAGS
-   OUTPUT_STRIP_TRAILING_WHITESPACE)
- 
--message (STATUS "Looking for netsnmp...")
--find_library (SNMP netsnmp)
--message (STATUS "Looking for netsnmp... ${SNMP}")
--if (SNMP)
--  execute_process (COMMAND net-snmp-config --libs
--    OUTPUT_VARIABLE SNMP_LDFLAGS
--    OUTPUT_STRIP_TRAILING_WHITESPACE)
--endif (SNMP)
-+option(BUILD_WITH_SNMP "Build with SNMP Support" ON)
-+if (BUILD_WITH_SNMP)
-+  message (STATUS "Looking for netsnmp...")
-+  find_library (SNMP netsnmp)
-+  message (STATUS "Looking for netsnmp... ${SNMP}")
-+  if (SNMP)
-+    execute_process (COMMAND net-snmp-config --libs
-+      OUTPUT_VARIABLE SNMP_LDFLAGS
-+      OUTPUT_STRIP_TRAILING_WHITESPACE)
-+  endif (SNMP)
-+  if (NOT SNMP)
-+    message (SEND_ERROR " netsnmp not found")
-+  endif(NOT SNMP)
-+endif (BUILD_WITH_SNMP)
- 
- message (STATUS "Looking for libgcrypt...")
- find_library (GCRYPT gcrypt)

diff --git a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch b/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch
deleted file mode 100644
index 2b31a7c7d22a..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas-scanner-7.0.1-fix-linking-with-lld.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/nasl/CMakeLists.txt b/nasl/CMakeLists.txt
-index b594679c..adf9a221 100644
---- a/nasl/CMakeLists.txt
-+++ b/nasl/CMakeLists.txt
-@@ -87,6 +87,28 @@ endif (NOT KSBA)
- message (STATUS "Looking for pcap...")
- find_library (PCAP pcap)
- 
-+message (STATUS "Looking for pcap... ${PCAP}")
-+if (NOT PCAP)
-+  message (SEND_ERROR "The pcap library is required.")
-+endif (NOT PCAP)
-+
-+message (STATUS "Looking for pcap-config...")
-+find_program (PCAP_CONFIG pcap-config)
-+
-+if (PCAP_CONFIG)
-+  message (STATUS "Looking for pcap-config... ${PCAP_CONFIG}")
-+  execute_process (COMMAND pcap-config --libs
-+    OUTPUT_VARIABLE PCAP_LDFLAGS
-+    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+  execute_process (COMMAND pcap-config --cflags
-+    OUTPUT_VARIABLE PCAP_CFLAGS
-+    OUTPUT_STRIP_TRAILING_WHITESPACE)
-+else (PCAP_CONFIG)
-+  message (STATUS "pcap-config not found, using defaults...")
-+  set (PCAP_LDFLAGS "-L/usr/lib -lpcap")
-+  set (PCAP_CFLAGS "-I/usr/include")
-+endif (PCAP_CONFIG)
-+
- find_library (GPGME gpgme)
- message (STATUS "Looking for gpgme... ${GPGME}")
- if (NOT GPGME)

diff --git a/net-analyzer/openvas-scanner/files/openvas.conf b/net-analyzer/openvas-scanner/files/openvas.conf
deleted file mode 100644
index 487e643834b8..000000000000
--- a/net-analyzer/openvas-scanner/files/openvas.conf
+++ /dev/null
@@ -1 +0,0 @@
-db_address = /tmp/redis.sock

diff --git a/net-analyzer/openvas-scanner/files/openvassd.logrotate b/net-analyzer/openvas-scanner/files/openvassd.logrotate
deleted file mode 100644
index 9cf47d54763d..000000000000
--- a/net-analyzer/openvas-scanner/files/openvassd.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-# 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/openvassd.log {
-	compress
-	missingok
-	notifempty
-	sharedscripts
-	copytruncate
-	maxsize 10M
-}

diff --git a/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild
deleted file mode 100644
index 59b7fae51932..000000000000
--- a/net-analyzer/openvas-scanner/openvas-scanner-21.4.4-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-MY_PN="openvas"
-MY_DN="openvassd"
-
-DESCRIPTION="Open Vulnerability Assessment 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="doc snmp test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	acct-user/gvm
-	app-crypt/gpgme:=
-	dev-db/redis
-	dev-libs/glib:2
-	dev-libs/libgcrypt:=
-	dev-libs/libgpg-error
-	dev-libs/libksba
-	>=net-analyzer/gvm-libs-${PV}
-	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
-	doc? (
-		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}"/${PN}-20.8.1-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 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
-
-	#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 doc; 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 doc; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
-	fi
-	cmake_src_install
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${MY_DN}.logrotate" "${MY_DN}"
-
-	# Set proper permissions on required files/directories
-	keepdir /var/log/gvm
-	if ! use prefix; then
-		fowners gvm:gvm /var/log/gvm
-	fi
-
-	keepdir /var/lib/openvas/{gnupg,plugins}
-	if ! use prefix; then
-		fowners -R gvm:gvm /var/lib/openvas
-	fi
-
-	insinto /etc/openvas
-	doins "${FILESDIR}/openvas.conf"
-}


             reply	other threads:[~2023-11-14  7:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-14  7:53 Florian Schmaus [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-04-03 17:38 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/openvas-scanner/files/, net-analyzer/openvas-scanner/ Florian Schmaus
2023-10-09 10:54 Florian Schmaus
2023-07-31 12:57 Florian Schmaus
2022-12-24 14:49 Andreas Sturmlechner
2020-03-25 13:46 Joonas Niilola
2019-08-12  4:54 Joonas Niilola
2019-03-13 14:59 Patrice Clement

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1699948348.da4a7f1c80ae570c902b2ad45917f29abc37352b.flow@gentoo \
    --to=flow@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox