public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2023-11-21  8:01 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2023-11-21  8:01 UTC (permalink / raw
  To: gentoo-commits

commit:     92ce5a58c2acd8ec05d658d43d6646b0c9b645dc
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Wed Nov 15 06:05:33 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 08:00:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92ce5a58

net-analyzer/gsad: add 22.8.0, drop 22.6.0-r1

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33834
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gsad/Manifest                             |  2 +-
 .../gsad/{gsad-22.6.0-r1.ebuild => gsad-22.8.0.ebuild} | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index aeab8c05088a..f138be8c6bb9 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1 +1 @@
-DIST gsad-22.6.0.tar.gz 223879 BLAKE2B 7e1d55052ef255d92cf8fd3c32f5490e192dc5635e4d9be8804ff0a72677add70081d0fff882673ea7dfc70e97acfb8012e683fefa9e6307661a39697a89eaea SHA512 39393d9190281065978d7fdb4745daa5faa066b6cc97a81b442f989eb8d466be05d6af39585ea4649555b88db819a6ced909b2e3a8e640df4c500e37bb26f05f
+DIST gsad-22.8.0.tar.gz 224470 BLAKE2B c388be0d402b779dac537d3e436bb735b49f63e7ef624645cd6382dc2066a58503991f6b0528e42307ff30dbf7b7aac773fac756329072d45e22811e1643231d SHA512 21dc9fa846a734874a721ed0ab3ad0fea839c57c34efbc62ca9f6fe89a42b7327cd5e945a9d64bcedb914368f4dc0a392f17ce0beb831d84a242a96cabef8e97

diff --git a/net-analyzer/gsad/gsad-22.6.0-r1.ebuild b/net-analyzer/gsad/gsad-22.8.0.ebuild
similarity index 92%
rename from net-analyzer/gsad/gsad-22.6.0-r1.ebuild
rename to net-analyzer/gsad/gsad-22.8.0.ebuild
index f8fe3475bfda..48686899c084 100644
--- a/net-analyzer/gsad/gsad-22.6.0-r1.ebuild
+++ b/net-analyzer/gsad/gsad-22.8.0.ebuild
@@ -4,7 +4,7 @@
 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"
@@ -16,28 +16,28 @@ IUSE="doc"
 
 DEPEND="
 	acct-user/gvm
-	dev-libs/glib:2
+	>=net-libs/libmicrohttpd-0.9.0:=
+	dev-libs/libxml2:2
+	>=dev-libs/glib-2.42:2
+	>=net-analyzer/gvm-libs-22.6
+	>=net-libs/gnutls-3.2.15:=
+	>=sys-libs/zlib-1.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
 	)
 "
 


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2024-09-14 10:09 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2024-09-14 10:09 UTC (permalink / raw
  To: gentoo-commits

commit:     aea6e407b8f8f23182d823456b85d6bc08a07e24
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Wed Sep  4 05:04:02 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 09:56:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aea6e407

net-analyzer/gsad: add 22.12.0, drop 22.9.0

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38420
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gsad/Manifest                                    | 2 +-
 net-analyzer/gsad/{gsad-22.9.0.ebuild => gsad-22.12.0.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 63f1c795315c..f06d6dea6104 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1,2 +1,2 @@
-DIST gsad-22.9.0.tar.gz 224735 BLAKE2B da1ee149f6937ef2bb6d23391bf8594b776c8396d2a9fb0733b6d6933e1bd002ae560c178f8c300a09fd0d73c92615b750728fe8302f00b91e11926fe1a15aaa SHA512 ffe146a0dc87d2d95835dfa9b8eaeb2825a24aabe0f97e2ebd525235f96b23907476154fa52789c1d30d53daaf256743a4723db06e94bf6d4db98aaa57f08004
+DIST gsad-22.12.0.tar.gz 225704 BLAKE2B 77ae7ea7a281143ad756adafebead664286f87680d11109562551d305d65b9ec665a6335bc1a058ea457f81f5fa8aba2d0c663a2001a2097bc72d212001b07e7 SHA512 5cf49dbbda1742bb7d215d879a30cf04c083b8a6bde8d6225fe3149426ec3cd2d4abba8ebbdc29817fa2db7c38b8a9a5eafa32d20b0d79e685ae87daa2247405
 DIST gsad-22.9.1.tar.gz 222663 BLAKE2B e65c8ecfa613a1653d36234d00e95da690e32c1c7ffc8904f509d568533079138115fcd389aaafa6d6cb96d5df42c9071e04edbbc95ea77731627ab7036adbde SHA512 25592b7e07357ff41f142cf926132491af20757a404773f3d532bafbf6e75d98b259103860920f657512d16a120351478767d347b01bef122ea1177c685d0d5b

diff --git a/net-analyzer/gsad/gsad-22.9.0.ebuild b/net-analyzer/gsad/gsad-22.12.0.ebuild
similarity index 98%
rename from net-analyzer/gsad/gsad-22.9.0.ebuild
rename to net-analyzer/gsad/gsad-22.12.0.ebuild
index 2230d3f5a627..8598a1817e03 100644
--- a/net-analyzer/gsad/gsad-22.9.0.ebuild
+++ b/net-analyzer/gsad/gsad-22.12.0.ebuild
@@ -9,8 +9,8 @@ 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+"
+SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="brotli doc"
 
@@ -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=


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2024-02-28 20:50 Jakov Smolić
  0 siblings, 0 replies; 8+ messages in thread
From: Jakov Smolić @ 2024-02-28 20:50 UTC (permalink / raw
  To: gentoo-commits

commit:     f8bc8adb923b97c9e61ae4ba63a6943aa95637aa
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 20:50:03 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 20:50:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8bc8adb

net-analyzer/gsad: Stabilize 22.9.1 amd64, #925668

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-analyzer/gsad/gsad-22.9.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-analyzer/gsad/gsad-22.9.1.ebuild b/net-analyzer/gsad/gsad-22.9.1.ebuild
index 2230d3f5a627..1dcd0909a14a 100644
--- a/net-analyzer/gsad/gsad-22.9.1.ebuild
+++ b/net-analyzer/gsad/gsad-22.9.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/greenbone/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="brotli doc"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2024-02-28  7:17 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2024-02-28  7:17 UTC (permalink / raw
  To: gentoo-commits

commit:     cf10d73f7946a4aed78ff5c4e7b789ac3eb455c4
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Sat Feb 17 21:45:07 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 07:17:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf10d73f

net-analyzer/gsad: add 22.9.1

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35404
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gsad/Manifest           |   1 +
 net-analyzer/gsad/gsad-22.9.1.ebuild | 102 +++++++++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+)

diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index 3f7b5af73161..63f1c795315c 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1 +1,2 @@
 DIST gsad-22.9.0.tar.gz 224735 BLAKE2B da1ee149f6937ef2bb6d23391bf8594b776c8396d2a9fb0733b6d6933e1bd002ae560c178f8c300a09fd0d73c92615b750728fe8302f00b91e11926fe1a15aaa SHA512 ffe146a0dc87d2d95835dfa9b8eaeb2825a24aabe0f97e2ebd525235f96b23907476154fa52789c1d30d53daaf256743a4723db06e94bf6d4db98aaa57f08004
+DIST gsad-22.9.1.tar.gz 222663 BLAKE2B e65c8ecfa613a1653d36234d00e95da690e32c1c7ffc8904f509d568533079138115fcd389aaafa6d6cb96d5df42c9071e04edbbc95ea77731627ab7036adbde SHA512 25592b7e07357ff41f142cf926132491af20757a404773f3d532bafbf6e75d98b259103860920f657512d16a120351478767d347b01bef122ea1177c685d0d5b

diff --git a/net-analyzer/gsad/gsad-22.9.1.ebuild b/net-analyzer/gsad/gsad-22.9.1.ebuild
new file mode 100644
index 000000000000..2230d3f5a627
--- /dev/null
+++ b/net-analyzer/gsad/gsad-22.9.1.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 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="brotli doc"
+
+DEPEND="
+	acct-user/gvm
+	>=net-libs/libmicrohttpd-0.9.0:=
+	dev-libs/libxml2:2
+	>=dev-libs/glib-2.42:2
+	>=net-analyzer/gvm-libs-22.6
+	>=net-libs/gnutls-3.2.15:=
+	>=sys-libs/zlib-1.2
+	dev-libs/libgcrypt:0=
+	brotli? (
+		app-arch/brotli
+	)
+"
+
+RDEPEND="
+	${DEPEND}
+	>=net-analyzer/gvmd-22.4
+	>=net-analyzer/gsa-22.4
+	net-analyzer/ospd-openvas
+"
+
+BDEPEND="
+	dev-python/polib
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		app-text/xmltoman
+	)
+"
+
+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
+}
+
+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}"
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2024-01-23 13:30 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2024-01-23 13:30 UTC (permalink / raw
  To: gentoo-commits

commit:     d717f5cef888772a800cf0978dda366176eda156
Author:     Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Mon Jan 22 07:31:42 2024 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 13:29:30 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d717f5ce

net-analyzer/gsad: add 22.9.0, drop 22.8.0

Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34959
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gsad/Manifest                                   | 2 +-
 net-analyzer/gsad/{gsad-22.8.0.ebuild => gsad-22.9.0.ebuild} | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index f138be8c6bb9..3f7b5af73161 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1 +1 @@
-DIST gsad-22.8.0.tar.gz 224470 BLAKE2B c388be0d402b779dac537d3e436bb735b49f63e7ef624645cd6382dc2066a58503991f6b0528e42307ff30dbf7b7aac773fac756329072d45e22811e1643231d SHA512 21dc9fa846a734874a721ed0ab3ad0fea839c57c34efbc62ca9f6fe89a42b7327cd5e945a9d64bcedb914368f4dc0a392f17ce0beb831d84a242a96cabef8e97
+DIST gsad-22.9.0.tar.gz 224735 BLAKE2B da1ee149f6937ef2bb6d23391bf8594b776c8396d2a9fb0733b6d6933e1bd002ae560c178f8c300a09fd0d73c92615b750728fe8302f00b91e11926fe1a15aaa SHA512 ffe146a0dc87d2d95835dfa9b8eaeb2825a24aabe0f97e2ebd525235f96b23907476154fa52789c1d30d53daaf256743a4723db06e94bf6d4db98aaa57f08004

diff --git a/net-analyzer/gsad/gsad-22.8.0.ebuild b/net-analyzer/gsad/gsad-22.9.0.ebuild
similarity index 97%
rename from net-analyzer/gsad/gsad-22.8.0.ebuild
rename to net-analyzer/gsad/gsad-22.9.0.ebuild
index 3a2e42410abc..2230d3f5a627 100644
--- a/net-analyzer/gsad/gsad-22.8.0.ebuild
+++ b/net-analyzer/gsad/gsad-22.9.0.ebuild
@@ -12,7 +12,7 @@ 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"
+IUSE="brotli doc"
 
 DEPEND="
 	acct-user/gvm
@@ -23,6 +23,9 @@ DEPEND="
 	>=net-libs/gnutls-3.2.15:=
 	>=sys-libs/zlib-1.2
 	dev-libs/libgcrypt:0=
+	brotli? (
+		app-arch/brotli
+	)
 "
 
 RDEPEND="


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2023-07-25  6:45 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2023-07-25  6:45 UTC (permalink / raw
  To: gentoo-commits

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}"
-}


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2023-07-03 11:40 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2023-07-03 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     71ca5b5971d01adf95abe4e7f2e649c22194734d
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 11:39:08 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 11:39:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ca5b59

