aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2024-02-22 01:26:56 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2024-02-22 03:47:57 +0000
commitfd9d949715aaba884ed9f5630e8869baae57d83f (patch)
tree4e677aa768b6495fc8766836a76b3954bfd99421
parent3cae8cfa369b937574d3b836b1e0881840b9037e (diff)
downloadports-fd9d949715aaba884ed9f5630e8869baae57d83f.tar.gz
ports-fd9d949715aaba884ed9f5630e8869baae57d83f.zip
security/snort3: Update version 3.1.78.0=>3.1.81.0
-rw-r--r--security/snort3/Makefile2
-rw-r--r--security/snort3/distinfo6
-rw-r--r--security/snort3/files/patch-cmake_include__libraries.cmake6
-rw-r--r--security/snort3/files/patch-config.cmake.h.in4
-rw-r--r--security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc18
5 files changed, 28 insertions, 8 deletions
diff --git a/security/snort3/Makefile b/security/snort3/Makefile
index f9a574517ecf..999c38d2c604 100644
--- a/security/snort3/Makefile
+++ b/security/snort3/Makefile
@@ -1,5 +1,5 @@
PORTNAME= snort
-DISTVERSION= 3.1.78.0
+DISTVERSION= 3.1.81.0
PORTEPOCH= 1
CATEGORIES= security
PKGNAMESUFFIX= 3
diff --git a/security/snort3/distinfo b/security/snort3/distinfo
index c85f6a194499..a5970d15e207 100644
--- a/security/snort3/distinfo
+++ b/security/snort3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705676838
-SHA256 (snort3-snort3-3.1.78.0_GH0.tar.gz) = 08a51223c22aa3196e6dc959d3b52df03da9a458877ff7e77fa9c4ee8eb8947c
-SIZE (snort3-snort3-3.1.78.0_GH0.tar.gz) = 3285316
+TIMESTAMP = 1708523235
+SHA256 (snort3-snort3-3.1.81.0_GH0.tar.gz) = d4093b0bfde013b3ad246cbc87bbd6c0cc09dfb9b4978b1a76b4ab27abf6d03a
+SIZE (snort3-snort3-3.1.81.0_GH0.tar.gz) = 3292108
diff --git a/security/snort3/files/patch-cmake_include__libraries.cmake b/security/snort3/files/patch-cmake_include__libraries.cmake
index e6956ad1c847..fea5f519af2c 100644
--- a/security/snort3/files/patch-cmake_include__libraries.cmake
+++ b/security/snort3/files/patch-cmake_include__libraries.cmake
@@ -1,6 +1,6 @@
---- cmake/include_libraries.cmake.orig 2023-06-05 12:40:26 UTC
+--- cmake/include_libraries.cmake.orig 2024-02-20 18:54:47 UTC
+++ cmake/include_libraries.cmake
-@@ -26,4 +26,6 @@ if (ENABLE_SAFEC)
+@@ -26,6 +26,8 @@ find_package(UUID QUIET)
endif (ENABLE_SAFEC)
find_package(ICONV QUIET)
find_package(UUID QUIET)
@@ -8,3 +8,5 @@
+if (ENABLE_LIBUNWIND)
+ find_package(Libunwind)
+endif (ENABLE_LIBUNWIND)
+ find_package(NUMA QUIET)
+ find_package(ML QUIET)
diff --git a/security/snort3/files/patch-config.cmake.h.in b/security/snort3/files/patch-config.cmake.h.in
index 46b4fec88ac8..acf0259bf070 100644
--- a/security/snort3/files/patch-config.cmake.h.in
+++ b/security/snort3/files/patch-config.cmake.h.in
@@ -1,6 +1,6 @@
---- config.cmake.h.in.orig 2023-06-02 19:53:06 UTC
+--- config.cmake.h.in.orig 2024-02-20 18:54:47 UTC
+++ config.cmake.h.in
-@@ -173,5 +173,8 @@
+@@ -178,5 +178,8 @@
/* Define if `thread_local` keyword should be used */
#cmakedefine USE_THREAD_LOCAL 1
diff --git a/security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc b/security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc
new file mode 100644
index 000000000000..bccab66b0cf7
--- /dev/null
+++ b/security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc
@@ -0,0 +1,18 @@
+--- 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<int, int>(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<int, int>(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;
+ }
+