From nobody Sun Apr 02 22:57:01 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PqTtQ1QCdz437ld; Sun, 2 Apr 2023 22:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PqTtP5mF1z3mVH; Sun, 2 Apr 2023 22:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680476221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t5fKUOFFNjbJ92NW8xvHoHxsam7Q7HkiB+QltyV+UQ4=; b=vRCvCHynwxf8r3SleOjsxCihut5bsGUZHE7CGqpVOaw6rfSauX8A0sDpcmD68uzs5jt616 /i03blPBxuEI3ZU3FbMBMLYwYjJP1Sl8X2GhHUVpV6SjHTxUkB+Hqy36Y4bcCBFsTkjugL WJq/z58xY3adGoNG3QPcJYGbF5ZjPDocYptmeRP7Tg+offQNR/394ebFFhcVPUUt5Pvj0E eH1UF8RWvUDMXtKkgTc9G5pEt5VlSMy9YVGzlshEwqLvlas9TgXsAciv8LHeCkh8csxltC Dfs2H6lWTTHJIPXDP6SE1Cx9Mbo2jfJ1ODM3aHGACGot3qxxhKOKLAK6V4FFoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680476221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t5fKUOFFNjbJ92NW8xvHoHxsam7Q7HkiB+QltyV+UQ4=; b=dvKo2QuOWfj9dcAz9qe8Z31cLhSE6t/kaJ4EHGL3Y8hD61oLPqABBLGGyjskpi/h3twvZM VIT06UrNO+/gKyKRVqyX6P2LZ6goA0Wy+62ai1PjCjxe2jx3jJ/ff1SHZuSf5T7oz38kyE Dt2MA7iERYu9ENC37gtu/lzyajsUjj5PK3WCDrnnwF8asuTE6beO122cApq8rdiQzGDuS8 f9vErRRnTMceUPatMT2HAuQN2XJC4H0yF8+XG4JDQwMKDUL0VqVspJxTeL4uNa4Och9lE/ U93rHFduM+MpxcmTwXuU+ZZElYZOYzsu8bAmWPxlpN80ThaseNVZpDGK7N7ovQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680476221; a=rsa-sha256; cv=none; b=W65UmXPUEPK2gWGEZ2aTx30GV1aD/0pQMw3wMEvvQqRHpplvK24HgEzdhKGr+wGewk2Hh3 RnblB5nzRPw85a26phYZGP13HhgcB8a9g3ipH9Tf9Bt/tqhhRfl1/zp9E4iqegy9tjDdU0 rTM9ASoU7PeHXCblZ2EM/FAn90n+oSu+5730FpWzetD5pBDrGxjMZWoTfrF06//FuCOqjU fQDs7C/HK8fp8ZW6sIRj+VQa+uM4S6oR4UWjySBfOs5XHkckxe4lglr+DMLQGbjvWzfHqb UURddhcXMp9zKvMCkeFvZdztHLlP7U2wzZdXc8uUWw7+jScODmJCJrkQ1Rc0HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PqTtP4rYCzbL3; Sun, 2 Apr 2023 22:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 332Mv19G005975; Sun, 2 Apr 2023 22:57:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 332Mv1T1005974; Sun, 2 Apr 2023 22:57:01 GMT (envelope-from git) Date: Sun, 2 Apr 2023 22:57:01 GMT Message-Id: <202304022257.332Mv1T1005974@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 582d4d27786e - main - security/openvas: Update to 22.4.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 582d4d27786ea1ec6e19f2ee2317f63c5c16a02d Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=582d4d27786ea1ec6e19f2ee2317f63c5c16a02d commit 582d4d27786ea1ec6e19f2ee2317f63c5c16a02d Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-04-02 22:33:39 +0000 Commit: Jose Alonso Cardenas Marquez 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 ||g' ${WRKSRC}/src/attack.c ${WRKSRC}/src/nasl_plugins.c @${REINPLACE_CMD} -e 's|#include |#include |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