* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2020-03-25 13:46 Joonas Niilola
0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2020-03-25 13:46 UTC (permalink / raw
To: gentoo-commits
commit: eb8e61dc0a3984604eababba3a54ae2816617fc3
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Tue Mar 10 20:32:53 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 13:45:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8e61dc
net-analyzer/gvmd: Version Bump to 9.0.0
Bug: https://bugs.gentoo.org/712084
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-analyzer/gvmd/Manifest | 1 +
net-analyzer/gvmd/files/gvmd.init | 6 +-
net-analyzer/gvmd/gvmd-9.0.0.ebuild | 113 ++++++++++++++++++++++++++++++++++++
net-analyzer/gvmd/metadata.xml | 9 ++-
4 files changed, 125 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 328c523e067..040172ac1ef 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1 +1,2 @@
DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
+DIST gvmd-9.0.0.tar.gz 1425724 BLAKE2B f44c14a660f2ee9986e5873011233a423565acfdaea479ac6749998da997343a97dabec0355d618fd9032b65871737ba0407525b8d2b49e88aaa58523b633cae SHA512 99faf4b4a9e0baf7993769efb30ef39e09d76173416b44baa1b0849c7b68bd07cd9f82404832136a3e1b37769c7d5e77e5da54275ff75fffc2e6e6fa7a8b9dac
diff --git a/net-analyzer/gvmd/files/gvmd.init b/net-analyzer/gvmd/files/gvmd.init
index 9686c9b5398..098232afa1e 100644
--- a/net-analyzer/gvmd/files/gvmd.init
+++ b/net-analyzer/gvmd/files/gvmd.init
@@ -1,5 +1,5 @@
#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
: ${GVMD_USER:=gvm}
@@ -8,7 +8,7 @@
name="Greenbone Vulnerability Manager"
command=/usr/bin/gvmd
-command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
+command_args="--foreground ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
command_background="true"
command_user="${GVMD_USER}:${GVMD_GROUP}"
pidfile="/run/gvmd.pid"
@@ -16,7 +16,7 @@ retry="${GVMD_TIMEOUT}"
depend() {
after bootmisc
- need localmount net openvassd
+ need localmount net ospd-openvas
}
start_pre() {
diff --git a/net-analyzer/gvmd/gvmd-9.0.0.ebuild b/net-analyzer/gvmd/gvmd-9.0.0.ebuild
new file mode 100644
index 00000000000..58e83c51833
--- /dev/null
+++ b/net-analyzer/gvmd/gvmd-9.0.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit cmake flag-o-matic systemd toolchain-funcs
+
+DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
+HOMEPAGE="https://www.greenbone.net/en/"
+SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="extras +postgres sqlite"
+# keep deprecated USE Flags for revdep of gvm
+REQUIRED_USE="postgres !sqlite"
+
+DEPEND="
+ dev-db/postgresql:*
+ dev-libs/libgcrypt:0=
+ dev-libs/libical
+ >=net-analyzer/gvm-libs-11.0.0
+ net-libs/gnutls:=[tools]
+ extras? (
+ app-text/xmlstarlet
+ dev-texlive/texlive-latexextra )"
+
+RDEPEND="
+ ${DEPEND}
+ acct-user/gvm
+ net-analyzer/ospd-openvas"
+
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ extras? (
+ app-doc/doxygen[dot]
+ app-doc/xmltoman
+ app-text/htmldoc
+ dev-libs/libxslt
+ )"
+
+src_prepare() {
+ cmake_src_prepare
+ # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
+ sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
+ sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die
+ # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
+ if use extras; 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"
+ "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
+ "-DSBINDIR=${EPREFIX}/usr/bin"
+ )
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile
+ if use extras; then
+ cmake_build -C "${BUILD_DIR}" doc
+ cmake_build doc-full -C "${BUILD_DIR}" doc
+ fi
+ cmake_build rebuild_cache
+}
+
+src_install() {
+ if use extras; then
+ local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
+ fi
+ cmake_src_install
+
+ insinto /etc/gvm
+ doins -r "${FILESDIR}"/*sync*
+
+ insinto /etc/gvm/sysconfig
+ doins "${FILESDIR}/${PN}-daemon.conf"
+
+ exeinto /etc/gvm
+ doexe "${FILESDIR}"/gvmd-startpre.sh
+
+ fowners -R gvm:gvm /etc/gvm
+
+ newinitd "${FILESDIR}/${PN}.init" "${PN}"
+ newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/${PN}.logrotate" "${PN}"
+
+ systemd_dounit "${FILESDIR}/${PN}.service"
+
+ # Set proper permissions on required files/directories
+ keepdir /var/lib/gvm/gvmd
+ fowners -R gvm:gvm /var/lib/gvm
+}
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index 1bb5d1b974f..072f3391491 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!-- maintainer-needed -->
+ <maintainer type="person">
+ <email>jonas.licht@gmail.com</email>
+ <name>Jonas Licht</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="extras">Html docs support</flag>
</use>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2020-10-28 7:51 Joonas Niilola
0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2020-10-28 7:51 UTC (permalink / raw
To: gentoo-commits
commit: e20fff237b4292f8f82d57e7dbbfcc8a32c675e7
Author: CyriusGentoo <cyrius <AT> linog-consulting <DOT> com>
AuthorDate: Tue Oct 27 18:44:31 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 07:51:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e20fff23
net-analyzer/gvmd: Replace deprecated sys_siglist with strsignal
Signed-off-by: François Logier <cyrius <AT> linog-consulting.com>
Closes: https://bugs.gentoo.org/740558
Closes: https://github.com/gentoo/gentoo/pull/18050
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../gvmd/files/gvmd-9.0.1-glibc_siglist.patch | 82 ++++++++++++++++++++++
net-analyzer/gvmd/gvmd-9.0.1.ebuild | 5 ++
2 files changed, 87 insertions(+)
diff --git a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
new file mode 100644
index 00000000000..6b8ed7dfe1c
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
@@ -0,0 +1,82 @@
+# Solve Gentoo Bug 740558 : Replace deprecated sys_siglist with strsignal
+--- ./src/manage.c 2020-05-12 18:54:26.000000000 +0200
++++ ./src/manage.c 2020-10-27 13:32:20.423421085 +0100
+@@ -3283,7 +3283,7 @@
+ {
+ g_debug ("%s: Received %s signal.",
+ __FUNCTION__,
+- sys_siglist[get_termination_signal()]);
++ strsignal(get_termination_signal()));
+ }
+ if (global_current_report)
+ {
+@@ -3305,7 +3305,7 @@
+ {
+ g_debug ("%s: Received %s signal.",
+ __FUNCTION__,
+- sys_siglist[get_termination_signal()]);
++ strsignal(get_termination_signal()));
+ if (global_current_report)
+ {
+ set_report_scan_run_status (global_current_report,
+--- ./src/gvmd.c 2020-05-12 18:54:26.000000000 +0200
++++ ./src/gvmd.c 2020-10-27 13:34:47.606424207 +0100
+@@ -922,7 +922,7 @@
+ if (sigaction (signal, &action, NULL) == -1)
+ {
+ g_critical ("%s: failed to register %s handler",
+- __FUNCTION__, sys_siglist[signal]);
++ __FUNCTION__, strsignal(termination_signal));
+ exit (EXIT_FAILURE);
+ }
+ }
+@@ -953,7 +953,7 @@
+ if (sigaction (signal, &action, NULL) == -1)
+ {
+ g_critical ("%s: failed to register %s handler",
+- __FUNCTION__, sys_siglist[signal]);
++ __FUNCTION__, strsignal(termination_signal));
+ exit (EXIT_FAILURE);
+ }
+ }
+@@ -1258,7 +1258,7 @@
+ if (termination_signal)
+ {
+ g_debug ("Received %s signal",
+- sys_siglist[termination_signal]);
++ strsignal(termination_signal));
+ cleanup ();
+ /* Raise signal again, to exit with the correct return value. */
+ setup_signal_handler (termination_signal, SIG_DFL, 0);
+@@ -1347,7 +1347,7 @@
+ if (termination_signal)
+ {
+ g_debug ("Received %s signal",
+- sys_siglist[termination_signal]);
++ strsignal(termination_signal));
+ cleanup ();
+ /* Raise signal again, to exit with the correct return value. */
+ setup_signal_handler (termination_signal, SIG_DFL, 0);
+--- ./src/manage_sql.c 2020-05-12 18:54:26.000000000 +0200
++++ ./src/manage_sql.c 2020-10-27 13:36:19.071426148 +0100
+@@ -18711,7 +18711,7 @@
+ void
+ manage_cleanup_process_error (int signal)
+ {
+- g_debug ("Received %s signal", sys_siglist[signal]);
++ g_debug ("Received %s signal", strsignal(signal));
+ if (sql_is_open ())
+ {
+ if (current_scanner_task)
+--- ./src/gmpd.c 2020-05-12 18:54:26.000000000 +0200
++++ ./src/gmpd.c 2020-10-27 13:46:29.687439101 +0100
+@@ -496,8 +496,7 @@
+ {
+ g_debug ("%s: Received %s signal.",
+ __FUNCTION__,
+- sys_siglist[get_termination_signal()]);
+-
++ strsignal(get_termination_signal()));
+ goto client_free;
+ }
+
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
index 837980d8e68..b48b9a9102a 100644
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
@@ -45,6 +45,11 @@ BDEPEND="
)
test? ( dev-libs/cgreen )"
+PATCHES=(
+ # Replace deprecated glibc sys_siglist with strsignal
+ "${FILESDIR}/${P}-glibc_siglist.patch"
+)
+
src_prepare() {
cmake_src_prepare
# QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2021-01-21 7:14 Joonas Niilola
0 siblings, 0 replies; 9+ messages in thread
From: Joonas Niilola @ 2021-01-21 7:14 UTC (permalink / raw
To: gentoo-commits
commit: e70b76941e263812ae9405634e482eddf06bc14b
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Thu Jan 7 17:17:02 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 07:08:35 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e70b7694
net-analyzer/gvmd: drop old broken version 8.0.1
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Closes: https://github.com/gentoo/gentoo/pull/18984
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-analyzer/gvmd/Manifest | 1 -
net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch | 56 -----------
net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch | 34 -------
net-analyzer/gvmd/gvmd-8.0.1.ebuild | 118 -----------------------
4 files changed, 209 deletions(-)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 04581ca8a8b..de6f6ae1f9b 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,2 +1 @@
-DIST gvmd-8.0.1.tar.gz 1495311 BLAKE2B 17419f5fecf7cce07536a5e12f17a61a31d45add185e0e1635515834eca6abd8a6babeb89b8f879ff8cb90b60f3682a19a62403142f4901be3f932b8a44cac68 SHA512 5490b902ad42499657eca9031b396c70a82d3c523985601067e697758f2472d123c4e99b085b963e58888d99224fa2a441a140772c702d7cd60d6424b126bfc8
DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
deleted file mode 100644
index bf21acb7b01..00000000000
--- a/net-analyzer/gvmd/files/gvmd-8.0.1-sbin.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/src/CMakeLists.txt 2019-07-17 17:11:52.000000000 +0300
-+++ b/src/CMakeLists.txt 2019-07-21 22:43:17.299106863 +0300
-@@ -248,12 +248,12 @@
- ## Install
-
- install (TARGETS ${BINARY_NAME}
-- RUNTIME DESTINATION ${SBINDIR}
-+ RUNTIME DESTINATION ${BINDIR}
- LIBRARY DESTINATION ${LIBDIR}
- ARCHIVE DESTINATION ${LIBDIR}/static)
-
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gvmd
-- DESTINATION ${SBINDIR})
-+ DESTINATION ${BINDIR})
-
- if (BACKEND STREQUAL POSTGRESQL)
- install (TARGETS gvm-pg-server
---- a/CMakeLists.txt 2019-07-22 11:31:13.430827400 +0300
-+++ b/CMakeLists.txt 2019-07-22 11:32:29.034765809 +0300
-@@ -571,17 +571,17 @@
- PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-portnames-update
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-scapdata-sync
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/greenbone-certdata-sync
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
-@@ -593,13 +593,13 @@
- WORLD_READ WORLD_EXECUTE)
-
- install (FILES ${CMAKE_BINARY_DIR}/tools/gvm-migrate-to-postgres
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-
- if (BACKEND STREQUAL SQLITE3)
- install (FILES ${CMAKE_SOURCE_DIR}/tools/database-statistics-sqlite
-- DESTINATION ${SBINDIR}
-+ DESTINATION ${BINDIR}
- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
- GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- endif (BACKEND STREQUAL SQLITE3)
diff --git a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch b/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
deleted file mode 100644
index 40b1e009557..00000000000
--- a/net-analyzer/gvmd/files/gvmd-8.0.1-tmplock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/tools/greenbone-certdata-sync.in 2019-07-17 17:11:52.000000000 +0300
-+++ b/tools/greenbone-certdata-sync.in 2019-07-22 21:11:36.173099530 +0300
-@@ -494,13 +494,11 @@
- fi
- (
- flock -n 9
-- date > $LOCK_FILE
- if [ $? -eq 1 ] ; then
- log_notice "Sync in progress, exiting."
- exit 1
- fi
- sync_certdata
-- echo -n > $LOCK_FILE
--) 9>$LOCK_FILE
-+)
-
- exit 0
---- a/tools/greenbone-scapdata-sync.in 2019-07-17 17:11:52.000000000 +0300
-+++ b/tools/greenbone-scapdata-sync.in 2019-07-22 21:12:49.193161531 +0300
-@@ -517,13 +517,11 @@
- fi
- (
- flock -n 9
-- date > $LOCK_FILE
- if [ $? -eq 1 ] ; then
- log_notice "Sync in progress, exiting."
- exit 1
- fi
- sync_scapdata
-- echo -n > $LOCK_FILE
--) 9>$LOCK_FILE
-+)
-
- exit 0
diff --git a/net-analyzer/gvmd/gvmd-8.0.1.ebuild b/net-analyzer/gvmd/gvmd-8.0.1.ebuild
deleted file mode 100644
index 7289dcd5f82..00000000000
--- a/net-analyzer/gvmd/gvmd-8.0.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras postgres sqlite"
-REQUIRED_USE="|| ( postgres sqlite )"
-
-DEPEND="
- dev-libs/libgcrypt:0=
- dev-libs/libical
- >=net-analyzer/gvm-libs-10.0.1
- net-libs/gnutls:=[tools]
- extras? ( app-text/xmlstarlet
- dev-texlive/texlive-latexextra )
- postgres? ( dev-db/postgresql:* )
- sqlite? ( dev-db/sqlite:3 )"
-
-RDEPEND="
- ${DEPEND}
- ~net-analyzer/openvas-scanner-6.0.1"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- extras? ( app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-libs/libxslt
- )"
-
-PATCHES=(
- # Install exec. to /usr/bin instead of /usr/sbin
- "${FILESDIR}/${P}-sbin.patch"
- # Fix permissions for user gvm.
- "${FILESDIR}/${P}-tmplock.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Use correct FHS/Gentoo policy paths for 8.0.1
- sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "$S"/doc/CMakeLists.txt || die
- sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "$S"/CMakeLists.txt || die
- # QA-Fix | Remove !CLANG Doxygen warnings for 8.0.1
- if use extras; 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"
- )
- # Add release hardening flags for 8.0.1
- append-cflags -Wno-nonnull -Wformat -Wformat-security -D_FORTIFY_SOURCE=2 -fstack-protector
- append-ldflags -Wl,-z,relro -Wl,-z,now
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- cmake_src_install
-
- dodir /etc/gvm
- insinto /etc/gvm
- doins -r "${FILESDIR}"/*sync*
-
- dodir /etc/gvm/sysconfig
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${PN}-daemon.conf"
-
- exeinto /etc/gvm
- doexe "${FILESDIR}"/gvmd-startpre.sh
-
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${PN}.init" "${PN}"
- newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/gvm/gvmd
- fowners -R gvm:gvm /var/lib/gvm
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2022-05-02 14:26 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2022-05-02 14:26 UTC (permalink / raw
To: gentoo-commits
commit: 6381b8f34898c822a1c36f9826443433fe0ac9ee
Author: Jonas Licht <jonas.licht <AT> fem <DOT> tu-ilmenau <DOT> de>
AuthorDate: Sat Apr 30 16:12:25 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May 2 14:25:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6381b8f3
net-analyzer/gvmd: bump to 21.4.5, drop 21.4.4
Co-authored-by: Florian Schmaus <flow <AT> gentoo.org>
Signed-off-by: Jonas Licht <jonas.licht <AT> fem.tu-ilmenau.de>
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/gvmd/Manifest | 2 +-
net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh | 8 ++++
net-analyzer/gvmd/files/gvmd-21.4.5.init | 23 ++++++++++++
.../{gvmd-21.4.4.ebuild => gvmd-21.4.5.ebuild} | 43 +++++++++-------------
4 files changed, 49 insertions(+), 27 deletions(-)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index f4c9e78b54dc..0491908d3697 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,4 +1,4 @@
DIST gvm-report-formats-0.1.tar.gz 58962 BLAKE2B 45cb5a7b81b68524254947503921f871577b86c2d7696758b365205b5ed8e4516840f704d3bcb8da6925a536db8e01fb9f0d922a3a2233dd4d4fa21e4308dc1b SHA512 8ae128ca087b7d1ecd2b84cb43e67b8f920001699268b9ce70d1f703f1dac68d8905354f5a8203808982291fdeb80fb11569a0bb559df0263296c603c691b422
DIST gvmd-20.8.1.tar.gz 1024660 BLAKE2B c2981d73efe4bb32008c82ba9a017f58ade18efe00d85c1876a872ae9c6260e801697ef7c7bc9c0862e92043167ecd58d082b97c746308d983ffac7991146d83 SHA512 e946be6c67970fdb0e4e6fbb2ac9445576c280c3ac7503ff42aac2c079e817ee587a37477956917b576bafab3e7caa281da5befa6502b044562051ae976889b2
-DIST gvmd-21.4.4.tar.gz 1031202 BLAKE2B bbb1b2cfba31fafa3e44453b493e78f916ffb9a27c0072ba8f9655b6936d678417258133e87cd9b160b5d3768058f2f8ebb1a7523860c4965a4eadac2bfb5aeb SHA512 4bff2cafab6672d30cac03c306083c703a42b299020fa662165143ef604a00cad0f1ce7e144005f2c9acb4dd5e2dd61ac0542b088328e8428f91a830fbbe5eed
+DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh b/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
new file mode 100644
index 000000000000..85e6f008abe0
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5-startpre.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Greenbone Vulnerability Manager Systemd ExecStartPre
+mkdir -p /run/gvmd
+touch /run/gvmd/gvm-{checking,create-functions,helping,migrating,serving}
+chown -R gvm:gvm /run/gvmd/
+touch /run/feed-update.lock
+chown gvm:gvm /run/feed-update.lock
diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5.init b/net-analyzer/gvmd/files/gvmd-21.4.5.init
new file mode 100644
index 000000000000..ae9a170921b2
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvmd-21.4.5.init
@@ -0,0 +1,23 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: ${GVMD_USER:=gvm}
+: ${GVMD_GROUP:=gvm}
+: ${GVMD_TIMEOUT:=30}
+
+name="Greenbone Vulnerability Manager"
+command=/usr/bin/gvmd
+command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
+command_user="${GVMD_USER}:${GVMD_GROUP}"
+pidfile="/run/gvmd/gvmd.pid"
+retry="${GVMD_TIMEOUT}"
+
+depend() {
+ after bootmisc
+ need localmount net ospd-openvas
+}
+
+start_pre() {
+ /bin/bash /etc/gvm/gvmd-startpre.sh
+}
diff --git a/net-analyzer/gvmd/gvmd-21.4.4.ebuild b/net-analyzer/gvmd/gvmd-21.4.5.ebuild
similarity index 76%
rename from net-analyzer/gvmd/gvmd-21.4.4.ebuild
rename to net-analyzer/gvmd/gvmd-21.4.5.ebuild
index ea78308c4ab3..4d133ecc4f04 100644
--- a/net-analyzer/gvmd/gvmd-21.4.4.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5.ebuild
@@ -8,13 +8,12 @@ inherit cmake systemd toolchain-funcs
DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/j-licht/gvmd_report_formats/archive/v0.1.tar.gz -> gvm-report-formats-0.1.tar.gz"
+SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
LICENSE="GPL-2+"
KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
+IUSE="doc test"
RESTRICT="!test? ( test )"
DEPEND="
@@ -23,29 +22,29 @@ DEPEND="
app-crypt/gpgme:1=
dev-db/postgresql:*[uuid]
dev-libs/glib:2
- dev-libs/libgcrypt:0=
dev-libs/libical:=
- >=net-analyzer/gvm-libs-${PV}
+ >=net-analyzer/gvm-libs-21.4.4
net-libs/gnutls:=[tools]
- extras? (
+ doc? (
app-text/xmlstarlet
- dev-texlive/texlive-latexextra )"
-
+ dev-texlive/texlive-latexextra )
+"
RDEPEND="
${DEPEND}
- net-analyzer/ospd-openvas"
-
+ net-analyzer/ospd-openvas
+"
BDEPEND="
sys-devel/bison
sys-devel/flex
virtual/pkgconfig
- extras? (
+ doc? (
app-doc/doxygen[dot]
app-doc/xmltoman
app-text/htmldoc
dev-libs/libxslt
)
- test? ( dev-libs/cgreen )"
+ test? ( dev-libs/cgreen )
+"
src_prepare() {
cmake_src_prepare
@@ -53,7 +52,7 @@ src_prepare() {
sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" doc/CMakeLists.txt || die
sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" CMakeLists.txt || die
# QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
- if use extras; then
+ if use doc; then
if ! tc-is-clang; then
local f
for f in doc/*.in
@@ -79,7 +78,7 @@ src_configure() {
src_compile() {
cmake_src_compile
- if use extras; then
+ if use doc; then
cmake_build -C "${BUILD_DIR}" doc
cmake_build doc-full -C "${BUILD_DIR}" doc
fi
@@ -90,26 +89,20 @@ src_compile() {
}
src_install() {
- if use extras; then
+ if use doc; then
local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
fi
cmake_src_install
- #QA-Fix
- #rm -r "${D}/usr/etc" || die
-
- insinto /etc/gvm
- doins -r "${FILESDIR}"/*sync*
-
insinto /etc/gvm/sysconfig
doins "${FILESDIR}/${PN}-daemon.conf"
exeinto /etc/gvm
- doexe "${FILESDIR}"/gvmd-startpre.sh
+ newexe "${FILESDIR}"/${P}-startpre.sh gvmd-startpre.sh
fowners -R gvm:gvm /etc/gvm
- newinitd "${FILESDIR}/${PN}.init" "${PN}"
+ newinitd "${FILESDIR}/${P}.init" "${PN}"
newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
insinto /etc/logrotate.d
@@ -121,7 +114,5 @@ src_install() {
keepdir /var/lib/gvm/gvmd
fowners -R gvm:gvm /var/lib/gvm
- #add report formats from old version for migration
- insinto /usr/share/gvm/gvmd/
- doins -r "${WORKDIR}/gvmd_report_formats-0.1/report_formats/"
+ rm -r "${D}/run" || die
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2022-05-09 12:07 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2022-05-09 12:07 UTC (permalink / raw
To: gentoo-commits
commit: 123dc0e869f647b8d0009e5fdd2152a74ec11227
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 11:50:33 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon May 9 12:07:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123dc0e8
net-analyzer/gvmd: fix LICENSE, gvm-sync-all helper, GVM_DEFAULT_DROP_USER
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/gvmd/files/gvm-sync-all | 31 ++++++++++++++++++++++
net-analyzer/gvmd/files/gvm-sync-all.service | 7 +++++
net-analyzer/gvmd/files/gvm-sync-all.timer | 9 +++++++
...gvmd-21.4.5-r3.ebuild => gvmd-21.4.5-r4.ebuild} | 6 ++++-
4 files changed, 52 insertions(+), 1 deletion(-)
diff --git a/net-analyzer/gvmd/files/gvm-sync-all b/net-analyzer/gvmd/files/gvm-sync-all
new file mode 100644
index 000000000000..d12b860e7fcb
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+case ${USER} in
+ root)
+ exec su --shell /bin/bash --command "$0 $@" gvm
+ ;;
+ gvm)
+ ;;
+ *)
+ >&2 echo "Must be run as root or gvm user not ${USER}"
+ exit 1
+ ;;
+esac
+
+while getopts d OPTION "$@"; do
+ case ${OPTION} in
+ d)
+ set -x
+ ;;
+ esac
+done
+shift $((OPTIND - 1))
+
+greenbone-nvt-sync
+# Note that Greenbone recommends to sync CERT *after* SCAP, as the
+# former depends on the later. See
+# https://github.com/greenbone/gvmd/blob/main/INSTALL.md#keeping-the-feeds-up-to-date
+for FEED_TYPE in SCAP CERT GVMD_DATA; do
+ greenbone-feed-sync --type ${FEED_TYPE}
+done
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.service b/net-analyzer/gvmd/files/gvm-sync-all.service
new file mode 100644
index 000000000000..a82e2950f3fd
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Update all feeds of the Greenbone Vulerability Management (GMV) suite
+After=network-online.target
+
+[Service]
+ExecStart=/usr/sbin/gvm-sync-all
+User=gvm
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.timer b/net-analyzer/gvmd/files/gvm-sync-all.timer
new file mode 100644
index 000000000000..9faf470e013c
--- /dev/null
+++ b/net-analyzer/gvmd/files/gvm-sync-all.timer
@@ -0,0 +1,9 @@
+[Unit]
+Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite
+
+[Timer]
+OnCalendar=daily
+RandomizedDelaySec=2hour
+
+[Install]
+WantedBy=timers.target
diff --git a/net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r4.ebuild
similarity index 95%
rename from net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild
rename to net-analyzer/gvmd/gvmd-21.4.5-r4.ebuild
index ea09acaeeeb5..5b5e6ab83497 100644
--- a/net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild
+++ b/net-analyzer/gvmd/gvmd-21.4.5-r4.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
SLOT="0"
-LICENSE="GPL-2+"
+LICENSE="AGPL-3+"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RESTRICT="!test? ( test )"
@@ -87,6 +87,7 @@ src_configure() {
"-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
"-DSBINDIR=${EPREFIX}/usr/bin"
"-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
+ "-DGVM_DEFAULT_DROP_USER=gvm"
)
cmake_src_configure
}
@@ -123,4 +124,7 @@ src_install() {
if ! use prefix; then
fowners -R gvm:gvm /var/lib/gvm
fi
+
+ dosbin "${FILESDIR}"/gvm-sync-all
+ systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2022-05-10 19:54 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2022-05-10 19:54 UTC (permalink / raw
To: gentoo-commits
commit: f89f5f93d8301291321b9c8fc2ecf9b6c567a3ec
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 13:57:15 2022 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue May 10 19:53:36 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f89f5f93
net-analyzer/gvmd: drop 9.0.1, 20.8.1
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/gvmd/Manifest | 3 -
.../gvmd/files/greenbone-certdata-sync.conf | 1 -
net-analyzer/gvmd/files/greenbone-nvt-sync.conf | 1 -
.../gvmd/files/greenbone-scapdata-sync.conf | 1 -
.../gvmd/files/gvmd-9.0.1-glibc_siglist.patch | 96 ----------------
net-analyzer/gvmd/files/gvmd-startpre.sh | 7 --
net-analyzer/gvmd/files/gvmd.logrotate | 13 ---
net-analyzer/gvmd/files/gvmd.service | 21 ----
net-analyzer/gvmd/gvmd-20.8.1.ebuild | 125 ---------------------
net-analyzer/gvmd/gvmd-9.0.1.ebuild | 121 --------------------
net-analyzer/gvmd/metadata.xml | 5 +-
11 files changed, 1 insertion(+), 393 deletions(-)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 0491908d3697..afe9b2d63f60 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,4 +1 @@
-DIST gvm-report-formats-0.1.tar.gz 58962 BLAKE2B 45cb5a7b81b68524254947503921f871577b86c2d7696758b365205b5ed8e4516840f704d3bcb8da6925a536db8e01fb9f0d922a3a2233dd4d4fa21e4308dc1b SHA512 8ae128ca087b7d1ecd2b84cb43e67b8f920001699268b9ce70d1f703f1dac68d8905354f5a8203808982291fdeb80fb11569a0bb559df0263296c603c691b422
-DIST gvmd-20.8.1.tar.gz 1024660 BLAKE2B c2981d73efe4bb32008c82ba9a017f58ade18efe00d85c1876a872ae9c6260e801697ef7c7bc9c0862e92043167ecd58d082b97c746308d983ffac7991146d83 SHA512 e946be6c67970fdb0e4e6fbb2ac9445576c280c3ac7503ff42aac2c079e817ee587a37477956917b576bafab3e7caa281da5befa6502b044562051ae976889b2
DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
-DIST gvmd-9.0.1.tar.gz 1446748 BLAKE2B 7b7b4e8e4224e7a24964f39157bd0535fb4e6405b2813da7c827f4705c4b5df4d953783a3e21950c9196aa5878a09ce6eec7b4d906cc13730e508b0aa5d4be61 SHA512 4c4f0e1fdd2255be1a96967d61d9066d8860aecc5959f04c559b1a248bcc54d9cb75facd0156e223d674f038718f1e8ba0ee6b36cdc8ed88efe480acd1aa54cf
diff --git a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf b/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
deleted file mode 100644
index d31a7331d341..000000000000
--- a/net-analyzer/gvmd/files/greenbone-certdata-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_CERT_RSYNC_FEED="rsync://feed.openvas.org:/cert-data"
diff --git a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf b/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
deleted file mode 100644
index 967c41dec2e3..000000000000
--- a/net-analyzer/gvmd/files/greenbone-nvt-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_NVT_RSYNC_FEED="rsync://feed.openvas.org:/nvt-feed"
diff --git a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf b/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
deleted file mode 100644
index 4a7426bc8057..000000000000
--- a/net-analyzer/gvmd/files/greenbone-scapdata-sync.conf
+++ /dev/null
@@ -1 +0,0 @@
-COMMUNITY_SCAP_RSYNC_FEED="rsync://feed.openvas.org:/scap-data"
diff --git a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch b/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
deleted file mode 100644
index 186bd882bdd8..000000000000
--- a/net-analyzer/gvmd/files/gvmd-9.0.1-glibc_siglist.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From ed07f5a23dd0644d0bbd3f2ddc1cec3b6ce922c6 Mon Sep 17 00:00:00 2001
-From: Timo Gurr <timo.gurr@gmail.com>
-Date: Tue, 1 Sep 2020 10:03:34 +0200
-Subject: [PATCH] Replace deprecated sys_siglist with strsignal
-
-Required to work with glibc >= 2.32.
-
-https://sourceware.org/pipermail/libc-announce/2020/000029.html
-
- The deprecated arrays sys_siglist, _sys_siglist, and sys_sigabbrev
- are no longer available to newly linked binaries, and their declarations
- have been removed from <string.h>. They are exported solely as
- compatibility symbols to support old binaries. All programs should use
- strsignal instead.
-
---- ./src/manage.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/manage.c 2020-10-27 13:32:20.423421085 +0100
-@@ -3283,7 +3283,7 @@
- {
- g_debug ("%s: Received %s signal.",
- __FUNCTION__,
-- sys_siglist[get_termination_signal()]);
-+ strsignal(get_termination_signal()));
- }
- if (global_current_report)
- {
-@@ -3305,7 +3305,7 @@
- {
- g_debug ("%s: Received %s signal.",
- __FUNCTION__,
-- sys_siglist[get_termination_signal()]);
-+ strsignal(get_termination_signal()));
- if (global_current_report)
- {
- set_report_scan_run_status (global_current_report,
---- ./src/gvmd.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/gvmd.c 2020-10-27 13:34:47.606424207 +0100
-@@ -922,7 +922,7 @@
- if (sigaction (signal, &action, NULL) == -1)
- {
- g_critical ("%s: failed to register %s handler",
-- __FUNCTION__, sys_siglist[signal]);
-+ __FUNCTION__, strsignal(termination_signal));
- exit (EXIT_FAILURE);
- }
- }
-@@ -953,7 +953,7 @@
- if (sigaction (signal, &action, NULL) == -1)
- {
- g_critical ("%s: failed to register %s handler",
-- __FUNCTION__, sys_siglist[signal]);
-+ __FUNCTION__, strsignal(termination_signal));
- exit (EXIT_FAILURE);
- }
- }
-@@ -1258,7 +1258,7 @@
- if (termination_signal)
- {
- g_debug ("Received %s signal",
-- sys_siglist[termination_signal]);
-+ strsignal(termination_signal));
- cleanup ();
- /* Raise signal again, to exit with the correct return value. */
- setup_signal_handler (termination_signal, SIG_DFL, 0);
-@@ -1347,7 +1347,7 @@
- if (termination_signal)
- {
- g_debug ("Received %s signal",
-- sys_siglist[termination_signal]);
-+ strsignal(termination_signal));
- cleanup ();
- /* Raise signal again, to exit with the correct return value. */
- setup_signal_handler (termination_signal, SIG_DFL, 0);
---- ./src/manage_sql.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/manage_sql.c 2020-10-27 13:36:19.071426148 +0100
-@@ -18711,7 +18711,7 @@
- void
- manage_cleanup_process_error (int signal)
- {
-- g_debug ("Received %s signal", sys_siglist[signal]);
-+ g_debug ("Received %s signal", strsignal(signal));
- if (sql_is_open ())
- {
- if (current_scanner_task)
---- ./src/gmpd.c 2020-05-12 18:54:26.000000000 +0200
-+++ ./src/gmpd.c 2020-10-27 13:46:29.687439101 +0100
-@@ -496,8 +496,7 @@
- {
- g_debug ("%s: Received %s signal.",
- __FUNCTION__,
-- sys_siglist[get_termination_signal()]);
--
-+ strsignal(get_termination_signal()));
- goto client_free;
- }
-
diff --git a/net-analyzer/gvmd/files/gvmd-startpre.sh b/net-analyzer/gvmd/files/gvmd-startpre.sh
deleted file mode 100644
index 5ba4b5c273c9..000000000000
--- a/net-analyzer/gvmd/files/gvmd-startpre.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-# Greenbone Vulnerability Manager Systemd ExecStartPre
-touch /var/run/gvm-{checking,create-functions,helping,migrating,serving}
-chown -R gvm:gvm /var/run/gvm-{checking,create-functions,helping,migrating,serving}
-touch /var/run/feed-update.lock
-chown gvm:gvm /var/run/feed-update.lock
diff --git a/net-analyzer/gvmd/files/gvmd.logrotate b/net-analyzer/gvmd/files/gvmd.logrotate
deleted file mode 100644
index 453462575f8b..000000000000
--- a/net-analyzer/gvmd/files/gvmd.logrotate
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# Daemon ignore HUP so we use 'copytruncate' instead of 'create'
-# with safe file size to prevent losing log entries.
-
-/var/log/gvm/gvmd.log {
- compress
- missingok
- notifempty
- sharedscripts
- copytruncate
- maxsize 10M
-}
diff --git a/net-analyzer/gvmd/files/gvmd.service b/net-analyzer/gvmd/files/gvmd.service
deleted file mode 100644
index 2e3ad84c85a5..000000000000
--- a/net-analyzer/gvmd/files/gvmd.service
+++ /dev/null
@@ -1,21 +0,0 @@
-[Unit]
-Description=Greenbone Vulnerability Manager
-After=network.target
-After=openvassd.service
-Wants=openvassd.service
-Before=gsad.service
-
-[Service]
-Type=forking
-PrivateTmp=yes
-User=gvm
-Group=gvm
-PermissionsStartOnly=true
-EnvironmentFile=-/etc/gvm/sysconfig/gvmd-daemon.conf
-ExecStartPre=-/etc/gvm/gvmd-startpre.sh
-ExecStart=/usr/bin/gvmd $GVMD_OPTIONS $GVMD_LISTEN_ADDRESS_TCP $GVMD_PORT $GVMD_SCANNER_HOST $GVMD_GNUTLS_PRIORITIES
-Restart=on-failure
-RestartSec=10
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-analyzer/gvmd/gvmd-20.8.1.ebuild b/net-analyzer/gvmd/gvmd-20.8.1.ebuild
deleted file mode 100644
index 87213ec32152..000000000000
--- a/net-analyzer/gvmd/gvmd-20.8.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/ https://github.com/greenbone/gvmd/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/j-licht/gvmd_report_formats/archive/v0.1.tar.gz -> gvm-report-formats-0.1.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- acct-group/gvm
- acct-user/gvm
- dev-db/postgresql:*[uuid]
- dev-libs/libgcrypt:0=
- dev-libs/libical
- >=net-analyzer/gvm-libs-20.8.0
- net-libs/gnutls:=[tools]
- extras? (
- app-text/xmlstarlet
- dev-texlive/texlive-latexextra )"
-
-RDEPEND="
- ${DEPEND}
- net-analyzer/ospd-openvas"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- extras? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-libs/libxslt
- )
- test? ( dev-libs/cgreen )"
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
- sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" doc/CMakeLists.txt || die
- sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" CMakeLists.txt || die
- # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
- if use extras; 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"
- "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- fi
- if use test; then
- cmake_build tests
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use extras; then
- local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
- fi
- cmake_src_install
-
- #QA-Fix
- rm -r "${D}/usr/etc" || die
-
- insinto /etc/gvm
- doins -r "${FILESDIR}"/*sync*
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${PN}-daemon.conf"
-
- exeinto /etc/gvm
- doexe "${FILESDIR}"/gvmd-startpre.sh
-
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${PN}.init" "${PN}"
- newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/gvm/gvmd
- fowners -R gvm:gvm /var/lib/gvm
-
- #add report formats from old version for migration
- insinto /usr/share/gvm/gvmd/
- doins -r "${WORKDIR}/gvmd_report_formats-0.1/report_formats/"
-}
diff --git a/net-analyzer/gvmd/gvmd-9.0.1.ebuild b/net-analyzer/gvmd/gvmd-9.0.1.ebuild
deleted file mode 100644
index 2e848ce6b59a..000000000000
--- a/net-analyzer/gvmd/gvmd-9.0.1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake systemd toolchain-funcs
-
-DESCRIPTION="Greenbone vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net/en/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
-IUSE="extras test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-db/postgresql:*[uuid]
- dev-libs/libgcrypt:0=
- dev-libs/libical
- >=net-analyzer/gvm-libs-11.0.1
- net-libs/gnutls:=[tools]
- extras? (
- app-text/xmlstarlet
- dev-texlive/texlive-latexextra )"
-
-RDEPEND="
- ${DEPEND}
- acct-user/gvm
- net-analyzer/ospd-openvas"
-
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- extras? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-libs/libxslt
- )
- test? ( dev-libs/cgreen )"
-
-PATCHES=(
- # Replace deprecated glibc sys_siglist with strsignal
- "${FILESDIR}/${P}-glibc_siglist.patch"
-)
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
- sed -i -e "s*share/doc/gvm/html/*share/doc/gvmd-${PV}/html/*g" "${S}"/doc/CMakeLists.txt || die
- sed -i -e "s*/doc/gvm/*/doc/gvmd-${PV}/*g" "${S}"/CMakeLists.txt || die
- # QA-Fix | Remove !CLANG Doxygen warnings for 9.0.0
- if use extras; 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"
- "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use extras; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- fi
- if use test; then
- cmake_build tests
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use extras; then
- local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
- fi
- cmake_src_install
-
- insinto /etc/gvm
- doins -r "${FILESDIR}"/*sync*
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${PN}-daemon.conf"
-
- exeinto /etc/gvm
- doexe "${FILESDIR}"/gvmd-startpre.sh
-
- fowners -R gvm:gvm /etc/gvm
-
- newinitd "${FILESDIR}/${PN}.init" "${PN}"
- newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
- systemd_dounit "${FILESDIR}/${PN}.service"
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/gvm/gvmd
- fowners -R gvm:gvm /var/lib/gvm
-}
diff --git a/net-analyzer/gvmd/metadata.xml b/net-analyzer/gvmd/metadata.xml
index d60e9b09e0d8..f0294aac8dd0 100644
--- a/net-analyzer/gvmd/metadata.xml
+++ b/net-analyzer/gvmd/metadata.xml
@@ -9,14 +9,11 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <use>
- <flag name="extras">Html docs support</flag>
- </use>
<longdescription lang="en">
The Greenbone Vulnerability Manager is the central management service between security scanners and the user clients.
It manages the storage of any vulnerability management configurations and of the scan results.
Access to data, control commands and workflows is offered via the XML-based Greenbone Management Protocol (GMP).
- The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other
+ The primary scanner OpenVAS Scanner is controlled directly via protocol OTP while any other
remote scanner is coupled with the Open Scanner Protocol (OSP).
</longdescription>
<upstream>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2023-08-11 9:08 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2023-08-11 9:08 UTC (permalink / raw
To: gentoo-commits
commit: 185faa639e85ec71c399afc38cd9f9e25f51242d
Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Wed Aug 9 13:57:59 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 09:07:54 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185faa63
net-analyzer/gvmd: fix OpenRC script
Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32232
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/gvmd/files/gvmd-22.init | 15 ++++-----------
net-analyzer/gvmd/files/gvmd-daemon-22.conf | 3 +++
.../gvmd/{gvmd-22.6.0.ebuild => gvmd-22.6.0-r1.ebuild} | 3 ---
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init
index f1ac6ddbac72..8fd1a0bfb335 100644
--- a/net-analyzer/gvmd/files/gvmd-22.init
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -3,14 +3,14 @@
# Distributed under the terms of the GNU General Public License v2
: ${GVMD_USER:=gvm}
-: ${GVMD_GROUP:=gvm}
+: ${GVMD_GROUP:=$(id -ng ${GVMD_USER})}
: ${GVMD_TIMEOUT:=30}
name="Greenbone Vulnerability Manager"
command=/usr/bin/gvmd
-command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
+command_args="${GVMD_VT_UPDATE} ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
command_user="${GVMD_USER}:${GVMD_GROUP}"
-pidfile="/run/gvmd/gvmd.pid"
+pidfile="/var/run/gvmd/gvmd.pid"
retry="${GVMD_TIMEOUT}"
depend() {
@@ -19,12 +19,5 @@ depend() {
}
start_pre() {
- mkdir /run/gvmd
- for p in gvm-checking gvm-create-functions gvm-helping gvm-migrating gvm-serving; do
- touch /run/gvmd/${p}
- done
- chown -R gvm:gvm /run/gvmd/
-
- touch /run/feed-update.lock
- chown gvm:gvm /run/feed-update.lock
+ checkpath -d --owner ${GVMD_USER} /var/run/gvmd
}
diff --git a/net-analyzer/gvmd/files/gvmd-daemon-22.conf b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
index e1a5482747fc..061609e1c45c 100644
--- a/net-analyzer/gvmd/files/gvmd-daemon-22.conf
+++ b/net-analyzer/gvmd/files/gvmd-daemon-22.conf
@@ -25,5 +25,8 @@ GVMD_LISTEN_MODE="--listen-mode=755"
# Scanner listen address unix socket
GVMD_SCANNER_HOST="--scanner-host=/run/ospd/ospd-openvas.sock"
+# Update vt
+GVMD_VT_UPDATE="--osp-vt-update=/run/ospd/ospd-openvas.sock"
+
# TLS settings
GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"
diff --git a/net-analyzer/gvmd/gvmd-22.6.0.ebuild b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
similarity index 97%
rename from net-analyzer/gvmd/gvmd-22.6.0.ebuild
rename to net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
index 22ce3ef705d4..d7a4a809642a 100644
--- a/net-analyzer/gvmd/gvmd-22.6.0.ebuild
+++ b/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
@@ -112,9 +112,6 @@ src_install() {
fowners -R gvm:gvm /var/lib/gvm
fi
- dosbin "${FILESDIR}"/gvm-sync-all
- systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
-
systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \
${PN}.service
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2023-10-07 15:11 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2023-10-07 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 1ff581ec290adc8200fd0cff00adb4a562100543
Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Thu Oct 5 08:19:54 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sat Oct 7 15:10:59 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ff581ec
net-analyzer/gvmd: add 22.9.0, drop 22.5.5 22.6.0-r1
Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33202
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/gvmd/Manifest | 3 +-
net-analyzer/gvmd/files/gvmd-22.init | 5 +-
net-analyzer/gvmd/gvmd-22.5.5.ebuild | 129 ---------------------
.../{gvmd-22.6.0-r1.ebuild => gvmd-22.9.0.ebuild} | 4 +-
4 files changed, 7 insertions(+), 134 deletions(-)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 3cccf7e33ac5..86e27e18ee6d 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,3 +1,2 @@
DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
-DIST gvmd-22.5.5.tar.gz 1034891 BLAKE2B 86382768133d18be08d5536ad02e501affa9c3c70ed592bffa85d0d043b1dfdb6201efcf6cbe7561a987aa7975a17236e8cd6c9382a0ffe9e123d18b221932c2 SHA512 65813ff623e62c9c8b46870617cfeaed7bc4ccc54ce5b4423e0eb93b3e91fbdcf47fc47f71a182d0aa3305267e0bde4d06975d40691ec1199780c10e6d815cf0
-DIST gvmd-22.6.0.tar.gz 1039082 BLAKE2B 0e6e53ce990090e212e035f2224bfa84c906f130dd5a33f5e57a53b3a5b82afac725db4412c5d0f3de0abc2fada5120845eaf3b93db18aa1137c948a14964594 SHA512 de6688dfd19b9bb779a963b3f8607818dad13da4024b7e0a0e80649cb11bbcf0a65bf1b72eaf5408ead2dabff2e806a0f7dd8472c6f314774b82fcd01fb37b37
+DIST gvmd-22.9.0.tar.gz 1040655 BLAKE2B b2d7ebd6d29a44eef34000cf1c158cc1053398a685f5db3fe001d3074aad79fef4ee940572f172acdc4b9cef7c31a43742e9aed3f6a228b97e5d6ca79ee77f84 SHA512 231deb33023a2812dbeb7a4dd670c622a5012002c5b478bae906d1877a2dd036777c61247eb3128cbffd7cbb021c11a12f81b1bf16bf61b960ad4fa498f62c7e
diff --git a/net-analyzer/gvmd/files/gvmd-22.init b/net-analyzer/gvmd/files/gvmd-22.init
index 8fd1a0bfb335..9b2a5a6f69a7 100644
--- a/net-analyzer/gvmd/files/gvmd-22.init
+++ b/net-analyzer/gvmd/files/gvmd-22.init
@@ -10,14 +10,15 @@ name="Greenbone Vulnerability Manager"
command=/usr/bin/gvmd
command_args="${GVMD_VT_UPDATE} ${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
command_user="${GVMD_USER}:${GVMD_GROUP}"
-pidfile="/var/run/gvmd/gvmd.pid"
+pidfile="/run/gvmd/gvmd.pid"
retry="${GVMD_TIMEOUT}"
depend() {
after bootmisc postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15
+ want postgresql postgresql-9.6 postgresql-10 postgresql-11 postgresql-12 postgresql-13 postgresql-14 postgresql-15
need localmount net ospd-openvas
}
start_pre() {
- checkpath -d --owner ${GVMD_USER} /var/run/gvmd
+ checkpath -d --owner ${GVMD_USER} /run/gvmd
}
diff --git a/net-analyzer/gvmd/gvmd-22.5.5.ebuild b/net-analyzer/gvmd/gvmd-22.5.5.ebuild
deleted file mode 100644
index 22ce3ef705d4..000000000000
--- a/net-analyzer/gvmd/gvmd-22.5.5.ebuild
+++ /dev/null
@@ -1,129 +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 vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- acct-user/gvm
- app-crypt/gpgme:1=
- >=dev-db/postgresql-9.6:=[uuid]
- >=dev-libs/glib-2.42:2
- >=dev-libs/libical-1.0.0
- >=net-analyzer/gvm-libs-20.08.0
- >=net-libs/gnutls-3.2.15[tools]
-"
-# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
-# and xmlstartlet are used for (PDF) report generator at runtime.
-RDEPEND="
- ${DEPEND}
- app-text/xmlstarlet
- dev-perl/XML-Twig
- dev-texlive/texlive-latexextra
- >=net-analyzer/ospd-openvas-22.4
- >=dev-db/pg-gvm-22.4
-"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-libs/libxslt
- )
- test? ( dev-libs/cgreen )
-"
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
- sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die
- sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die
- # 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"
- "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
- "-DGVM_DEFAULT_DROP_USER=gvm"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- fi
- if use test; then
- cmake_build tests
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use doc; then
- local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
- fi
- cmake_src_install
-
- insinto /etc/gvm/sysconfig
- newins "${FILESDIR}/${PN}-daemon-22.conf" "${PN}-daemon.conf"
- if ! use prefix; then
- fowners -R gvm:gvm /etc/gvm
- fi
-
- newinitd "${FILESDIR}/${PN}-22.init" "${PN}"
- newconfd "${FILESDIR}/${PN}-daemon-22.conf" "${PN}"
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/gvm/gvmd
- if ! use prefix; then
- fowners -R gvm:gvm /var/lib/gvm
- fi
-
- dosbin "${FILESDIR}"/gvm-sync-all
- systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
-
- systemd_install_serviced "${FILESDIR}/gvmd.service.conf" \
- ${PN}.service
-}
-
-pkg_postinst() {
- elog "If you are upgrading from a previous version, you need to update the database version."
- elog "Please, create the running directory and give write permission to the database user"
- elog "then run gvmd as the gvm user with --migrate option:"
- elog "~# mkdir /run/gvmd"
- elog "~# setfacl -m u:gvm:rwx /run/gvmd/"
- elog "~# sudo -u gvm gvmd --migrate"
-}
diff --git a/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild b/net-analyzer/gvmd/gvmd-22.9.0.ebuild
similarity index 98%
rename from net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
rename to net-analyzer/gvmd/gvmd-22.9.0.ebuild
index d7a4a809642a..19e29eb08e9c 100644
--- a/net-analyzer/gvmd/gvmd-22.6.0-r1.ebuild
+++ b/net-analyzer/gvmd/gvmd-22.9.0.ebuild
@@ -18,12 +18,14 @@ RESTRICT="!test? ( test )"
DEPEND="
acct-user/gvm
app-crypt/gpgme:1=
+ dev-libs/libbsd
>=dev-db/postgresql-9.6:=[uuid]
>=dev-libs/glib-2.42:2
>=dev-libs/libical-1.0.0
- >=net-analyzer/gvm-libs-20.08.0
+ >=net-analyzer/gvm-libs-22.7
>=net-libs/gnutls-3.2.15[tools]
"
+
# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
# and xmlstartlet are used for (PDF) report generator at runtime.
RDEPEND="
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
@ 2023-11-14 7:53 Florian Schmaus
0 siblings, 0 replies; 9+ messages in thread
From: Florian Schmaus @ 2023-11-14 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 4d46e157b5c68d44e955627f61c95164ad0ea57b
Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com>
AuthorDate: Mon Nov 13 19:57:00 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 07:52:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d46e157
net-analyzer/gvmd: drop 21.4.5-r5
Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33801
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-analyzer/gvmd/Manifest | 1 -
net-analyzer/gvmd/files/gvm-sync-all | 31 -------
net-analyzer/gvmd/files/gvm-sync-all.service | 7 --
net-analyzer/gvmd/files/gvm-sync-all.timer | 9 --
net-analyzer/gvmd/files/gvmd-21.4.5.init | 30 -------
net-analyzer/gvmd/files/gvmd-daemon.conf | 29 ------
net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild | 129 ---------------------------
7 files changed, 236 deletions(-)
diff --git a/net-analyzer/gvmd/Manifest b/net-analyzer/gvmd/Manifest
index 86e27e18ee6d..7da58754e390 100644
--- a/net-analyzer/gvmd/Manifest
+++ b/net-analyzer/gvmd/Manifest
@@ -1,2 +1 @@
-DIST gvmd-21.4.5.tar.gz 1041186 BLAKE2B 18edc375084a6c6445f12779935e34d20826d2390481cbcdc06cab8dea81ea9c6bddeda437b081137f858e860f725431d33d5654eae231e303e0dc5618a89c8a SHA512 5b22b9bfd58ae73fb973941c7a96027599ccc5b78d822eac9c840460cb75bf60a398519569daa04d5c4d935dbe3974335f87e2c1c5fa751b4cec1ea6e5f064ec
DIST gvmd-22.9.0.tar.gz 1040655 BLAKE2B b2d7ebd6d29a44eef34000cf1c158cc1053398a685f5db3fe001d3074aad79fef4ee940572f172acdc4b9cef7c31a43742e9aed3f6a228b97e5d6ca79ee77f84 SHA512 231deb33023a2812dbeb7a4dd670c622a5012002c5b478bae906d1877a2dd036777c61247eb3128cbffd7cbb021c11a12f81b1bf16bf61b960ad4fa498f62c7e
diff --git a/net-analyzer/gvmd/files/gvm-sync-all b/net-analyzer/gvmd/files/gvm-sync-all
deleted file mode 100644
index d12b860e7fcb..000000000000
--- a/net-analyzer/gvmd/files/gvm-sync-all
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-case ${USER} in
- root)
- exec su --shell /bin/bash --command "$0 $@" gvm
- ;;
- gvm)
- ;;
- *)
- >&2 echo "Must be run as root or gvm user not ${USER}"
- exit 1
- ;;
-esac
-
-while getopts d OPTION "$@"; do
- case ${OPTION} in
- d)
- set -x
- ;;
- esac
-done
-shift $((OPTIND - 1))
-
-greenbone-nvt-sync
-# Note that Greenbone recommends to sync CERT *after* SCAP, as the
-# former depends on the later. See
-# https://github.com/greenbone/gvmd/blob/main/INSTALL.md#keeping-the-feeds-up-to-date
-for FEED_TYPE in SCAP CERT GVMD_DATA; do
- greenbone-feed-sync --type ${FEED_TYPE}
-done
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.service b/net-analyzer/gvmd/files/gvm-sync-all.service
deleted file mode 100644
index a82e2950f3fd..000000000000
--- a/net-analyzer/gvmd/files/gvm-sync-all.service
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Update all feeds of the Greenbone Vulerability Management (GMV) suite
-After=network-online.target
-
-[Service]
-ExecStart=/usr/sbin/gvm-sync-all
-User=gvm
diff --git a/net-analyzer/gvmd/files/gvm-sync-all.timer b/net-analyzer/gvmd/files/gvm-sync-all.timer
deleted file mode 100644
index 9faf470e013c..000000000000
--- a/net-analyzer/gvmd/files/gvm-sync-all.timer
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite
-
-[Timer]
-OnCalendar=daily
-RandomizedDelaySec=2hour
-
-[Install]
-WantedBy=timers.target
diff --git a/net-analyzer/gvmd/files/gvmd-21.4.5.init b/net-analyzer/gvmd/files/gvmd-21.4.5.init
deleted file mode 100644
index 047ad8446a4f..000000000000
--- a/net-analyzer/gvmd/files/gvmd-21.4.5.init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-: ${GVMD_USER:=gvm}
-: ${GVMD_GROUP:=gvm}
-: ${GVMD_TIMEOUT:=30}
-
-name="Greenbone Vulnerability Manager"
-command=/usr/bin/gvmd
-command_args="${GVMD_OPTIONS} ${GVMD_LISTEN_ADDRESS_TCP} ${GVMD_PORT} ${GVMD_SCANNER_HOST} ${GVMD_GNUTLS_PRIORITIES}"
-command_user="${GVMD_USER}:${GVMD_GROUP}"
-pidfile="/run/gvmd/gvmd.pid"
-retry="${GVMD_TIMEOUT}"
-
-depend() {
- after bootmisc
- need localmount net ospd-openvas
-}
-
-start_pre() {
- mkdir /run/gvmd
- for p in gvm-checking gvm-create-functions gvm-helping gvm-migrating gvm-serving; do
- touch /run/gvmd/${p}
- done
- chown -R gvm:gvm /run/gvmd/
-
- touch /run/feed-update.lock
- chown gvm:gvm /run/feed-update.lock
-}
diff --git a/net-analyzer/gvmd/files/gvmd-daemon.conf b/net-analyzer/gvmd/files/gvmd-daemon.conf
deleted file mode 100644
index d97da00c7688..000000000000
--- a/net-analyzer/gvmd/files/gvmd-daemon.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-# GVMD command args
-
-# e.g --foreground
-GVMD_OPTIONS=""
-
-# Manager listen address unix socket
-# Failing under non-root user (looking for solution)
-GVMD_LISTEN_ADDRESS_UNIX="--unix-socket=/var/run/gvmd.sock"
-
-# Manager listen address TCP
-GVMD_LISTEN_ADDRESS_TCP="--listen=127.0.0.1"
-
-# Manager listen port
-GVMD_PORT="--port=9390"
-
-# Manager unix socket listen owner
-GVMD_LISTEN_OWNER="--listen-owner=gvm"
-
-# Manager unix socket listen group
-GVMD_LISTEN_GROUP="--listen-group=gvm"
-
-# Manager unix socket listen mode
-GVMD_LISTEN_MODE="--listen-mode=755"
-
-# Scanner listen address unix socket
-GVMD_SCANNER_HOST="--scanner-host=/var/run/openvassd.sock"
-
-# TLS settings
-GVMD_GNUTLS_PRIORITIES="--gnutls-priorities=SECURE256:+SUITEB192:+SECURE192:+SECURE128:+SUITEB128:-MD5:-SHA1:-VERS-TLS1.0:-VERS-TLS1.1:-VERS-SSL3.0"
diff --git a/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild
deleted file mode 100644
index 05dd1b3e920e..000000000000
--- a/net-analyzer/gvmd/gvmd-21.4.5-r5.ebuild
+++ /dev/null
@@ -1,129 +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 vulnerability manager, previously named openvas-manager"
-HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
-SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- acct-group/gvm
- acct-user/gvm
- app-crypt/gpgme:1=
- dev-db/postgresql:*[uuid]
- dev-libs/glib:2
- dev-libs/libical:=
- >=net-analyzer/gvm-libs-21.4.4
- net-libs/gnutls:=[tools]
-"
-# gvmd (optionally) uses xml_split from XML-Twig at runtime. And texlive
-# and xmlstartlet are used for (PDF) report generator at runtime.
-RDEPEND="
- ${DEPEND}
- app-text/xmlstarlet
- dev-perl/XML-Twig
- dev-texlive/texlive-latexextra
- net-analyzer/ospd-openvas
-"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
- doc? (
- app-doc/doxygen[dot]
- app-doc/xmltoman
- app-text/htmldoc
- dev-libs/libxslt
- )
- test? ( dev-libs/cgreen )
-"
-
-src_prepare() {
- cmake_src_prepare
- # QA-Fix | Use correct FHS/Gentoo policy paths for 9.0.0
- sed -i -e "s*share/doc/gvm/html/*share/doc/${PF}/html/*g" doc/CMakeLists.txt || die
- sed -i -e "s*/doc/gvm/*/doc/${PF}/*g" CMakeLists.txt || die
- # 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
-
- # https://github.com/greenbone/gvmd/pull/1819
- sed -i "/^EnvironmentFile/d" config/gvmd.service.in || die
-
- # Upstream 3ebab6044818f1710b73c04e94fd9bea148c9853
- sed -i \
- -e 's/^RuntimeDirectory=gvm/RuntimeDirectory=gvmd/' \
- -e 's/GVM_RUN_DIR/GVMD_RUN_DIR/' \
- config/gvmd.service.in || die
-
- # https://github.com/greenbone/gvmd/pull/1824
- sed -i '/^install (DIRECTORY DESTINATION ${GVMD_RUN_DIR})/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- "-DLOCALSTATEDIR=${EPREFIX}/var"
- "-DSYSCONFDIR=${EPREFIX}/etc"
- "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
- "-DSBINDIR=${EPREFIX}/usr/bin"
- "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
- "-DGVM_DEFAULT_DROP_USER=gvm"
- )
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile
- if use doc; then
- cmake_build -C "${BUILD_DIR}" doc
- cmake_build doc-full -C "${BUILD_DIR}" doc
- fi
- if use test; then
- cmake_build tests
- fi
- cmake_build rebuild_cache
-}
-
-src_install() {
- if use doc; then
- local HTML_DOCS=( "${BUILD_DIR}"/doc/generated/html/. )
- fi
- cmake_src_install
-
- insinto /etc/gvm/sysconfig
- doins "${FILESDIR}/${PN}-daemon.conf"
- if ! use prefix; then
- fowners -R gvm:gvm /etc/gvm
- fi
-
- newinitd "${FILESDIR}/${P}.init" "${PN}"
- newconfd "${FILESDIR}/${PN}-daemon.conf" "${PN}"
-
- # Set proper permissions on required files/directories
- keepdir /var/lib/gvm/gvmd
- if ! use prefix; then
- fowners -R gvm:gvm /var/lib/gvm
- fi
-
- dosbin "${FILESDIR}"/gvm-sync-all
- systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
-}
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2023-11-14 7:53 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-28 7:51 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-11-14 7:53 Florian Schmaus
2023-10-07 15:11 Florian Schmaus
2023-08-11 9:08 Florian Schmaus
2022-05-10 19:54 Florian Schmaus
2022-05-09 12:07 Florian Schmaus
2022-05-02 14:26 Florian Schmaus
2021-01-21 7:14 Joonas Niilola
2020-03-25 13:46 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox