From nobody Fri Mar 15 19:09:50 2024 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 4TxDMg68ltz5Dxn2; Fri, 15 Mar 2024 19:09:51 +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 4TxDMg1N1cz412v; Fri, 15 Mar 2024 19:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710529791; 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=BB0KDek5OQcshN9cu335R7c3ykZDEKJXJpDWW8p8y90=; b=q5brRAwWs7O9DgQtZ1HBEF5eO95FogAuTnEuVpffOoZBXXt4VmkS2QJAPF5U2Nwl9v/WWW SaF3hJhZLVa5HbGZlE2co4GBPZ4u+uX2VXBc5QEecLOaQiiQXIQvKQ2BCWcG2Ba8gNDhFX MtdJ/mu7MpKSYd9NUAI18NPTih6SnoXg27Dc0QPiwOaG4KaKafgc6rUFDKBa+mUdrHqvhk WIogkmqWETK2tXel2DCgjs7Zl217mpDGedcxHtLb0xKI8kWnT+YAj8XETzoPJ98vFXg+UQ Y0lS440yGM4Zy0Y6b9CB/xUrHetnvRYuoi2AYVlfPNArH0igjRyUUFf0uwdaQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710529791; a=rsa-sha256; cv=none; b=CtOXYGvWgJetsnTeneauibAQU5Hj27/9B7uhFJ69cBd8u7KyQwWzpT1eezd3uVpEFPavbl IieoyuG4ajWFuFxFN0VXxyYGJyyQJ4e4q+ATI15LXPUoxW8t7prRXX3I/ngvKjTKmLBuSx pVq/EbOoGIhx9RxMaEhOgHapGdz27oQdkOJnCH1JWbCI2xg2/tbOTF61lPoPT9YEVqaNBr HyMRc9+cs+Rksu1Xa+iawTtrvnG8XL89Q6DZoJDt2py9Gd2Q4IBqVNwiQ815IJoUDuMQbM BIKVDSZnC0ceal+BxdBBZ9DW77tuqIbn7XUaONaWiARFsNpQxWaiitmf9/Fo6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710529791; 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=BB0KDek5OQcshN9cu335R7c3ykZDEKJXJpDWW8p8y90=; b=hERcQRNRLYzifRkk8cg2OHAP4AGJtp8O7PykQRYvxrr88xvrW2va+nIARSRiw9tXulEu34 U2b/cIOrVsNNfKG3tSz8LfRwu+8Ax7oflgolwOJQpbayT56ej/xz/ZpWxwVUxQUMBIKAD7 XYv1ntH9CYt7HO1uc5/mxnK4FP8jtmhmPlBSfhP8ueS8e/GJMJrxlVnswin6Fe/DDe3RXu YEznJrkp0nJgcsG/GfVkUgpSfaOyIG65YraHNShvr+XhNj9UEOs6FYo1ziwp5r4oOldL2B ULnhllJUR0af8vgLYTdew+SX/qSSe7FrZ5VQS5sdLs3o12OENGwA4pjPs3vHKA== 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 4TxDMg0RdCzNHr; Fri, 15 Mar 2024 19:09:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42FJ9oZL019517; Fri, 15 Mar 2024 19:09:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42FJ9odb019514; Fri, 15 Mar 2024 19:09:50 GMT (envelope-from git) Date: Fri, 15 Mar 2024 19:09:50 GMT Message-Id: <202403151909.42FJ9odb019514@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: cf164bed2dfb - main - security/snort3: Update version 3.1.81.0=>3.1.82.0 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: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf164bed2dfb8d41d28d7ced91a932da8a614516 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=cf164bed2dfb8d41d28d7ced91a932da8a614516 commit cf164bed2dfb8d41d28d7ced91a932da8a614516 Author: Muhammad Moinur Rahman AuthorDate: 2024-03-15 17:04:33 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-03-15 19:09:20 +0000 security/snort3: Update version 3.1.81.0=>3.1.82.0 Changelog: https://github.com/snort3/snort3/releases/tag/3.1.82.0 --- security/snort3/Makefile | 11 ++++------- security/snort3/distinfo | 6 +++--- .../files/patch-tools_snort2lua_helpers_s2l__util.cc | 18 ------------------ 3 files changed, 7 insertions(+), 28 deletions(-) diff --git a/security/snort3/Makefile b/security/snort3/Makefile index 999c38d2c604..4c813149b172 100644 --- a/security/snort3/Makefile +++ b/security/snort3/Makefile @@ -1,9 +1,10 @@ PORTNAME= snort -DISTVERSION= 3.1.81.0 +DISTVERSION= 3.1.82.0 PORTEPOCH= 1 CATEGORIES= security PKGNAMESUFFIX= 3 +# implicit-approval+ dvl@ MAINTAINER= bofh@FreeBSD.org COMMENT= Lightweight network intrusion detection system WWW= https://www.snort.org/ @@ -20,8 +21,8 @@ LIB_DEPENDS= libdaq.so:net/libdaq \ USES= cmake compiler:c++14-lang cpe iconv localbase luajit pathfix pkgconfig \ shebangfix ssl +PATHFIX_CMAKELISTSTXT= create_pkg_config.cmake USE_GITHUB= yes - GH_ACCOUNT= snort3 GH_PROJECT= snort3 @@ -50,7 +51,7 @@ TSC_DESC= Use timestamp counter register clock (x86 only) ADDRESSSANITIZER_CMAKE_BOOL= ENABLE_ADDRESS_SANITIZER DEBUG_CMAKE_BOOL= ENABLE_COREFILES ENABLE_GDB DOCS_CMAKE_BOOL= MAKE_HTML_DOC MAKE_PDF_DOC MAKE_TEXT_DOC -FLATBUFFERS_LIB_DEPENDS= flatc:devel/flatbuffers205 # until https://github.com/snort3/snort3/issues/250 is fixed +FLATBUFFERS_LIB_DEPENDS= libflatbuffers.so:devel/flatbuffers HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan HYPERSCAN_PLIST_SUB= HYPERSCAN="" HYPERSCAN_PLIST_SUB_OFF= HYPERSCAN="@comment " @@ -62,8 +63,4 @@ STATICDAQ_CMAKE_BOOL= ENABLE_STATIC_DAQ THREADSANITIZER_CMAKE_BOOL= ENABLE_THREAD_SANITIZER TSC_CMAKE_BOOL= ENABLE_TSC_CLOCK -post-patch: - ${REINPLACE_CMD} -e 's|_LIBDIR}/pkgconfig|_PREFIX}/libdata/pkgconfig|g' \ - ${WRKSRC}/cmake/create_pkg_config.cmake - .include diff --git a/security/snort3/distinfo b/security/snort3/distinfo index a5970d15e207..5bfeff5b32f0 100644 --- a/security/snort3/distinfo +++ b/security/snort3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708523235 -SHA256 (snort3-snort3-3.1.81.0_GH0.tar.gz) = d4093b0bfde013b3ad246cbc87bbd6c0cc09dfb9b4978b1a76b4ab27abf6d03a -SIZE (snort3-snort3-3.1.81.0_GH0.tar.gz) = 3292108 +TIMESTAMP = 1710520886 +SHA256 (snort3-snort3-3.1.82.0_GH0.tar.gz) = 64304315e1c172b80cb9fef8c27fa457357329ecf02ee27a6604a79fd6cfa10f +SIZE (snort3-snort3-3.1.82.0_GH0.tar.gz) = 3293903 diff --git a/security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc b/security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc deleted file mode 100644 index bccab66b0cf7..000000000000 --- a/security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- tools/snort2lua/helpers/s2l_util.cc.orig 2024-02-22 01:22:58 UTC -+++ tools/snort2lua/helpers/s2l_util.cc -@@ -103,13 +103,13 @@ std::string& ltrim(std::string& s) - - std::string& ltrim(std::string& s) - { -- s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not_fn(std::ptr_fun(std::isspace)))); -+ s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](int c) {return !std::isspace(c);})); - return s; - } - - std::string& rtrim(std::string& s) - { -- s.erase(std::find_if(s.rbegin(), s.rend(), std::not_fn(std::ptr_fun(std::isspace))).base(), s.end()); -+ s.erase(std::find_if(s.rbegin(), s.rend(), [](int c) {return !std::isspace(c);}).base(), s.end()); - return s; - } -