commit: c1885e3e65c84fc7d108ac9c5941b6771345e53a Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com> AuthorDate: Sat Jul 27 17:55:09 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Aug 2 15:53:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1885e3e
net-analyzer/gvm-libs: add 22.10.0, drop 22.9.0, drop 22.8.0, drop 22.8.0-r1 Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/37750 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-analyzer/gvm-libs/Manifest | 3 +- .../gvm-libs-22.8.0-linking-math-library.patch | 23 ---- ...-libs-22.9.0.ebuild => gvm-libs-22.10.0.ebuild} | 14 ++- net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild | 118 --------------------- net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild | 112 ------------------- 5 files changed, 10 insertions(+), 260 deletions(-) diff --git a/net-analyzer/gvm-libs/Manifest b/net-analyzer/gvm-libs/Manifest index 6af3eeab1e2f..d57bc633b049 100644 --- a/net-analyzer/gvm-libs/Manifest +++ b/net-analyzer/gvm-libs/Manifest @@ -1,3 +1,2 @@ -DIST gvm-libs-22.8.0.tar.gz 310304 BLAKE2B ed880ca924d5f9c6d376c1b6b0711adecb095b0b79c565da6d62bf53d71ef0f49892263dc7e28e08841d33db0c480d691f4d4d95b3883d4f0751088fcf0b1d90 SHA512 5daa9157399fc8cf52cdfbdfeffe5e10a282cbe2f7b8eb6a3fefb202984f9df3bca91ef80d1d9d1bf37307cc475bd41d4b64b4f1ad0644975b295b6f32b294a6 -DIST gvm-libs-22.9.0.tar.gz 314119 BLAKE2B 481ca7a977647a53ef21079b054ed1294c0ce081693abe373dc9bb241725a141c11ab54a4eb2716b7543c678400ca933f9611d9a6615c4d39a9877a8cb40406a SHA512 39049d0eea3cca632ed25f3a807d03568213cf0daac4e7ab8d088458212e76db881644421dd44a2b34f6490eab35c171339e52e6b4ba4204ff2d9b7422578876 +DIST gvm-libs-22.10.0.tar.gz 323677 BLAKE2B f6ace01ce3e1e240496e4edd0d07ee4f155ffa7a3eabdef6e5342cac7e7f94fd2048649a6f00b1bbb3bbe6801f09db28733a33b852ac59f873050c8859d934bc SHA512 dd4a5758ddd70b0a565879f61c913e2cc6c21e8982626058f80da07d1f3d04ad5680b6c850acac46b9b9deb46390985230c5b7b2140c81bdeeb9e8b5e4813c18 DIST gvm-libs-22.9.1.tar.gz 314228 BLAKE2B 117ddf5824f0a1f5788695074fa5044b21b5dcfb8d6235a9f423174fa76d9262f361371d1f6807e88979ce49cafab64f5aa9fd1d2e855395bfa103bf6b121ec8 SHA512 b06c21ced89dc9f14dd19b256b57af910f4d7e585bf9c90fb7e3c3497bb429294e3ffb64dc6ee710e8b3beeb4ca9ac6aecb9d5e4b25f0f9761fa0c9f18a8dfd1 diff --git a/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch b/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch deleted file mode 100644 index 11130f5c209d..000000000000 --- a/net-analyzer/gvm-libs/files/gvm-libs-22.8.0-linking-math-library.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fixes underlinking math lib in base/CMakeLists.txt -Bug: https://bugs.gentoo.org/9889 -Upstream PR: https://github.com/greenbone/gvm-libs/pull/811 - ---- a/base/CMakeLists.txt -+++ b/base/CMakeLists.txt -@@ -37,6 +37,7 @@ set (HEADERS array.h credentials.h cvss.h drop_privileges.h hosts.h logging.h - if (BUILD_STATIC) - set (LIBGVM_BASE_NAME gvm_base_static) - add_library (gvm_base_static STATIC ${FILES}) -+ target_link_libraries(gvm_base_static m) - set_target_properties (gvm_base_static PROPERTIES OUTPUT_NAME "gvm_base") - set_target_properties (gvm_base_static PROPERTIES CLEAN_DIRECT_OUTPUT 1) - set_target_properties (gvm_base_static PROPERTIES PUBLIC_HEADER "${HEADERS}") -@@ -51,7 +52,7 @@ if (BUILD_SHARED) - set_target_properties (gvm_base_shared PROPERTIES VERSION "${CPACK_PACKAGE_VERSION}") - set_target_properties (gvm_base_shared PROPERTIES PUBLIC_HEADER "${HEADERS}") - -- target_link_libraries (gvm_base_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${SENTRY_LDFLAGS}) -+ target_link_libraries (gvm_base_shared LINK_PRIVATE ${GLIB_LDFLAGS} ${LINKER_HARDENING_FLAGS} ${SENTRY_LDFLAGS} m) - endif (BUILD_SHARED) - - set (LIBGVM_BASE_NAME diff --git a/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.10.0.ebuild similarity index 86% rename from net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild rename to net-analyzer/gvm-libs/gvm-libs-22.10.0.ebuild index 337879f76695..a7da7de1491c 100644 --- a/net-analyzer/gvm-libs/gvm-libs-22.9.0.ebuild +++ b/net-analyzer/gvm-libs/gvm-libs-22.10.0.ebuild @@ -50,11 +50,15 @@ BDEPEND=" test? ( dev-libs/cgreen ) " -PATCHES=( - # Fix bug 925932 - # See https://github.com/greenbone/gvm-libs/pull/811 - "${FILESDIR}"/gvm-libs-22.8.0-linking-math-library.patch -) +pkg_setup() { + if tc-is-clang; then + local clang_major_version=$(clang-major-version); + if ! has_version "sys-libs/compiler-rt-sanitizers:${clang_major_version}[profile]"; then + eerror "Compiling this package with clang requires sys-libs/compiler-rt-sanitizers to be built with 'profile' USE flag enabled" + die "Clang detected, but sys-libs/compiler-rt-sanitizers not build with 'profile' USE flag enabled" + fi + fi +} src_prepare() { cmake_src_prepare diff --git a/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild deleted file mode 100644 index 337879f76695..000000000000 --- a/net-analyzer/gvm-libs/gvm-libs-22.8.0-r1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2024 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-1.7.0:= - >=dev-libs/glib-2.42:2 - >=dev-libs/hiredis-0.10.1:= - dev-libs/libgcrypt:= - dev-libs/libgpg-error - >=dev-libs/libxml2-2.0:2 - >=net-libs/gnutls-3.2.15:= - net-libs/libnet:1.1 - net-libs/libpcap - >=net-libs/libssh-0.6.0:= - >=sys-apps/util-linux-2.25.0 - sys-libs/libxcrypt:= - >=sys-libs/zlib-1.2.8 - net-libs/paho-mqtt-c:1.3 - ldap? ( net-nds/openldap:= ) - radius? ( net-dialup/freeradius-client ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-vcs/git - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig - doc? ( - app-text/doxygen[dot] - app-text/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - ) - test? ( dev-libs/cgreen ) -" - -PATCHES=( - # Fix bug 925932 - # See https://github.com/greenbone/gvm-libs/pull/811 - "${FILESDIR}"/gvm-libs-22.8.0-linking-math-library.patch -) - -src_prepare() { - cmake_src_prepare - # QA-Fix | Remove -Werror compiler flag | Bug: #909558 - sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die - # 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 -} diff --git a/net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild b/net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild deleted file mode 100644 index 5c0ad0faa80c..000000000000 --- a/net-analyzer/gvm-libs/gvm-libs-22.8.0.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2024 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-1.7.0:= - >=dev-libs/glib-2.42:2 - >=dev-libs/hiredis-0.10.1:= - dev-libs/libgcrypt:= - dev-libs/libgpg-error - >=dev-libs/libxml2-2.0:2 - >=net-libs/gnutls-3.2.15:= - net-libs/libnet:1.1 - net-libs/libpcap - >=net-libs/libssh-0.6.0:= - >=sys-apps/util-linux-2.25.0 - sys-libs/libxcrypt:= - >=sys-libs/zlib-1.2.8 - net-libs/paho-mqtt-c:1.3 - ldap? ( net-nds/openldap:= ) - radius? ( net-dialup/freeradius-client ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - dev-vcs/git - app-alternatives/yacc - app-alternatives/lex - virtual/pkgconfig - doc? ( - app-text/doxygen[dot] - app-text/xmltoman - app-text/htmldoc - dev-perl/CGI - dev-perl/SQL-Translator - ) - test? ( dev-libs/cgreen ) -" - -src_prepare() { - cmake_src_prepare - # QA-Fix | Remove -Werror compiler flag | Bug: #909558 - sed -i -e "s/-Werror//" "${S}"/CMakeLists.txt || die - # 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 -}