net-analyzer/gsad: drop unused CMake variable GSAD_PID_DIR

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gsad/gsad-22.4.1.ebuild | 1 -
 net-analyzer/gsad/gsad-22.5.1.ebuild | 1 -
 2 files changed, 2 deletions(-)

diff --git a/net-analyzer/gsad/gsad-22.4.1.ebuild b/net-analyzer/gsad/gsad-22.4.1.ebuild
index 65d92e560f05..6cf730484c9d 100644
--- a/net-analyzer/gsad/gsad-22.4.1.ebuild
+++ b/net-analyzer/gsad/gsad-22.4.1.ebuild
@@ -70,7 +70,6 @@ src_configure() {
 		"-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"
 	)

diff --git a/net-analyzer/gsad/gsad-22.5.1.ebuild b/net-analyzer/gsad/gsad-22.5.1.ebuild
index 00b93d2f84e0..0bb4755d34c5 100644
--- a/net-analyzer/gsad/gsad-22.5.1.ebuild
+++ b/net-analyzer/gsad/gsad-22.5.1.ebuild
@@ -70,7 +70,6 @@ src_configure() {
 		"-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"
 	)


^ permalink raw reply related	[flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/
@ 2023-07-03  8:15 Florian Schmaus
  0 siblings, 0 replies; 8+ messages in thread
From: Florian Schmaus @ 2023-07-03  8:15 UTC (permalink / raw
  To: gentoo-commits

commit:     9e306a64f27043dd6e475e334f833e731687bcb5
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 08:15:09 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 08:15:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e306a64

net-analyzer/gsad: add 22.5.1

Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-analyzer/gsad/Manifest           |   1 +
 net-analyzer/gsad/gsad-22.5.1.ebuild | 104 +++++++++++++++++++++++++++++++++++
 2 files changed, 105 insertions(+)

diff --git a/net-analyzer/gsad/Manifest b/net-analyzer/gsad/Manifest
index f8cc4f2beacf..24dcef037487 100644
--- a/net-analyzer/gsad/Manifest
+++ b/net-analyzer/gsad/Manifest
@@ -1,2 +1,3 @@
 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.5.1.ebuild b/net-analyzer/gsad/gsad-22.5.1.ebuild
new file mode 100644
index 000000000000..00b93d2f84e0
--- /dev/null
+++ b/net-analyzer/gsad/gsad-22.5.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-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"
+		"-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 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}"
+}


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2024-09-14 10:09 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-11-21  8:01 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gsad/ Florian Schmaus
  -- strict thread matches above, loose matches on Subject: below --
2024-09-14 10:09 Florian Schmaus
2024-02-28 20:50 Jakov Smolić
2024-02-28  7:17 Florian Schmaus
2024-01-23 13:30 Florian Schmaus
2023-07-25  6:45 Florian Schmaus
2023-07-03 11:40 Florian Schmaus
2023-07-03  8:15 Florian Schmaus

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox