[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/files/, net-analyzer/gsad/
commit: 7f8016758519febe67de5a075b327c3b40009265
Author: Giuseppe Foti gmail com>
AuthorDate: Mon Nov 13 19:49:31 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Tue Nov 14 07:52:25 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f801675
net-analyzer/gsad: drop 21.4.4
Signed-off-by: Giuseppe Foti gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33799
Signed-off-by: Florian Schmaus gentoo.org>
net-analyzer/gsad/Manifest | 1 -
net-analyzer/gsad/files/gsad.init| 20 ---
net-analyzer/gsad/gsad-21.4.4.ebuild | 101 ---
3 files changed, 122 deletions(-)
diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 598c9490f54c..aeab8c05088a 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1,2 +1 @@
-DIST gsad-21.4.4.tar.gz 220618 BLAKE2B
276164ce1e03a6ed211d3bdf24c7f9b5ac832c07891b34b467f61ec02c5670d5368ea3219b3cc445e4ef83fef0aee7375c89ce8008746ea7e08abf50da8fb9fd
SHA512
092c8187754b3f0503e4ae6fd9c41dbd6917264668a5f8f831d40e88c7b8db6772acd354db62ac66b4af13b7c27e78516d4975f5bfede0d28001007a46c39f75
DIST gsad-22.6.0.tar.gz 223879 BLAKE2B
7e1d55052ef255d92cf8fd3c32f5490e192dc5635e4d9be8804ff0a72677add70081d0fff882673ea7dfc70e97acfb8012e683fefa9e6307661a39697a89eaea
SHA512
39393d9190281065978d7fdb4745daa5faa066b6cc97a81b442f989eb8d466be05d6af39585ea4649555b88db819a6ced909b2e3a8e640df4c500e37bb26f05f
diff --git a/net-analyzer/gsad/files/gsad.init
b/net-analyzer/gsad/files/gsad.init
deleted file mode 100644
index 79004c8481c5..
--- a/net-analyzer/gsad/files/gsad.init
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${GSAD_USER:=gvm}
-: ${GSAD_GROUP:=$(id -ng ${GSAD_USER})}
-: ${GSAD_TIMEOUT:=30}
-
-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.pid"
-retry="${GSAD_TIMEOUT}"
-
-depend() {
- after bootmisc
- need localmount net gvmd
-}
diff --git a/net-analyzer/gsad/gsad-21.4.4.ebuild
b/net-analyzer/gsad/gsad-21.4.4.ebuild
deleted file mode 100644
index 24f235b07056..
--- a/net-analyzer/gsad/gsad-21.4.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 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-${PV}
- 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_PID_DIR=/run/gsad"
- "-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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/files/, net-analyzer/gsad/
commit: a5dcfd414cf53fe80df074b7cc2930bbc60e7398
Author: Giuseppe Foti gmail com>
AuthorDate: Sun Oct 8 07:05:37 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Oct 9 10:54:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5dcfd41
net-analyzer/gsad: fix OpenRC init script
On first run the log file was created by root and was unwritable to gvm
Signed-off-by: Giuseppe Foti gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33243
Signed-off-by: Florian Schmaus gentoo.org>
net-analyzer/gsad/files/gsad-22.init| 6 +-
net-analyzer/gsad/{gsad-22.6.0.ebuild => gsad-22.6.0-r1.ebuild} | 0
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/gsad/files/gsad-22.init
b/net-analyzer/gsad/files/gsad-22.init
index aae78b2e1ab8..a17f2dc1c084 100644
--- a/net-analyzer/gsad/files/gsad-22.init
+++ b/net-analyzer/gsad/files/gsad-22.init
@@ -3,6 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
: ${GSAD_USER:=gvm}
+: ${GSAD_GROUP:=gvm}
: ${GSAD_TIMEOUT:=30}
: ${GSAD_PIDFILE:="/run/gsad/gsad.pid"}
@@ -21,6 +22,10 @@ start_pre() {
checkpath -d --mode 0755 --owner root /run/gsad
}
+start_post() {
+checkpath -f --mode 0644 --owner "${GSAD_USER}:${GSAD_GROUP}"
/var/log/gvm/gsad.log
+}
+
stop_post() {
if [ -f "${GSAD_PIDFILE}" ]; then
ebegin "Removing PID file"
@@ -28,4 +33,3 @@ stop_post() {
eend $?
fi
}
-
diff --git a/net-analyzer/gsad/gsad-22.6.0.ebuild
b/net-analyzer/gsad/gsad-22.6.0-r1.ebuild
similarity index 100%
rename from net-analyzer/gsad/gsad-22.6.0.ebuild
rename to net-analyzer/gsad/gsad-22.6.0-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/files/, net-analyzer/gsad/
commit: 9faff04c392041e0536602a5cb543f9eb4956c2c
Author: Giuseppe Foti gmail com>
AuthorDate: Wed Aug 9 15:37:28 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Aug 11 09:07:55 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9faff04c
net-analyzer/gsad: fix OpenRC script
Signed-off-by: Giuseppe Foti gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32234
Signed-off-by: Florian Schmaus gentoo.org>
net-analyzer/gsad/files/gsad-22.init | 8 +++-
net-analyzer/gsad/files/gsad-daemon.conf | 2 +-
.../gsad/{gsad-22.5.1-r1.ebuild => gsad-22.5.1-r2.ebuild} | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
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-r2.ebuild
similarity index 97%
rename from net-analyzer/gsad/gsad-22.5.1-r1.ebuild
rename to net-analyzer/gsad/gsad-22.5.1-r2.ebuild
index 49e02618b234..7055f5038584 100644
--- a/net-analyzer/gsad/gsad-22.5.1-r1.ebuild
+++ b/net-analyzer/gsad/gsad-22.5.1-r2.ebuild
@@ -98,7 +98,7 @@ src_install() {
${PN}.service
insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${PN}-daemon.conf"
+ newins "${FILESDIR}/${PN}-daemon.conf" "${PN}-daemon.conf"
newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/files/, net-analyzer/gsad/
commit: 503195bd9b244494f84cb314c90f0d02b10f4b3a
Author: Giuseppe Foti gmail com>
AuthorDate: Sat May 20 16:52:06 2023 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Jul 3 08:15:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=503195bd
net-analyzer/gsad: add 22.4.1
Signed-off-by: Giuseppe Foti gmail.com>
Signed-off-by: Florian Schmaus gentoo.org>
net-analyzer/gsad/Manifest| 1 +
net-analyzer/gsad/files/gsad-22.init | 24 +++
net-analyzer/gsad/files/gsad.service.conf | 2 +
net-analyzer/gsad/gsad-22.4.1.ebuild | 104 ++
net-analyzer/gsad/metadata.xml| 4 ++
5 files changed, 135 insertions(+)
diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 7b657dda3b1f..f8cc4f2beacf 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1 +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
diff --git a/net-analyzer/gsad/files/gsad-22.init
b/net-analyzer/gsad/files/gsad-22.init
new file mode 100644
index ..9a93713bd591
--- /dev/null
+++ b/net-analyzer/gsad/files/gsad-22.init
@@ -0,0 +1,24 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${GSAD_USER:=gvm}
+: ${GSAD_GROUP:=$(id -ng ${GSAD_USER})}
+: ${GSAD_TIMEOUT:=30}
+
+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"
+retry="${GSAD_TIMEOUT}"
+
+depend() {
+ after bootmisc
+ need localmount net gvmd
+}
+
+start_pre() {
+checkpath -d /run/gsad
+}
diff --git a/net-analyzer/gsad/files/gsad.service.conf
b/net-analyzer/gsad/files/gsad.service.conf
new file mode 100644
index ..23d1db6f96bc
--- /dev/null
+++ b/net-analyzer/gsad/files/gsad.service.conf
@@ -0,0 +1,2 @@
+[Unit]
+PartOf=gvm.target
diff --git a/net-analyzer/gsad/gsad-22.4.1.ebuild
b/net-analyzer/gsad/gsad-22.4.1.ebuild
new file mode 100644
index ..65d92e560f05
--- /dev/null
+++ b/net-analyzer/gsad/gsad-22.4.1.ebuild
@@ -0,0 +1,104 @@
+# 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-${PV}
+ 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"
+
