snort3: update to 3.1.4.0

Signed-off-by: W. Michael Petullo <redacted>

diff --git a/net/snort3/Makefile b/net/snort3/Makefile
index 24e1ead5012a5fb9ef22b7a7e33fbbce6b12b71e..8ccb3f5e754d7b542c9a6bca9bd72c537112d3e6 100644 (file)
--- a/net/snort3/Makefile
+++ b/net/snort3/Makefile
@@ -6,13 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=snort3
-PKG_VERSION:=3.1.0.0
-PKG_RELEASE:=2
+PKG_VERSION:=3.1.4.0
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/
-PKG_HASH:=c4e2e78e3afa879d7e35e482afe42a6c4b96ed26198a9979edf7953b5151ccbf
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
+PKG_HASH:=a68af8ea46a038dfb0ad489e8d11dee62a3e63cb4a639f6bb4fac4ded955fe11
 
 PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
 PKG_LICENSE:=GPL-2.0-only
@@ -45,6 +44,7 @@ CMAKE_OPTIONS += \
        -DENABLE_STATIC_DAQ:BOOL=NO \
        -DDAQ_INCLUDE_DIR=$(STAGING_DIR)/usr/include/daq3 \
        -DDAQ_LIBRARIES_DIR_HINT:PATH=$(STAGING_DIR)/usr/lib/daq3 \
+       -DFLEX_INCLUDES:PATH=$(STAGING_DIR_HOST)/include \
        -DENABLE_COREFILES:BOOL=NO \
        -DENABLE_GDB:BOOL=NO \
        -DMAKE_DOC:BOOL=NO \

diff --git a/net/snort3/patches/010-update-openssl.patch b/net/snort3/patches/010-update-openssl.patch
new file mode 100644 (file)
index 0000000..9c18d34
--- /dev/null
+++ b/net/snort3/patches/010-update-openssl.patch
@@ -0,0 +1,21 @@
+--- a/src/network_inspectors/appid/appid_inspector.cc
++++ b/src/network_inspectors/appid/appid_inspector.cc
+@@ -64,7 +64,6 @@ static THREAD_LOCAL PacketTracer::Tracer
+ //           should probably be done outside of appid
+ static void openssl_cleanup()
+ {
+-    CRYPTO_cleanup_all_ex_data();
+ }
+ 
+ static void populate_trace_data(Flow& flow, const OdpContext& odp_context)
+--- a/src/utils/util.cc
++++ b/src/utils/util.cc
+@@ -111,7 +111,7 @@ int DisplayBanner()
+     LogMessage("           Copyright (C) 1998-2013 Sourcefire, Inc., et al.\n");
+     LogMessage("           Using DAQ version %s\n", daq_version_string());
+     LogMessage("           Using LuaJIT version %s\n", ljv);
+-    LogMessage("           Using %s\n", SSLeay_version(SSLEAY_VERSION));
++    LogMessage("           Using %s\n", OpenSSL_version(SSLEAY_VERSION));
+     LogMessage("           Using %s\n", pcap_lib_version());
+     LogMessage("           Using PCRE version %s\n", pcre_version());
+     LogMessage("           Using ZLIB version %s\n", zlib_version);