Gentoo Archives: gentoo-commits

From: Florian Schmaus <flow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/gvmd/, net-analyzer/gvmd/files/
Date: Mon, 09 May 2022 12:07:27
Message-Id: 1652098036.123dc0e869f647b8d0009e5fdd2152a74ec11227.flow@gentoo
1 commit: 123dc0e869f647b8d0009e5fdd2152a74ec11227
2 Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 9 11:50:33 2022 +0000
4 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
5 CommitDate: Mon May 9 12:07:16 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123dc0e8
7
8 net-analyzer/gvmd: fix LICENSE, gvm-sync-all helper, GVM_DEFAULT_DROP_USER
9
10 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
11
12 net-analyzer/gvmd/files/gvm-sync-all | 31 ++++++++++++++++++++++
13 net-analyzer/gvmd/files/gvm-sync-all.service | 7 +++++
14 net-analyzer/gvmd/files/gvm-sync-all.timer | 9 +++++++
15 ...gvmd-21.4.5-r3.ebuild => gvmd-21.4.5-r4.ebuild} | 6 ++++-
16 4 files changed, 52 insertions(+), 1 deletion(-)
17
18 diff --git a/net-analyzer/gvmd/files/gvm-sync-all b/net-analyzer/gvmd/files/gvm-sync-all
19 new file mode 100644
20 index 000000000000..d12b860e7fcb
21 --- /dev/null
22 +++ b/net-analyzer/gvmd/files/gvm-sync-all
23 @@ -0,0 +1,31 @@
24 +#!/usr/bin/env bash
25 +set -euo pipefail
26 +
27 +case ${USER} in
28 + root)
29 + exec su --shell /bin/bash --command "$0 $@" gvm
30 + ;;
31 + gvm)
32 + ;;
33 + *)
34 + >&2 echo "Must be run as root or gvm user not ${USER}"
35 + exit 1
36 + ;;
37 +esac
38 +
39 +while getopts d OPTION "$@"; do
40 + case ${OPTION} in
41 + d)
42 + set -x
43 + ;;
44 + esac
45 +done
46 +shift $((OPTIND - 1))
47 +
48 +greenbone-nvt-sync
49 +# Note that Greenbone recommends to sync CERT *after* SCAP, as the
50 +# former depends on the later. See
51 +# https://github.com/greenbone/gvmd/blob/main/INSTALL.md#keeping-the-feeds-up-to-date
52 +for FEED_TYPE in SCAP CERT GVMD_DATA; do
53 + greenbone-feed-sync --type ${FEED_TYPE}
54 +done
55
56 diff --git a/net-analyzer/gvmd/files/gvm-sync-all.service b/net-analyzer/gvmd/files/gvm-sync-all.service
57 new file mode 100644
58 index 000000000000..a82e2950f3fd
59 --- /dev/null
60 +++ b/net-analyzer/gvmd/files/gvm-sync-all.service
61 @@ -0,0 +1,7 @@
62 +[Unit]
63 +Description=Update all feeds of the Greenbone Vulerability Management (GMV) suite
64 +After=network-online.target
65 +
66 +[Service]
67 +ExecStart=/usr/sbin/gvm-sync-all
68 +User=gvm
69
70 diff --git a/net-analyzer/gvmd/files/gvm-sync-all.timer b/net-analyzer/gvmd/files/gvm-sync-all.timer
71 new file mode 100644
72 index 000000000000..9faf470e013c
73 --- /dev/null
74 +++ b/net-analyzer/gvmd/files/gvm-sync-all.timer
75 @@ -0,0 +1,9 @@
76 +[Unit]
77 +Description=Daily update of all feeds of the Greenbone Vulerability Management (GMV) suite
78 +
79 +[Timer]
80 +OnCalendar=daily
81 +RandomizedDelaySec=2hour
82 +
83 +[Install]
84 +WantedBy=timers.target
85
86 diff --git a/net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild b/net-analyzer/gvmd/gvmd-21.4.5-r4.ebuild
87 similarity index 95%
88 rename from net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild
89 rename to net-analyzer/gvmd/gvmd-21.4.5-r4.ebuild
90 index ea09acaeeeb5..5b5e6ab83497 100644
91 --- a/net-analyzer/gvmd/gvmd-21.4.5-r3.ebuild
92 +++ b/net-analyzer/gvmd/gvmd-21.4.5-r4.ebuild
93 @@ -10,7 +10,7 @@ HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/gvmd/"
94 SRC_URI="https://github.com/greenbone/gvmd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
95
96 SLOT="0"
97 -LICENSE="GPL-2+"
98 +LICENSE="AGPL-3+"
99 KEYWORDS="~amd64 ~x86"
100 IUSE="doc test"
101 RESTRICT="!test? ( test )"
102 @@ -87,6 +87,7 @@ src_configure() {
103 "-DLIBDIR=${EPREFIX}/usr/$(get_libdir)"
104 "-DSBINDIR=${EPREFIX}/usr/bin"
105 "-DSYSTEMD_SERVICE_DIR=$(systemd_get_systemunitdir)"
106 + "-DGVM_DEFAULT_DROP_USER=gvm"
107 )
108 cmake_src_configure
109 }
110 @@ -123,4 +124,7 @@ src_install() {
111 if ! use prefix; then
112 fowners -R gvm:gvm /var/lib/gvm
113 fi
114 +
115 + dosbin "${FILESDIR}"/gvm-sync-all
116 + systemd_dounit "${FILESDIR}"/gvm-sync-all.{service,timer}
117 }