From a1c06aafb3f149015bf7004f931773dab87d2b4c Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 10 May 2021 21:44:23 -0500 Subject: [PATCH 1/2] libdaq3: update to 3.0.3 Signed-off-by: W. Michael Petullo --- libs/libdaq3/Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/libdaq3/Makefile b/libs/libdaq3/Makefile index 5cfef76ab..5cfc855ee 100644 --- a/libs/libdaq3/Makefile +++ b/libs/libdaq3/Makefile @@ -8,16 +8,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdaq3 -PKG_VERSION:=3.0.0 -PKG_RELEASE:=2 +PKG_VERSION:=3.0.3 +PKG_RELEASE:=$(AUTORELEASE) -PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://www.snort.org/downloads/snortplus/ -PKG_HASH:=4de807ab8c622e9ef8e0cfaa8dbd9231ece17d14dc9ebaa63add800475347b99 -PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) +PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only -PKG_MAINTAINER:=W. Michael Petullo + +PKG_SOURCE:=libdaq-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=https://codeload.github.com/snort3/libdaq/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=920344f5c98ac68b401d1bc92ebaed78b0d15779b0480c213db279d0a60acc32 +PKG_BUILD_DIR:=$(BUILD_DIR)/libdaq-$(PKG_VERSION) PKG_FIXUP:=autoreconf PKG_INSTALL:=1 From 776f3183528290ef59bdba32649501dc7be82c24 Mon Sep 17 00:00:00 2001 From: "W. Michael Petullo" Date: Mon, 10 May 2021 22:22:23 -0500 Subject: [PATCH 2/2] snort3: update to 3.1.4.0 Signed-off-by: W. Michael Petullo --- net/snort3/Makefile | 12 ++++++------ net/snort3/patches/010-update-openssl.patch | 21 +++++++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 net/snort3/patches/010-update-openssl.patch diff --git a/net/snort3/Makefile b/net/snort3/Makefile index 24e1ead50..8ccb3f5e7 100644 --- 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 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 index 000000000..9c18d349b --- /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);