commit: 4dab9f93180fa7c7546e70313dac046e0eb4cd5b Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com> AuthorDate: Mon Nov 13 20:02:15 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Tue Nov 14 07:52:30 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dab9f93
net-analyzer/gvm-libs: drop 21.4.4-r3 Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33806 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-analyzer/gvm-libs/Manifest | 1 - .../gvm-libs-20.8.1-disable-automagic-dep.patch | 22 ---- .../gvm-libs-21.4.4-pcap-config-whitespace.patch | 34 ------ net-analyzer/gvm-libs/gvm-libs-21.4.4-r3.ebuild | 116 --------------------- 4 files changed, 173 deletions(-) diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index a6d6379e98c2..c49ef50ac2bd 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -1,2 +1 @@ -DIST gvm-libs-21.4.4.tar.gz 298551 BLAKE2B 271716d8be2376e2b54218b95069e19d10939c5feda9894220418bf184c4098eeacf61d1faedd49fe3215aa0fbf4a4afcfe2a929ac88450502737eb8af8f8e35 SHA512 6c80820c830cbc2e62865a0823740d857db075f2faa1a1e58af7a8f07e0179e7a78934d7613ec57f144900a5530206d4c07c912a6bbe40ad9d0549f9443bfb12 DIST gvm-libs-22.7.2.tar.gz 309449 BLAKE2B 57ed0af4ac550da9f8e0018b1da816af81bc501c9773d6f584323a872e0cb21a121567bec2480496cbf634725bc563a4eb51f272494609f6bbb130026f120f91 SHA512 dd7c703ab17f33488e3eec3ff31286b6dc6eea8594aa52e634da95e8bc387200508b3ff70ffbfedb56387435753397a7ba0dd91c221e6e9f671d884e6766a354 diff --git a/net-analyzer/gvm-libs/files/gvm-libs-20.8.1-disable-automagic-dep.patch b/net-analyzer/gvm-libs/files/gvm-libs-20.8.1-disable-automagic-dep.patch deleted file mode 100644 index 3cd4a42272a5..000000000000 --- a/net-analyzer/gvm-libs/files/gvm-libs-20.8.1-disable-automagic-dep.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt -index 3f10a4b8..223752e0 100644 ---- a/util/CMakeLists.txt -+++ b/util/CMakeLists.txt -@@ -102,7 +102,7 @@ if (BUILD_WITH_RADIUS) - find_library (LIBRADCLI radcli) - endif (NOT LIBFREERADIUS) - if (NOT LIBFREERADIUS AND NOT LIBRADCLI) -- message (STATUS " No suitable radius library found - radius support disabled") -+ message (SEND_ERROR " No suitable radius library found") - elseif (LIBFREERADIUS) - message (STATUS " Found ${LIBFREERADIUS} - radius support enabled") - set (RADIUS_LDFLAGS "-lfreeradius-client") -@@ -122,7 +122,7 @@ if (BUILD_WITH_LDAP) - find_library (LIBLDAP ldap) - endif (NOT LIBLDAP) - if (NOT LIBLDAP) -- message (STATUS " No ldap library found - ldap support disabled") -+ message (SEND_ERROR " No ldap library found") - else (NOT LIBLDAP) - message (STATUS " Found ${LIBLDAP} - ldap support enabled") - add_definitions (-DENABLE_LDAP_AUTH=1) diff --git a/net-analyzer/gvm-libs/files/gvm-libs-21.4.4-pcap-config-whitespace.patch b/net-analyzer/gvm-libs/files/gvm-libs-21.4.4-pcap-config-whitespace.patch deleted file mode 100644 index 5569c713727b..000000000000 --- a/net-analyzer/gvm-libs/files/gvm-libs-21.4.4-pcap-config-whitespace.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://bugs.gentoo.org/829183 -https://github.com/greenbone/gvm-libs/commit/de63a18fd2263b89bed70c00f7232939b0744002 - -From de63a18fd2263b89bed70c00f7232939b0744002 Mon Sep 17 00:00:00 2001 -From: hubblexplorer <[email protected]> -Date: Mon, 20 Feb 2023 06:11:00 +0000 -Subject: [PATCH] Fix: Resolve error on compile (#741) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* Resolve error on compile - -Fix for error " `pcap-config --libs` contains leading whitespace. " - -* Approved changes - -Co-authored-by: Juan José Nicola <[email protected]> - ---------- - -Co-authored-by: Juan José Nicola <[email protected]> -Co-authored-by: Juan José Nicola <[email protected]> ---- a/boreas/CMakeLists.txt -+++ b/boreas/CMakeLists.txt -@@ -62,6 +62,7 @@ if (PCAP_CONFIG) - execute_process (COMMAND pcap-config --libs - OUTPUT_VARIABLE PCAP_LDFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) -+ string(STRIP "${PCAP_LDFLAGS}" PCAP_LDFLAGS) - execute_process (COMMAND pcap-config --cflags - OUTPUT_VARIABLE PCAP_CFLAGS - OUTPUT_STRIP_TRAILING_WHITESPACE) - diff --git a/net-analyzer/gvm-libs/gvm-libs-21.4.4-r3.ebuild b/net-analyzer/gvm-libs/gvm-libs-21.4.4-r3.ebuild deleted file mode 100644 index 9c945a9f6ea6..000000000000 --- a/net-analyzer/gvm-libs/gvm-libs-21.4.4-r3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="Greenbone Vulnerability Management (GVM) libraries" -HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvm-libs/" -SRC_URI="https://github.com/greenbone/gvm-libs/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="doc ldap test radius" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-user/gvm - app-crypt/gpgme:= - dev-libs/glib:2 - dev-libs/hiredis:= - dev-libs/libgcrypt:= - dev-libs/libgpg-error - dev-libs/libxml2:= - dev-perl/UUID - net-libs/gnutls:= - net-libs/libnet:1.1 - net-libs/libpcap - net-libs/libssh:= - sys-apps/util-linux - sys-libs/libxcrypt:= - sys-libs/zlib - ldap? ( net-nds/openldap:= ) - radius? ( net-dialup/freeradius-client ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-vcs/git - 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}-20.8.1-disable-automagic-dep.patch - "${FILESDIR}"/${PN}-21.4.4-pcap-config-whitespace.patch -) - -src_prepare() { - cmake_src_prepare - # QA-Fix | Remove doxygen warnings for !CLANG - 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 (networking-test networking-test)/ /g' base/CMakeLists.txt || die - sed -i 's/add_test (util-test util-test)/ /g' boreas/CMakeLists.txt || die - fi -} - -src_configure() { - local mycmakeargs=( - "-DLOCALSTATEDIR=${EPREFIX}/var" - "-DSYSCONFDIR=${EPREFIX}/etc" - "-DGVM_RUN_DIR=${EPREFIX}/var/lib/gvm" - "-DBUILD_TESTS=$(usex test)" - "-DBUILD_WITH_RADIUS=$(usex radius)" - "-DBUILD_WITH_LDAP=$(usex ldap)" - ) - 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 - - # Set proper permissions on required files/directories - keepdir /var/lib/gvm - if ! use prefix; then - fowners -R gvm:gvm /var/lib/gvm - fi -}
