From 75949673f38270397841d9c2322dbb774ac41554 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Aug 2023 15:35:17 +0100 Subject: gentoo auto-resync : 11:08:2023 - 15:35:17 --- net-analyzer/gsad/Manifest | 6 +- net-analyzer/gsad/files/gsad-22.init | 8 +-- net-analyzer/gsad/files/gsad-daemon.conf | 2 +- net-analyzer/gsad/gsad-22.5.1-r1.ebuild | 105 ------------------------------- net-analyzer/gsad/gsad-22.5.1-r2.ebuild | 105 +++++++++++++++++++++++++++++++ 5 files changed, 112 insertions(+), 114 deletions(-) delete mode 100644 net-analyzer/gsad/gsad-22.5.1-r1.ebuild create mode 100644 net-analyzer/gsad/gsad-22.5.1-r2.ebuild (limited to 'net-analyzer/gsad') diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest index 15b002192310..804dc82a950f 100644 --- a/net-analyzer/gsad/Manifest +++ b/net-analyzer/gsad/Manifest @@ -1,9 +1,9 @@ -AUX gsad-22.init 654 BLAKE2B 337f2d7a4899954abb923a7c41f58315ddb51e76cbfec7c55493039497e26ebe36e60fbcebad35e04f00a66fdeaa952e386fcb4847f61ce3fd49a0e32c03ecdd SHA512 b878fcc6d1eb17a41d2dcd6db53c165a5d848d2e22b79c2f5864adb90e4843287c00b6dd5db7a7344b69c154be92ba8b3354b5bde03e943e3b8ad7b08e048a8f -AUX gsad-daemon.conf 416 BLAKE2B 7c6dff183ceb8afdbe7abb75333fb8aa570be406ecb18641e96d8045d793b6ef81b46acbfd243c4bb9a4bcb98cb6c039ebd0793c13855b7f5404e552a6088ef5 SHA512 7e696a3bb61310d7e8c553ed3744adb5fd60a75c83c0b9f99c76c092f78b4cf25d8b9c72b10d4a79ed501da16a27b8beddcda36f48acb550dfa01dbc19379f68 +AUX gsad-22.init 611 BLAKE2B 0fed09e66154cd3311678e3c9cc0b62481607c7689f77ffa9c302df6c642be30a7a1839422deb32b8fe3a5499b5b4e9457e356b8d65211348a25c2aa712fbc25 SHA512 fb43ef452634989971204493679b4c35177698b6192274ca036524e05cdf4417f660467db23a7e7bbc34d53d112049fe91072084f2393913b6821189a5715e9d +AUX gsad-daemon.conf 428 BLAKE2B 5fdd58c878769245535cb46e2715fb14253bfe303d302a6e5a0efb655a30e92250582e2cfe4043afac79a718d178f350c91507c069bdf40e80fd7c688d47e270 SHA512 8ee1aca3d3e7f154eb5db21e256f7be68eca66bee0931a84a8187c49bc557b93255a842050bebe29b197746291fb40553b6bcde10adc871fb9aac2b27fb02f3d AUX gsad.init 601 BLAKE2B 79b76f512904c55f235cc6ac1b3513f920dee9cbaaa06c115c93f7abb215302f544a8e021fe0e7a66f0d646807da75a3fc4ed68cf01e00eaaa003b1ff39c1c9e SHA512 610db173cf45de0ff907dacfabba0b6e03c6a83fda97f3b76d253a80e2353961f9ac61bfd9131561e34339075556d4930273dadef94d8f9e2f8f30f50266e44d AUX gsad.service.conf 25 BLAKE2B fb1972cc41f5f8970717136ef71c81b74cb1abb6c0419d3c8f7f51a9f54f933eb1c1551cfb56149bc7b5e2c68dd11d731b556a7ba2da678b02f24cf143810b4f SHA512 ece2d5838f743a820dd732a5e5b17d91e85ce07655173a0143740ef6bcd20156d6aebfcf8c43d53caa7713402607d88acc0328499326f6921e3b057bd0ef9d66 DIST gsad-21.4.4.tar.gz 220618 BLAKE2B 276164ce1e03a6ed211d3bdf24c7f9b5ac832c07891b34b467f61ec02c5670d5368ea3219b3cc445e4ef83fef0aee7375c89ce8008746ea7e08abf50da8fb9fd SHA512 092c8187754b3f0503e4ae6fd9c41dbd6917264668a5f8f831d40e88c7b8db6772acd354db62ac66b4af13b7c27e78516d4975f5bfede0d28001007a46c39f75 DIST gsad-22.5.1.tar.gz 223290 BLAKE2B 24530f085c644895d5153929038d040fbcb0626b4b2df0ce3966d96fc8c756fbb2b78540b2a57affab2f2eb97cf868f09b7ac863f9a314cb1f74a829fbea48cc SHA512 52ec1377d57d90f64e949472f5f6d1f94e9cdce86d7a807451ed9f01ff36e392606d725461e416246b9e706f00aa536cbc5672fb977695b20d0c5957b67447aa EBUILD gsad-21.4.4.ebuild 2329 BLAKE2B 35f607bb6ca44b9a42ad60bcda84c825251453a77ef146147b0f551f6b04968cc4a38c9a3f566bd0539436761ce6ed072b5b925e98f9db74faa0698c80ff1094 SHA512 4084d98b9893a037512fc0233a908ee1ec7afbe43f1e700a45627f40291da44b17f627ea731623ab1500e4f72ab31b4b5f846d84751185dbfde82c8f946fdcea -EBUILD gsad-22.5.1-r1.ebuild 2458 BLAKE2B 16a1c2ec681ea43caaed5fd62aa9f792d58d36bc97dc6d23872d5a0be5c30cbe9f6a0b1235f16bd671e0daf1ba3b2661227580f1e8a6caf4f7a69e74193140c7 SHA512 ff3f19b5ae4dd336f030cc74c0b5f7ef2ad441049960cd6a4035e89d346b01ebc471a8439bd47228b40b4b69f6893ea3c2ade019e1eec3e7be6c959a8fb1deea +EBUILD gsad-22.5.1-r2.ebuild 2479 BLAKE2B 2240548aa9db6b8818ef8dd6d80e9947c08c631176ebd30c0fba66d63b1f15c469c8e9c88a6004273d4e3604894bd3818dd0581357b56386c579cd66039d72ca SHA512 ddb159aa230f34d1b62ab1fb7d242b786cf5c6319eb691e514b65573ba981372d4c55a7d9a13001bfc405895a5e8898e0dd2ce2d9184eac5e137308a18590a4d MISC metadata.xml 602 BLAKE2B d3c36459de572672fec6a1cd7d7c29c5b8be3a421455c8702a2bfbcf4d969c5783d5026024bbffe4b765a18b50852b534b9d2a1174f5586327ff13a4f704781f SHA512 e15e39148d80f4b6c8c6e14c18ae977d6ebcec98b201e4d9b58d83f4a183023f383d4c5ae986064b6a176b741d0ac923173cb4f78a30185ce341c642002e13d7 diff --git a/net-analyzer/gsad/files/gsad-22.init b/net-analyzer/gsad/files/gsad-22.init index 9a93713bd591..f416990b19a4 100644 --- a/net-analyzer/gsad/files/gsad-22.init +++ b/net-analyzer/gsad/files/gsad-22.init @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 : ${GSAD_USER:=gvm} @@ -8,10 +8,8 @@ name="Greenbone Security Assistant (GSA)" command="/usr/bin/gsad" -command_args="--foreground ${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" -command_background="true" command_user="${GSAD_USER}:${GSAD_GROUP}" -pidfile="/run/gsad/gsad.pid" +command_args="${GSAD_OPTIONS} ${GSAD_LISTEN_ADDRESS} ${GSAD_LISTEN_PORT} ${GVMD_LISTEN_ADDRESS} ${GVMD_LISTEN_PORT} ${GSAD_GNUTLS_PRIORITIES}" retry="${GSAD_TIMEOUT}" depend() { @@ -20,5 +18,5 @@ depend() { } start_pre() { - checkpath -d /run/gsad + checkpath -d --owner ${GSAD_USER} /var/run/gsad } diff --git a/net-analyzer/gsad/files/gsad-daemon.conf b/net-analyzer/gsad/files/gsad-daemon.conf index f7c7ee514e50..e74b409cc84a 100644 --- a/net-analyzer/gsad/files/gsad-daemon.conf +++ b/net-analyzer/gsad/files/gsad-daemon.conf @@ -1,7 +1,7 @@ # Greenbone Security Assistant command args # e.g. --foreground | e.g. --no-redirect -GSAD_OPTIONS="--no-redirect" +GSAD_OPTIONS="--no-redirect --http-only" # GSAD listen adress GSAD_LISTEN_ADDRESS="--listen=127.0.0.1" diff --git a/net-analyzer/gsad/gsad-22.5.1-r1.ebuild b/net-analyzer/gsad/gsad-22.5.1-r1.ebuild deleted file mode 100644 index 49e02618b234..000000000000 --- a/net-analyzer/gsad/gsad-22.5.1-r1.ebuild +++ /dev/null @@ -1,105 +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-22.4 - >=net-analyzer/gsa-22.4 - 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" - "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad" - "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd" - "-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}" -} diff --git a/net-analyzer/gsad/gsad-22.5.1-r2.ebuild b/net-analyzer/gsad/gsad-22.5.1-r2.ebuild new file mode 100644 index 000000000000..7055f5038584 --- /dev/null +++ b/net-analyzer/gsad/gsad-22.5.1-r2.ebuild @@ -0,0 +1,105 @@ +# 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-22.4 + >=net-analyzer/gsa-22.4 + 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" + "-DGSAD_RUN_DIR=${EPREFIX}/run/gsad" + "-DGVMD_RUN_DIR=${EPREFIX}/run/gvmd" + "-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 + newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf" + + newinitd "${FILESDIR}/${PN}-22.init" "${PN}" + newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}" +} -- cgit v1.2.3