commit: b277a73b38a3dba025aad9ed78c1a3122fbd0adc Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com> AuthorDate: Sat Dec 7 19:44:03 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sat Dec 7 21:28:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b277a73b
net-analyzer/gsad: add 24.1.0, drop 22.9.1 Bug: https://bugs.gentoo.org/942193 Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/39625 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-analyzer/gsad/Manifest | 2 +- .../gsad/{gsad-22.9.1.ebuild => gsad-24.1.0.ebuild} | 18 +++++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest index f06d6dea6104..f110164b109f 100644 --- a/net-analyzer/gsad/Manifest +++ b/net-analyzer/gsad/Manifest @@ -1,2 +1,2 @@ DIST gsad-22.12.0.tar.gz 225704 BLAKE2B 77ae7ea7a281143ad756adafebead664286f87680d11109562551d305d65b9ec665a6335bc1a058ea457f81f5fa8aba2d0c663a2001a2097bc72d212001b07e7 SHA512 5cf49dbbda1742bb7d215d879a30cf04c083b8a6bde8d6225fe3149426ec3cd2d4abba8ebbdc29817fa2db7c38b8a9a5eafa32d20b0d79e685ae87daa2247405 -DIST gsad-22.9.1.tar.gz 222663 BLAKE2B e65c8ecfa613a1653d36234d00e95da690e32c1c7ffc8904f509d568533079138115fcd389aaafa6d6cb96d5df42c9071e04edbbc95ea77731627ab7036adbde SHA512 25592b7e07357ff41f142cf926132491af20757a404773f3d532bafbf6e75d98b259103860920f657512d16a120351478767d347b01bef122ea1177c685d0d5b +DIST gsad-24.1.0.tar.gz 226188 BLAKE2B 81864554d06439742d89cb76993665b953a4c61ec9a98392d85b45f8e9747d97b31d3816ebf354b4e9c17d948f8596cc2dbb59b714d698f7769fc2396087f3de SHA512 2cdfef9b9350562d77c91f08ef1f50a7571c51d7e0cc3aab441b90e3ad63355055ace99c64d71c33183b1c45b316cf871c9e33a18039665bc1ad1476c0c40cf2 diff --git a/net-analyzer/gsad/gsad-22.9.1.ebuild b/net-analyzer/gsad/gsad-24.1.0.ebuild similarity index 78% rename from net-analyzer/gsad/gsad-22.9.1.ebuild rename to net-analyzer/gsad/gsad-24.1.0.ebuild index 1dcd0909a14a..76bce6bc0a54 100644 --- a/net-analyzer/gsad/gsad-22.9.1.ebuild +++ b/net-analyzer/gsad/gsad-24.1.0.ebuild @@ -9,9 +9,9 @@ DESCRIPTION="Greenbone Security Assistant" HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gsad"; SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -SLOT="0" LICENSE="AGPL-3+" -KEYWORDS="amd64 ~x86" +SLOT="0" +KEYWORDS="~amd64" IUSE="brotli doc" DEPEND=" @@ -19,7 +19,7 @@ DEPEND=" >=net-libs/libmicrohttpd-0.9.0:= dev-libs/libxml2:2 >=dev-libs/glib-2.42:2 - >=net-analyzer/gvm-libs-22.6 + >=net-analyzer/gvm-libs-22.8 >=net-libs/gnutls-3.2.15:= >=sys-libs/zlib-1.2 dev-libs/libgcrypt:0= @@ -60,6 +60,16 @@ src_prepare() { done fi fi + + # Avoid the use of brotli when not required by the use flag #942193 + # Remove brotli automagic dependencies check + if ! use brotli; then + sed -i \ + -e 's*^if (BROTLI_FOUND)*#if (BROTLI_FOUND)*' \ + -e 's*set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_BROTLI=1")*#set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DHAVE_BROTLI=1")*' \ + -e 's*^endif (BROTLI_FOUND)*#endif (BROTLI_FOUND)*' \ + src/CMakeLists.txt || die "couldn't disable brotli automagic dependency's check" + fi } src_configure() { @@ -69,9 +79,11 @@ src_configure() { "-DSBINDIR=${EPREFIX}/usr/bin" "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad" "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd" + "-DGVM_LOG_DIR=${EPREFIX}/var/log/gvm" "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)" "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d" ) + cmake_src_configure }
