commit: 95bf1ca4c0af6fefbee45e1c51f9730f0ef3e34c
Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Wed Jul 5 10:56:39 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jul 25 06:45:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bf1ca4
net-analyzer/gsad: add {GSAD,GVMD}_RUN_DIR, fix RDEPEND, drop 22.4.1
Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32031
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/gsad/Manifest | 1 -
.../{gsad-22.4.1.ebuild => gsad-22.5.1-r1.ebuild} | 6 +-
net-analyzer/gsad/gsad-22.5.1.ebuild | 103 ---------------------
3 files changed, 4 insertions(+), 106 deletions(-)
diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 24dcef037487..d9dbb81e7833 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1,3 +1,2 @@
DIST gsad-21.4.4.tar.gz 220618 BLAKE2B
276164ce1e03a6ed211d3bdf24c7f9b5ac832c07891b34b467f61ec02c5670d5368ea3219b3cc445e4ef83fef0aee7375c89ce8008746ea7e08abf50da8fb9fd
SHA512
092c8187754b3f0503e4ae6fd9c41dbd6917264668a5f8f831d40e88c7b8db6772acd354db62ac66b4af13b7c27e78516d4975f5bfede0d28001007a46c39f75
-DIST gsad-22.4.1.tar.gz 224061 BLAKE2B
2357d8eac221c934509ed2c4e47d3e16ac392d11212320152bc1d247be2b8eb1275fbaffbb6c71568dac45b41e6380242c8b3afce46e8ee97aad7be8d24544ba
SHA512
7f957fcdc842b81aaf69858f98f1edd8a808eb70d2e0bd86413d6a9dfe053e10b6ed2f4e2cadcc023fd580d96d624c007e8701133fb3fea2e072ce26f9a64ed4
DIST gsad-22.5.1.tar.gz 223290 BLAKE2B
24530f085c644895d5153929038d040fbcb0626b4b2df0ce3966d96fc8c756fbb2b78540b2a57affab2f2eb97cf868f09b7ac863f9a314cb1f74a829fbea48cc
SHA512
52ec1377d57d90f64e949472f5f6d1f94e9cdce86d7a807451ed9f01ff36e392606d725461e416246b9e706f00aa536cbc5672fb977695b20d0c5957b67447aa
diff --git a/net-analyzer/gsad/gsad-22.4.1.ebuild
b/net-analyzer/gsad/gsad-22.5.1-r1.ebuild
similarity index 94%
rename from net-analyzer/gsad/gsad-22.4.1.ebuild
rename to net-analyzer/gsad/gsad-22.5.1-r1.ebuild
index 6cf730484c9d..49e02618b234 100644
--- a/net-analyzer/gsad/gsad-22.4.1.ebuild
+++ b/net-analyzer/gsad/gsad-22.5.1-r1.ebuild
@@ -26,8 +26,8 @@ DEPEND="
"
RDEPEND="
${DEPEND}
- >=net-analyzer/gvmd-${PV}
- >=net-analyzer/gsa-${PV}
+ >=net-analyzer/gvmd-22.4
+ >=net-analyzer/gsa-22.4
net-analyzer/ospd-openvas
"
BDEPEND="
@@ -70,6 +70,8 @@ src_configure() {
"-DLOCALSTATEDIR=${EPREFIX}/var"
"-DSYSCONFDIR=${EPREFIX}/etc"
"-DSBINDIR=${EPREFIX}/usr/bin"
+ "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad"
+ "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd"
"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
"-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
)
diff --git a/net-analyzer/gsad/gsad-22.5.1.ebuild
b/net-analyzer/gsad/gsad-22.5.1.ebuild
deleted file mode 100644
index 0bb4755d34c5..000000000000
--- a/net-analyzer/gsad/gsad-22.5.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake systemd toolchain-funcs
-#
-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"
-IUSE="doc"
-
-DEPEND="
- acct-user/gvm
- dev-libs/glib:2
- dev-libs/libgcrypt:0=
- dev-libs/libxml2
- dev-libs/libxslt
- >=net-analyzer/gvm-libs-${PV}
- net-libs/gnutls:=
- net-libs/libmicrohttpd:=
-"
-RDEPEND="
- ${DEPEND}
- >=net-analyzer/gvmd-${PV}
- >=net-analyzer/gsa-22.5.0
- net-analyzer/ospd-openvas
-"
-BDEPEND="
- dev-python/polib
- virtual/pkgconfig
- doc? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- sys-devel/gettext
- )
-"
-
-src_prepare() {
- cmake_src_prepare
-
- # QA-Fix | Remove !CLANG doxygen warnings for 9.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
-
- # Do not install the empty /run/gsad run dir.
https://github.com/greenbone/gsad/pull/54
- sed -i "/^install.*GSAD_RUN_DIR/d" CMakeLists.txt || die
-
- # Drop Group= directive. https://github.com/greenbone/gsad/pull/55
- sed -i "/^Group=/d" config/gsad.service.in || die
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DLOCALSTATEDIR=${EPREFIX}/var"
- "-DSYSCONFDIR=${EPREFIX}/etc"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
- "-DLOGROTATE_DIR=${EPREFIX}/etc/logrotate.d"
- )
- cmake_src_configure
-}
-
-src_compile() {
- # setting correct PATH for finding react-js
- NODE_ENV=production PATH="$PATH:${S}/gsa/node_modules/.bin/"
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
-}
-
-src_install() {
- if use doc; then
- local HTML_DOCS=( "${BUILD_DIR}/doc/generated/html/." )
- fi
- cmake_src_install
-
- systemd_install_serviced "${FILESDIR}/gsad.service.conf" \
- ${PN}.service
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${PN}-daemon.conf"
-
- newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
- newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-}
