snort3: update to 3.1.29.0

Signed-off-by: W. Michael Petullo <mike@flyn.org>

diff --git a/net/snort3/Makefile b/net/snort3/Makefile
index eb3d614f18da1ae6e785cedad2678e68e081cc90..c2abfb4f76f82f77947425fa4d0cacc2c95072de 100644 (file)
--- a/net/snort3/Makefile
+++ b/net/snort3/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=snort3
-PKG_VERSION:=3.1.18.0
+PKG_VERSION:=3.1.29.0
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE:=$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
-PKG_HASH:=6e45c16b1815d832b5d6edcd2b705e7838e25c76bfd54b3e86c55ecba6de420a
+PKG_HASH:=becec36b57af3d65ae8289b73cd6d56bf8bde774539c74b35b0ec2262a587281
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=GPL-2.0-only

diff --git a/net/snort3/patches/010-update-openssl.patch b/net/snort3/patches/010-update-openssl.patch
index 6ba01c7937eb68bdc478cd162ac7a89722b04d36..63e7c0288e661a8f34a24ca51ac4ac3c3de56661 100644 (file)
--- a/net/snort3/patches/010-update-openssl.patch
+++ b/net/snort3/patches/010-update-openssl.patch
@@ -1,6 +1,6 @@
 --- a/src/network_inspectors/appid/appid_inspector.cc
 +++ b/src/network_inspectors/appid/appid_inspector.cc
-@@ -66,7 +66,6 @@ static THREAD_LOCAL PacketTracer::Tracer
+@@ -68,7 +68,6 @@ static THREAD_LOCAL PacketTracer::Tracer
  //           should probably be done outside of appid
  static void openssl_cleanup()
  {

diff --git a/net/snort3/patches/020-libatomic.patch b/net/snort3/patches/020-libatomic.patch
deleted file mode 100644 (file)
index cdddd6e..0000000
--- a/net/snort3/patches/020-libatomic.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- /dev/null
-+++ b/cmake/FindAtomic.cmake
-@@ -0,0 +1,11 @@
-+find_library(ATOMIC_LIBRARIES NAMES atomic
-+    HINTS ${ATOMIC_LIBRARIES_DIR_HINT})
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(Atomic DEFAULT_MSG ATOMIC_LIBRARIES)
-+
-+mark_as_advanced(ATOMIC_LIBRARIES)
-+
-+if (ATOMIC_LIBRARIES)
-+    set(HAVE_ATOMIC "1")
-+endif()
---- a/cmake/include_libraries.cmake
-+++ b/cmake/include_libraries.cmake
-@@ -15,6 +15,7 @@ if (ENABLE_UNIT_TESTS)
- endif (ENABLE_UNIT_TESTS)
- 
- # optional libraries
-+find_package(Atomic QUIET)
- find_package(LibLZMA QUIET)
- find_package(Asciidoc QUIET)
- find_package(DBLATEX QUIET)
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -116,6 +116,14 @@ else ()
-     DAQ Modules:    Dynamic")
- endif ()
- 
-+if (HAVE_ATOMIC)
-+    message("\
-+    libatomic:      ON")
-+else ()
-+    message("\
-+    libatomic:      OFF")
-+endif ()
-+
- if (HAVE_FLATBUFFERS)
-     message("\
-     Flatbuffers:    ON")
---- a/configure_cmake.sh
-+++ b/configure_cmake.sh
-@@ -108,6 +108,8 @@ Optional Packages:
-                             libhs include directory
-     --with-hyperscan-libraries=DIR
-                             libhs library directory
-+    --with-atomic-libraries=DIR
-+                            atomic library directory
-     --with-flatbuffers-includes=DIR
-                             flatbuffers include directory
-     --with-flatbuffers-libraries=DIR
-@@ -447,6 +449,9 @@ while [ $# -ne 0 ]; do
-         --with-hyperscan-libraries=*)
-             append_cache_entry HS_LIBRARIES_DIR PATH $optarg
-             ;;
-+        --with-atomic-libraries=*)
-+            append_cache_entry ATOMIC_LIBRARIES_DIR_HINT PATH $optarg
-+            ;;
-         --with-flatbuffers-includes=*)
-             append_cache_entry FLATBUFFERS_INCLUDE_DIR_HINT PATH $optarg
-             ;;
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -25,6 +25,10 @@ set(EXTERNAL_INCLUDES
-     ${ZLIB_INCLUDE_DIRS}
- )
- 
-+if ( HAVE_ATOMIC )
-+    LIST(APPEND EXTERNAL_LIBRARIES ${ATOMIC_LIBRARIES})
-+endif()
-+
- if ( ENABLE_STATIC_DAQ )
-     LIST(APPEND EXTERNAL_LIBRARIES ${DAQ_STATIC_MODULE_LIBS})
- endif ()