git: f851f5d9dac4 - 2023Q4 - security/gvm: Update gvm-libs to 22.7.3 and openvas to 22.7.6
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 23 Oct 2023 18:57:14 UTC
The branch 2023Q4 has been updated by acm:
URL: https://cgit.FreeBSD.org/ports/commit/?id=f851f5d9dac4f093ed436154538278805f31b662
commit f851f5d9dac4f093ed436154538278805f31b662
Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2023-10-20 23:49:47 +0000
Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2023-10-23 18:52:41 +0000
security/gvm: Update gvm-libs to 22.7.3 and openvas to 22.7.6
- Bump PORTREVISION
- Update security/py-python-gvm to 23.10.0
- Fix issues with config path of security/py-notus-scanner and
security/py-greenbone-feed-sync [1]
- Improve pkg-message.in from security/gvm [1]
Reported by: Luciano Mannucci <luciano at_ vespaperitivo.it> [1]
---
databases/pg-gvm/Makefile | 1 +
security/gsad/Makefile | 1 +
security/gvm-libs/Makefile | 2 +-
security/gvm-libs/distinfo | 6 +++---
security/gvm-libs/pkg-plist | 10 +++++-----
security/gvm/Makefile | 1 +
security/gvm/files/pkg-message.in | 6 +++---
security/gvmd/Makefile | 1 +
security/openvas/Makefile | 2 +-
security/openvas/distinfo | 6 +++---
security/openvas/pkg-plist | 4 ++--
security/py-greenbone-feed-sync/Makefile | 1 +
.../files/patch-greenbone-feed-sync_config.py | 7 ++++---
security/py-notus-scanner/Makefile | 1 +
.../files/patch-notus-scanner-cli_parser.py | 13 ++++++++-----
security/py-python-gvm/Makefile | 5 +++--
security/py-python-gvm/distinfo | 6 +++---
17 files changed, 42 insertions(+), 31 deletions(-)
diff --git a/databases/pg-gvm/Makefile b/databases/pg-gvm/Makefile
index f7b76bda5d7c..f8edc9d82be7 100644
--- a/databases/pg-gvm/Makefile
+++ b/databases/pg-gvm/Makefile
@@ -1,6 +1,7 @@
PORTNAME= pg-gvm
DISTVERSION= 22.6.1
DISTVERSIONPREFIX=v
+PORTREVISION= 1
CATEGORIES= databases devel
MAINTAINER= acm@FreeBSD.org
diff --git a/security/gsad/Makefile b/security/gsad/Makefile
index b071d3e32f86..b2931a4363b0 100644
--- a/security/gsad/Makefile
+++ b/security/gsad/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gsad
DISTVERSIONPREFIX= v
DISTVERSION= 22.6.0
+PORTREVISION= 1
CATEGORIES= security
MAINTAINER= acm@FreeBSD.org
diff --git a/security/gvm-libs/Makefile b/security/gvm-libs/Makefile
index 16be6138d866..5af1f1766dcc 100644
--- a/security/gvm-libs/Makefile
+++ b/security/gvm-libs/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gvm
DISTVERSIONPREFIX= v
-DISTVERSION= 22.7.1
+DISTVERSION= 22.7.3
CATEGORIES= security
PKGNAMESUFFIX= -libs
diff --git a/security/gvm-libs/distinfo b/security/gvm-libs/distinfo
index 9ce47deecc8a..13c053cbc31c 100644
--- a/security/gvm-libs/distinfo
+++ b/security/gvm-libs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695258196
-SHA256 (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = e016e9d16a2cf2cdd0c8b928c2d52be1468962870f93a1b82e4af737480644b5
-SIZE (greenbone-gvm-libs-v22.7.1_GH0.tar.gz) = 309225
+TIMESTAMP = 1697841226
+SHA256 (greenbone-gvm-libs-v22.7.3_GH0.tar.gz) = af081e5cca0736063076246282a416fba016131f44f7407b2702ae7dfb96016d
+SIZE (greenbone-gvm-libs-v22.7.3_GH0.tar.gz) = 309842
diff --git a/security/gvm-libs/pkg-plist b/security/gvm-libs/pkg-plist
index f095afdcae1a..d6e29dcfb917 100644
--- a/security/gvm-libs/pkg-plist
+++ b/security/gvm-libs/pkg-plist
@@ -40,19 +40,19 @@ include/gvm/util/uuidutils.h
include/gvm/util/xmlutils.h
lib/libgvm_base.so
lib/libgvm_base.so.22
-lib/libgvm_base.so.22.7.1
+lib/libgvm_base.so.22.7.3
lib/libgvm_boreas.so
lib/libgvm_boreas.so.22
-lib/libgvm_boreas.so.22.7.1
+lib/libgvm_boreas.so.22.7.3
lib/libgvm_gmp.so
lib/libgvm_gmp.so.22
-lib/libgvm_gmp.so.22.7.1
+lib/libgvm_gmp.so.22.7.3
lib/libgvm_osp.so
lib/libgvm_osp.so.22
-lib/libgvm_osp.so.22.7.1
+lib/libgvm_osp.so.22.7.3
lib/libgvm_util.so
lib/libgvm_util.so.22
-lib/libgvm_util.so.22.7.1
+lib/libgvm_util.so.22.7.3
libdata/pkgconfig/libgvm_base.pc
libdata/pkgconfig/libgvm_boreas.pc
libdata/pkgconfig/libgvm_gmp.pc
diff --git a/security/gvm/Makefile b/security/gvm/Makefile
index f3d65c9a0541..43dc6e55d07e 100644
--- a/security/gvm/Makefile
+++ b/security/gvm/Makefile
@@ -1,5 +1,6 @@
PORTNAME= gvm
PORTVERSION= 22.9.0
+PORTREVISION= 1
CATEGORIES= security
MAINTAINER= acm@FreeBSD.org
diff --git a/security/gvm/files/pkg-message.in b/security/gvm/files/pkg-message.in
index 28cac7be226f..0911c6ce7785 100644
--- a/security/gvm/files/pkg-message.in
+++ b/security/gvm/files/pkg-message.in
@@ -26,7 +26,7 @@ Basic instructions for configure your gvm infraestruture are following:
# echo "[notus-scanner]" > /usr/local/etc/gvm/notus-scanner.toml
# echo 'mqtt-broker-address = "localhost"' >> /usr/local/etc/gvm/notus-scanner.toml
# echo 'mqtt-broker-port = "1883"' >> /usr/local/etc/gvm/notus-scanner.toml
- # echo 'products-directory = "/var/lib/openvas/plugins/notus/products"' >> /usr/local/etc/gvm/notus-scanner.toml
+ # echo 'products-directory = "/var/lib/notus/products"' >> /usr/local/etc/gvm/notus-scanner.toml
# echo 'log-level = "INFO"' >> /usr/local/etc/gvm/notus-scanner.toml
# echo "disable-hashsum-verification = false" >> /usr/local/etc/gvm/notus-scanner.toml
@@ -37,8 +37,8 @@ Basic instructions for configure your gvm infraestruture are following:
# pw groupmod redis -M gvm
-5) security/gvmd uses PostgreSQL database. Generally, PostgreSQL must be
- installed in the same server where security/gvmd is running:
+5) security/gvmd uses PostgreSQL database (server and contrib). Generally,
+ PostgreSQL must be installed in the same server where security/gvmd is running:
# su postgres
# createuser -DRS gvm
diff --git a/security/gvmd/Makefile b/security/gvmd/Makefile
index 59f681be8023..d08fb69af923 100644
--- a/security/gvmd/Makefile
+++ b/security/gvmd/Makefile
@@ -1,6 +1,7 @@
PORTNAME= gvmd
DISTVERSION= 22.9.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= security
MAINTAINER= acm@FreeBSD.org
diff --git a/security/openvas/Makefile b/security/openvas/Makefile
index d7c25436dd29..93e2b40529ba 100644
--- a/security/openvas/Makefile
+++ b/security/openvas/Makefile
@@ -1,5 +1,5 @@
PORTNAME= openvas
-DISTVERSION= 22.7.5
+DISTVERSION= 22.7.6
DISTVERSIONPREFIX= v
CATEGORIES= security
diff --git a/security/openvas/distinfo b/security/openvas/distinfo
index 61656f1b44f6..d93992e72b96 100644
--- a/security/openvas/distinfo
+++ b/security/openvas/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695269107
-SHA256 (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 7ac193c18097742ba8b7360802a10c3b3a9a9c742dbe788eaa34e6fcad1405b4
-SIZE (greenbone-openvas-scanner-v22.7.5_GH0.tar.gz) = 976268
+TIMESTAMP = 1697841533
+SHA256 (greenbone-openvas-scanner-v22.7.6_GH0.tar.gz) = dd69b79a0ca4f5d2a7186398530b9ef848599b1ad6fb90c506a74fbf02d84230
+SIZE (greenbone-openvas-scanner-v22.7.6_GH0.tar.gz) = 1027968
diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist
index 748a3b72dc38..701b681b3478 100644
--- a/security/openvas/pkg-plist
+++ b/security/openvas/pkg-plist
@@ -3,10 +3,10 @@ bin/openvas-nasl-lint
@sample %%ETCDIR%%/openvas_log.conf.sample
lib/libopenvas_misc.so
lib/libopenvas_misc.so.22
-lib/libopenvas_misc.so.22.7.5
+lib/libopenvas_misc.so.22.7.6
lib/libopenvas_nasl.so
lib/libopenvas_nasl.so.22
-lib/libopenvas_nasl.so.22.7.5
+lib/libopenvas_nasl.so.22.7.6
sbin/openvas
share/man/man1/openvas-nasl-lint.1.gz
share/man/man1/openvas-nasl.1.gz
diff --git a/security/py-greenbone-feed-sync/Makefile b/security/py-greenbone-feed-sync/Makefile
index 65f0c90bced0..658205e089fe 100644
--- a/security/py-greenbone-feed-sync/Makefile
+++ b/security/py-greenbone-feed-sync/Makefile
@@ -1,6 +1,7 @@
PORTNAME= greenbone-feed-sync
DISTVERSION= 23.8.0
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= security python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py b/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py
index b7736118da6d..f22b751f5c55 100644
--- a/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py
+++ b/security/py-greenbone-feed-sync/files/patch-greenbone-feed-sync_config.py
@@ -1,12 +1,13 @@
---- greenbone/feed/sync/config.py 2023-09-21 01:01:53.391475000 -0500
-+++ greenbone/feed/sync/config.py 2023-09-21 01:02:58.557438000 -0500
+--- greenbone/feed/sync/config.py 2023-08-31 07:57:04.000000000 -0500
++++ greenbone/feed/sync/config.py 2023-10-20 10:18:44.157521000 -0500
@@ -69,10 +69,10 @@
DEFAULT_GVMD_LOCK_FILE_PATH = "gvm/feed-update.lock"
DEFAULT_OPENVAS_LOCK_FILE_PATH = "openvas/feed-update.lock"
-DEFAULT_CONFIG_FILE = "/etc/gvm/greenbone-feed-sync.toml"
+-DEFAULT_USER_CONFIG_FILE = "~/.config/greenbone-feed-sync.toml"
+DEFAULT_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/greenbone-feed-sync.toml"
- DEFAULT_USER_CONFIG_FILE = "~/.config/greenbone-feed-sync.toml"
++DEFAULT_USER_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/greenbone-feed-sync.toml"
-DEFAULT_ENTERPRISE_KEY_PATH = "/etc/gvm/greenbone-enterprise-feed-key"
+DEFAULT_ENTERPRISE_KEY_PATH = "%%LOCALBASE%%/etc/gvm/greenbone-enterprise-feed-key"
diff --git a/security/py-notus-scanner/Makefile b/security/py-notus-scanner/Makefile
index ac28d53f49d2..37022b698a85 100644
--- a/security/py-notus-scanner/Makefile
+++ b/security/py-notus-scanner/Makefile
@@ -1,6 +1,7 @@
PORTNAME= notus-scanner
DISTVERSION= 22.6.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= security python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py b/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py
index 5b9a28e1b67b..cc9c814cdd51 100644
--- a/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py
+++ b/security/py-notus-scanner/files/patch-notus-scanner-cli_parser.py
@@ -1,11 +1,14 @@
---- notus/scanner/cli/parser.py 2022-07-31 23:45:49.051030000 -0500
-+++ notus/scanner/cli/parser.py 2022-07-31 23:46:07.662584000 -0500
-@@ -29,7 +29,7 @@
+--- notus/scanner/cli/parser.py 2023-08-30 03:14:56.000000000 -0500
++++ notus/scanner/cli/parser.py 2023-10-20 18:26:27.530523000 -0500
+@@ -16,9 +16,8 @@
logger = logging.getLogger(__name__)
-DEFAULT_CONFIG_FILE = "/etc/gvm/notus-scanner.toml"
+-DEFAULT_USER_CONFIG_FILE = "~/.config/notus-scanner.toml"
+-
+DEFAULT_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/notus-scanner.toml"
- DEFAULT_USER_CONFIG_FILE = "~/.config/notus-scanner.toml"
-
++DEFAULT_USER_CONFIG_FILE = "%%LOCALBASE%%/etc/gvm/notus-scanner.toml"
+ def log_level(string: str) -> str:
+ """Check if provided string is a valid log level."""
diff --git a/security/py-python-gvm/Makefile b/security/py-python-gvm/Makefile
index 514dfcc854fa..3d6dc7066687 100644
--- a/security/py-python-gvm/Makefile
+++ b/security/py-python-gvm/Makefile
@@ -1,5 +1,5 @@
PORTNAME= python-gvm
-DISTVERSION= 23.5.1
+DISTVERSION= 23.10.0
DISTVERSIONPREFIX= v
CATEGORIES= security python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -27,7 +27,8 @@ post-extract:
post-patch:
${REINPLACE_CMD} -i "" -e 's|/run/gvmd/|/var/run/gvmd/|g' \
${WRKSRC}/gvm/connections.py
- ${REINPLACE_CMD} '31d' ${WRKSRC}/pyproject.toml
+ ${REINPLACE_CMD} -e 's|, { include = "tests", format = "sdist" }||g' \
+ ${WRKSRC}/pyproject.toml
pre-configure:
@cd ${WRKSRC} && poetry2setup > ${WRKSRC}/setup.py
diff --git a/security/py-python-gvm/distinfo b/security/py-python-gvm/distinfo
index 668f679af186..7723bb2b2fec 100644
--- a/security/py-python-gvm/distinfo
+++ b/security/py-python-gvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1695319244
-SHA256 (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = c0933d1fd0a1c04ca88d6dcf74646ef2fed4aa5bb44132b1f60679cf580e99a7
-SIZE (greenbone-python-gvm-v23.5.1_GH0.tar.gz) = 291456
+TIMESTAMP = 1697844480
+SHA256 (greenbone-python-gvm-v23.10.0_GH0.tar.gz) = 6d11c9b07790386bb16a8cce207a92ccfbaf9202b6dec2089bdd9b673ea6ef0c
+SIZE (greenbone-python-gvm-v23.10.0_GH0.tar.gz) = 272387