aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMuhammad Moinur Rahman <bofh@FreeBSD.org>2024-03-15 17:04:33 +0000
committerMuhammad Moinur Rahman <bofh@FreeBSD.org>2024-03-15 19:09:20 +0000
commitcf164bed2dfb8d41d28d7ced91a932da8a614516 (patch)
tree76e9abcd569931303c275f953bbb2487ddb017e9
parent0dd20c16947831a5e12c0c85379346de18ebf7a5 (diff)
downloadports-cf164bed2dfb8d41d28d7ced91a932da8a614516.tar.gz
ports-cf164bed2dfb8d41d28d7ced91a932da8a614516.zip
security/snort3: Update version 3.1.81.0=>3.1.82.0
-rw-r--r--security/snort3/Makefile11
-rw-r--r--security/snort3/distinfo6
-rw-r--r--security/snort3/files/patch-tools_snort2lua_helpers_s2l__util.cc18
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 <bsd.port.mk>
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<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;
- }
-