Date: Sun, 2 Apr 2023 22:57:01 GMT From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 582d4d27786e - main - security/openvas: Update to 22.4.1 Message-ID: <202304022257.332Mv1T1005974@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=582d4d27786ea1ec6e19f2ee2317f63c5c16a02d commit 582d4d27786ea1ec6e19f2ee2317f63c5c16a02d Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2023-04-02 22:33:39 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2023-04-02 22:33:39 +0000 security/openvas: Update to 22.4.1 ChangeLog at: https://github.com/greenbone/openvas-scanner/releases/tag/v22.4.1 --- security/openvas/Makefile | 6 +----- security/openvas/distinfo | 6 +++--- security/openvas/files/patch-nasl_CMakeLists.txt | 12 ++++++------ security/openvas/files/patch-nasl_md4.h | 10 ++++++++++ security/openvas/pkg-plist | 4 ++-- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/security/openvas/Makefile b/security/openvas/Makefile index a9c922d26fd2..91d3886d4a13 100644 --- a/security/openvas/Makefile +++ b/security/openvas/Makefile @@ -1,7 +1,6 @@ PORTNAME= openvas -DISTVERSION= 22.4.0 +DISTVERSION= 22.4.1 DISTVERSIONPREFIX= v -PORTREVISION= 3 CATEGORIES= security MAINTAINER= acm@FreeBSD.org @@ -39,9 +38,6 @@ GROUPS= ${USERS} post-patch: @${REINPLACE_CMD} -e 's|g_pattern_match_string|g_pattern_spec_match_string|g' ${WRKSRC}/misc/strutils.c -.if ${OSVERSION} < 1301000 - @${REINPLACE_CMD} -e 's|-Wunused-but-set-variable|-Wunused-variable|g' ${WRKSRC}/nasl/nasl_grammar.y -.endif @${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>||g' ${WRKSRC}/src/attack.c ${WRKSRC}/src/nasl_plugins.c @${REINPLACE_CMD} -e 's|#include <bsd/unistd.h>|#include <unistd.h>|g' ${WRKSRC}//src/pluginload.c diff --git a/security/openvas/distinfo b/security/openvas/distinfo index b3485668aca5..bb8a3c524dbc 100644 --- a/security/openvas/distinfo +++ b/security/openvas/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1659314127 -SHA256 (greenbone-openvas-scanner-v22.4.0_GH0.tar.gz) = 232a64206f2ce17633ea16951b91d5d8743b174afd521f6318961353aadf8268 -SIZE (greenbone-openvas-scanner-v22.4.0_GH0.tar.gz) = 478488 +TIMESTAMP = 1680416417 +SHA256 (greenbone-openvas-scanner-v22.4.1_GH0.tar.gz) = efe8c5a3a221fd28292fd12b9f4974b98e3f11ee8d73bcf253c5087bd661427c +SIZE (greenbone-openvas-scanner-v22.4.1_GH0.tar.gz) = 753758 diff --git a/security/openvas/files/patch-nasl_CMakeLists.txt b/security/openvas/files/patch-nasl_CMakeLists.txt index 995c16c38bac..72539c80c150 100644 --- a/security/openvas/files/patch-nasl_CMakeLists.txt +++ b/security/openvas/files/patch-nasl_CMakeLists.txt @@ -1,6 +1,6 @@ ---- nasl/CMakeLists.txt 2020-12-31 21:48:33.070235000 -0500 -+++ nasl/CMakeLists.txt 2020-12-31 21:49:07.420166000 -0500 -@@ -86,6 +86,11 @@ +--- nasl/CMakeLists.txt 2023-04-02 01:35:31.655225000 -0500 ++++ nasl/CMakeLists.txt 2023-04-02 01:36:47.693080000 -0500 +@@ -62,6 +62,11 @@ message (STATUS "Looking for pcap...") find_library (PCAP pcap) @@ -12,7 +12,7 @@ find_library (GPGME gpgme) message (STATUS "Looking for gpgme... ${GPGME}") -@@ -227,11 +232,11 @@ +@@ -203,11 +208,11 @@ # Link the openvas-nasl executable add_executable (openvas-nasl nasl.c) @@ -21,8 +21,8 @@ # Link the openvas-nasl-lint executable add_executable (openvas-nasl-lint nasl-lint.c) --target_link_libraries (openvas-nasl-lint openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS}) -+target_link_libraries (openvas-nasl-lint openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ${PCAP_LDFLAGS}) +-target_link_libraries (openvas-nasl-lint openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS} ${GLIB_JSON_LDFLAGS} ${GIO_LDFLAGS}) ++target_link_libraries (openvas-nasl-lint openvas_nasl_shared openvas_misc_shared ${GLIB_LDFLAGS} ${GLIB_JSON_LDFLAGS} ${GIO_LDFLAGS} ${PCAP_LDFLAGS}) ## Install diff --git a/security/openvas/files/patch-nasl_md4.h b/security/openvas/files/patch-nasl_md4.h new file mode 100644 index 000000000000..9ef902ccb9ec --- /dev/null +++ b/security/openvas/files/patch-nasl_md4.h @@ -0,0 +1,10 @@ +--- nasl/md4.h 2023-04-02 01:42:54.408984000 -0500 ++++ nasl/md4.h 2023-04-02 01:43:11.470498000 -0500 +@@ -28,5 +28,4 @@ + + void + mdfour_ntlmssp (unsigned char *out, const unsigned char *in, int n); +- +-#endif +\ No newline at end of file ++#endif diff --git a/security/openvas/pkg-plist b/security/openvas/pkg-plist index 8ac19bef60b4..5a515b9f570c 100644 --- a/security/openvas/pkg-plist +++ b/security/openvas/pkg-plist @@ -4,10 +4,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.4.0 +lib/libopenvas_misc.so.22.4.1 lib/libopenvas_nasl.so lib/libopenvas_nasl.so.22 -lib/libopenvas_nasl.so.22.4.0 +lib/libopenvas_nasl.so.22.4.1 sbin/openvas share/man/man1/openvas-nasl-lint.1.gz share/man/man1/openvas-nasl.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202304022257.332Mv1T1005974>