commit: 4339e4fae61334e298b398bf020f191c78bd20ab Author: Giuseppe Foti <foti.giuseppe <AT> gmail <DOT> com> AuthorDate: Sat Oct 7 15:47:40 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Oct 9 10:54:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4339e4fa
net-analyzer/openvas-scanner: add 22.7.5, drop 22.7.3-r1 Signed-off-by: Giuseppe Foti <foti.giuseppe <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/33231 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-analyzer/openvas-scanner/Manifest | 3 +-- net-analyzer/openvas-scanner/files/redis-openvas.confd | 2 +- net-analyzer/openvas-scanner/files/redis-openvas.initd | 8 ++++++-- ...anner-22.7.3-r1.ebuild => openvas-scanner-22.7.5.ebuild} | 13 +++---------- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/net-analyzer/openvas-scanner/Manifest b/net-analyzer/openvas-scanner/Manifest index b2e13b849c4b..1d93a64ae0d6 100644 --- a/net-analyzer/openvas-scanner/Manifest +++ b/net-analyzer/openvas-scanner/Manifest @@ -1,3 +1,2 @@ DIST openvas-scanner-21.4.4.tar.gz 460601 BLAKE2B 66d627e76912735539399aed637fdc07a7d13c9e4eb142498dcf181b8ea952dd93107bcc1f2ef577126178ff3dad1e5f6e50d67840692cd49f7352e3a726ce8f SHA512 f2fe1f802b14fc41ee0d7657d031d318b651c3ec9ef554b33379a7459d40c17b44525c8f666ccb9670868576c101766936dd0c700778e46683bf43f0683834b6 -DIST openvas-scanner-22.7.3-fix-automagic-dep-on-snmp.patch 2669 BLAKE2B 1ac0478c23d8102d0928552acefff01661db55949cf4f0540d9a8608078ff01e5d794f7a851095cfcdd49657593e7ba2340c665b3f87615ae4ca7cee2eb1248a SHA512 7dc3cf4d39733706516909e4724272abf17cd20b9a6104b6a03166056415905748c72ad629258a430e19aed553cc1659587c0a0b6c7991c35605ee82e9caea5b -DIST openvas-scanner-22.7.3.tar.gz 962647 BLAKE2B d3ce0be58b41bef6c01c5e831307713fa95913dae70cb6e67d82c196793817f516429f2ef1efffcc58863165913524a10465f33aac5f283d94d21595aaad360c SHA512 c729fca47534e289c26f5c5ad1766fe0101b1fc287609d5b40c65108152b1069b759ecfd6375999b6384b2b90ffff420336f5ce134256bd1a5fec5b5523a8272 +DIST openvas-scanner-22.7.5.tar.gz 976268 BLAKE2B 0a8b2ce275de5baec614e18164fcc13029373233e3e6acc31124e0660c9c82a8aabf2913223983014518fefe534048fd8a23a7457727ffa165c8a3ea58cd44d0 SHA512 cdbafb80e74f948043cae87e27a10df5fb7af1bb4112a3fd593f60233fd3c9a46d3ffb80b1fce195bed7de6308228b3fe7fcbff6ed493791627bdd3767987261 diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.confd b/net-analyzer/openvas-scanner/files/redis-openvas.confd index 2e9ec5cfbf16..6a75dfdc7d28 100644 --- a/net-analyzer/openvas-scanner/files/redis-openvas.confd +++ b/net-analyzer/openvas-scanner/files/redis-openvas.confd @@ -8,7 +8,7 @@ REDIS_GROUP="gvm" REDIS_CONF="/etc/gvm/redis-openvas.conf" # Redis dump directory. -REDIS_DIR="/var/lib/gvm/redis" +REDIS_DIR="/var/lib/openvas/redis" # Redis options. # (Redis expects the first argument to be the configuration file.) diff --git a/net-analyzer/openvas-scanner/files/redis-openvas.initd b/net-analyzer/openvas-scanner/files/redis-openvas.initd index 5c50d29dae6a..058d99d063dc 100644 --- a/net-analyzer/openvas-scanner/files/redis-openvas.initd +++ b/net-analyzer/openvas-scanner/files/redis-openvas.initd @@ -1,8 +1,8 @@ #!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2023 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -: ${REDIS_DIR:=/var/lib/gvm/redis} +: ${REDIS_DIR:=/var/lib/openvas/redis} : ${REDIS_CONF:=/etc/gvm/redis-openvas.conf} : ${REDIS_OPTS:="${REDIS_CONF}"} : ${REDIS_USER:=gvm} @@ -19,6 +19,10 @@ pidfile="/run/${RC_SVCNAME}/redis-server.pid" retry="${REDIS_TIMEOUT}" start_stop_daemon_args="--chdir \"${REDIS_DIR}\"" +start_post() { + checkpath -f --mode 0644 --owner ${REDIS_USER}:${REDIS_GROUP} /var/log/gvm/openvas.log +} + depend() { use localmount logger after keepalived diff --git a/net-analyzer/openvas-scanner/openvas-scanner-22.7.3-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-22.7.5.ebuild similarity index 92% rename from net-analyzer/openvas-scanner/openvas-scanner-22.7.3-r1.ebuild rename to net-analyzer/openvas-scanner/openvas-scanner-22.7.5.ebuild index 096f3452f3ff..2d19d16186c3 100644 --- a/net-analyzer/openvas-scanner/openvas-scanner-22.7.3-r1.ebuild +++ b/net-analyzer/openvas-scanner/openvas-scanner-22.7.5.ebuild @@ -11,8 +11,6 @@ DESCRIPTION="Open Vulnerability Assessment Scanner" HOMEPAGE="https://www.greenbone.net https://github.com/greenbone/openvas-scanner/"; SRC_URI=" https://github.com/greenbone/openvas-scanner/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/greenbone/openvas-scanner/commit/c9ba348e1a7fa99a0b41a0e53f251309f2768187.patch - -> ${PN}-22.7.3-fix-automagic-dep-on-snmp.patch " SLOT="0" @@ -23,14 +21,14 @@ RESTRICT="!test? ( test )" DEPEND=" acct-user/gvm - dev-db/redis - dev-libs/glib:2 + >=dev-db/redis-5.0.3 + >=dev-libs/glib-2.42:2 >=dev-libs/json-glib-1.4.4 >=net-libs/gnutls-3.2.15 >=net-analyzer/gvm-libs-22.4 net-libs/libpcap app-crypt/gpgme:= - dev-libs/libgcrypt:= + >=dev-libs/libgcrypt-1.6 dev-libs/libgpg-error >=dev-libs/libksba-1.0.7 >=net-libs/libssh-0.6.0 @@ -53,11 +51,6 @@ BDEPEND=" test? ( dev-libs/cgreen ) " -PATCHES=( - # Fix https://bugs.gentoo.org/911114 - "${DISTDIR}"/${PN}-22.7.3-fix-automagic-dep-on-snmp.patch -) - src_prepare() { cmake_src_prepare # QA-Fix | Correct FHS/Gentoo policy paths for 7.0.0
