diff options
Diffstat (limited to 'security/openvas')
| -rw-r--r-- | security/openvas/Makefile | 5 | ||||
| -rw-r--r-- | security/openvas/distinfo | 6 | ||||
| -rw-r--r-- | security/openvas/files/patch-CMakeLists.txt | 20 | ||||
| -rw-r--r-- | security/openvas/files/patch-src_attack.c | 6 | ||||
| -rw-r--r-- | security/openvas/files/patch-tools_greenbone-nvt-sync.in | 33 | ||||
| -rw-r--r-- | security/openvas/pkg-plist | 8 |
6 files changed, 23 insertions, 55 deletions
diff --git a/security/openvas/Makefile b/security/openvas/Makefile index f477254f237f..87a2aada0fc3 100644 --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -1,5 +1,5 @@ PORTNAME= openvas -DISTVERSION= 22.7.9 +DISTVERSION= 23.0.1 DISTVERSIONPREFIX= v CATEGORIES= security @@ -19,7 +19,8 @@ LIB_DEPENDS= libgvm_base.so:security/gvm-libs \ libssh.so:security/libssh \ libgnutls.so:security/gnutls \ libnetsnmp.so:net-mgmt/net-snmp \ - libjson-glib-1.0.so:devel/json-glib + libjson-glib-1.0.so:devel/json-glib \ + libcurl.so:ftp/curl RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}impacket>=0:net/py-impacket@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}greenbone-feed-sync>0:security/py-greenbone-feed-sync@${PY_FLAVOR} \ redis-server:databases/redis \ diff --git a/security/openvas/distinfo b/security/openvas/distinfo index 1d3125b5e2b0..ad656772eb49 100644 --- a/security/openvas/distinfo +++ b/security/openvas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1706307912 -SHA256 (greenbone-openvas-scanner-v22.7.9_GH0.tar.gz) = 4a94edf7555186336ee762f5ada7c8c788cc8f3a4cfce13b70afc2952bc6644e -SIZE (greenbone-openvas-scanner-v22.7.9_GH0.tar.gz) = 1069904 +TIMESTAMP = 1713945029 +SHA256 (greenbone-openvas-scanner-v23.0.1_GH0.tar.gz) = 26d43e7c24fc80a7b62ed757590f57c5c068bc7fd99b061052d83c36597ee927 +SIZE (greenbone-openvas-scanner-v23.0.1_GH0.tar.gz) = 1387550 diff --git a/security/openvas/files/patch-CMakeLists.txt b/security/openvas/files/patch-CMakeLists.txt index 5a441446563a..e03c773a2ef4 100644 --- a/security/openvas/files/patch-CMakeLists.txt +++ b/security/openvas/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2021-10-11 10:37:50.000000000 -0500 -+++ CMakeLists.txt 2021-10-27 21:54:45.470593000 -0500 -@@ -113,7 +113,7 @@ +--- CMakeLists.txt 2024-03-19 05:02:18.000000000 -0500 ++++ CMakeLists.txt 2024-04-24 02:53:41.119060000 -0500 +@@ -99,7 +99,7 @@ endif (SYSCONF_INSTALL_DIR) if (NOT SYSCONFDIR) @@ -9,7 +9,7 @@ endif (NOT SYSCONFDIR) if (NOT EXEC_PREFIX) -@@ -150,7 +150,7 @@ +@@ -136,7 +136,7 @@ endif (NOT DATADIR) if (NOT OPENVAS_RUN_DIR) @@ -17,17 +17,17 @@ + set (OPENVAS_RUN_DIR "${LOCALSTATEDIR}/run/ospd") endif (NOT OPENVAS_RUN_DIR) - set (OPENVAS_DATA_DIR "${DATADIR}/openvas") -@@ -199,7 +199,7 @@ - configure_file (doc/openvas.8.in doc/openvas.8 @ONLY) + if (NOT DEFINED BUILD_WITH_NETSNMP) +@@ -185,7 +185,7 @@ + # Configure Doxyfile with version number + configure_file (doc/man/openvas.8.in doc/man/openvas.8 @ONLY) configure_file (VERSION.in VERSION @ONLY) - configure_file (tools/greenbone-nvt-sync.in tools/greenbone-nvt-sync @ONLY) -configure_file (src/openvas_log_conf.cmake_in src/openvas_log.conf) +configure_file (src/openvas_log_conf.cmake_in src/openvas_log.conf.sample) - ## Testing -@@ -214,7 +214,7 @@ + ## Testing +@@ -201,7 +201,7 @@ set (COVERAGE_FLAGS "--coverage") endif (ENABLE_COVERAGE) diff --git a/security/openvas/files/patch-src_attack.c b/security/openvas/files/patch-src_attack.c index 63169adea6f9..7606ee921360 100644 --- a/security/openvas/files/patch-src_attack.c +++ b/security/openvas/files/patch-src_attack.c @@ -1,5 +1,5 @@ ---- src/attack.c.orig 2023-11-30 02:05:44.000000000 -0500 -+++ src/attack.c 2024-01-26 17:29:41.957545000 -0500 +--- src/attack.c 2024-04-24 02:59:35.930683000 -0500 ++++ src/attack.c 2024-04-24 03:02:33.794371000 -0500 @@ -31,7 +31,6 @@ #include "utils.h" @@ -8,7 +8,7 @@ #include <errno.h> /* for errno() */ #include <fcntl.h> #include <glib.h> -@@ -1614,13 +1613,13 @@ +@@ -1541,13 +1540,13 @@ gettimeofday (&now, NULL); if (test_alive_hosts_only) diff --git a/security/openvas/files/patch-tools_greenbone-nvt-sync.in b/security/openvas/files/patch-tools_greenbone-nvt-sync.in deleted file mode 100644 index 3ea8874e455d..000000000000 --- a/security/openvas/files/patch-tools_greenbone-nvt-sync.in +++ /dev/null @@ -1,33 +0,0 @@ ---- tools/greenbone-nvt-sync.in 2022-07-18 04:07:38.000000000 -0500 -+++ tools/greenbone-nvt-sync.in 2022-07-31 19:51:15.176021000 -0500 -@@ -98,10 +98,10 @@ - [ -z "$RSYNC_DOMAIN" ] && RSYNC_DOMAIN=feed.community.greenbone.net - - check_logger () { -- logger --socket-error=on -p daemon.info -t $SCRIPT_NAME "Checking logger" --no-act 1>/dev/null 2>&1 -+ logger -p daemon.info -t $SCRIPT_NAME "Checking logger" 1>/dev/null 2>&1 - if [ $? -gt 0 ] - then -- LOG_CMD="logger --socket-error=off -s -t $SCRIPT_NAME" -+ LOG_CMD="logger -s -t $SCRIPT_NAME" - $LOG_CMD -p daemon.warning "The log facility is not working as expected. All messages will be written to the standard error stream." - fi - } -@@ -448,7 +448,7 @@ - log_err "rsync failed, aborting synchronization." - exit 1 - fi -- eval "cd \"$NVT_DIR\" ; sha256sum -c --status \"$NVT_DIR/sha256sums\"" -+ eval "cd \"$NVT_DIR\" ; xargs -n 2 sha256sum -c < \"$NVT_DIR/sha256sums\" > /dev/null" - if [ $? -ne 0 ] ; then - if [ -n "$retried" ] - then -@@ -523,7 +523,7 @@ - log_write "Feed is already current, skipping synchronization." - else - ( -- chmod +660 $OPENVAS_FEED_LOCK_PATH -+ chmod 660 $OPENVAS_FEED_LOCK_PATH - flock -n 9 - if [ $? -eq 1 ] ; then - log_warning "Another process related to the feed update is already running" diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist index 505f40ca7466..8d419055f39f 100644 --- a/security/openvas/pkg-plist +++ b/security/openvas/pkg-plist @@ -2,11 +2,11 @@ bin/openvas-nasl 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.9 +lib/libopenvas_misc.so.23 +lib/libopenvas_misc.so.23.0.1 lib/libopenvas_nasl.so -lib/libopenvas_nasl.so.22 -lib/libopenvas_nasl.so.22.7.9 +lib/libopenvas_nasl.so.23 +lib/libopenvas_nasl.so.23.0.1 sbin/openvas share/man/man1/openvas-nasl-lint.1.gz share/man/man1/openvas-nasl.1.gz |