git: b9651d58b14f - main - security/snort3: Update version 3.1.30.0=>3.1.31.0

From: Muhammad Moinur Rahman <bofh_at_FreeBSD.org>
Date: Fri, 03 Jun 2022 05:48:23 UTC
The branch main has been updated by bofh:

URL: https://cgit.FreeBSD.org/ports/commit/?id=b9651d58b14f050b9d1406301dbc426bb537b1c0

commit b9651d58b14f050b9d1406301dbc426bb537b1c0
Author:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
AuthorDate: 2022-06-03 05:47:05 +0000
Commit:     Muhammad Moinur Rahman <bofh@FreeBSD.org>
CommitDate: 2022-06-03 05:48:11 +0000

    security/snort3: Update version 3.1.30.0=>3.1.31.0
    
    - Pet portclippy/portfmt
    
    Relnotes: https://github.com/snort3/snort3/releases/tag/3.1.31.0
---
 security/snort3/Makefile  | 44 +++++++++++++++++++++++---------------------
 security/snort3/distinfo  |  6 +++---
 security/snort3/pkg-plist |  5 +++--
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/security/snort3/Makefile b/security/snort3/Makefile
index 948d357bce68..0dc431ec652a 100644
--- a/security/snort3/Makefile
+++ b/security/snort3/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mark Felder <feld@FreeBSD.org>
 
 PORTNAME=	snort
-DISTVERSION=	3.1.30.0
+DISTVERSION=	3.1.31.0
 PORTEPOCH=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	3
@@ -12,14 +12,15 @@ COMMENT=	Lightweight network intrusion detection system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:devel/pcre \
+LIB_DEPENDS=	libdaq.so:net/libdaq \
 		libdnet.so:net/libdnet \
-		libpcap.so:net/libpcap \
 		libhwloc.so:devel/hwloc2 \
-		libuuid.so:misc/e2fsprogs-libuuid \
-		libdaq.so:net/libdaq
+		libpcap.so:net/libpcap \
+		libpcre.so:devel/pcre \
+		libuuid.so:misc/e2fsprogs-libuuid
 
-USES=		cmake compiler:c++14-lang cpe localbase pathfix pkgconfig shebangfix ssl iconv
+USES=		cmake compiler:c++14-lang cpe iconv localbase pathfix pkgconfig \
+		shebangfix ssl
 USE_GITHUB=	yes
 
 GH_ACCOUNT=	snort3
@@ -27,7 +28,12 @@ GH_PROJECT=	snort3
 
 SHEBANG_FILES=	tools/appid_detector_builder.sh
 
-OPTIONS_DEFINE=		ADDRESSSANITIZER DEBUG DOCS FLATBUFFERS HYPERSCAN LARGEPCAP PIE THREADSANITIZER STATICDAQ
+CMAKE_ARGS+=	-DFLEX_INCLUDE_DIR_HINT:PATH=${PREFIX}/include/flex
+
+CONFLICTS=	snort-2*
+
+OPTIONS_DEFINE=		ADDRESSSANITIZER DEBUG DOCS FLATBUFFERS HYPERSCAN \
+			LARGEPCAP PIE STATICDAQ THREADSANITIZER
 OPTIONS_DEFINE_amd64=	TSC
 OPTIONS_DEFAULT=	STATICDAQ
 OPTIONS_DEFAULT_amd64=	HYPERSCAN
@@ -43,21 +49,17 @@ THREADSANITIZER_DESC=	Enable thread sanitizer
 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
-HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
-HYPERSCAN_PLIST_SUB=	HYPERSCAN=""
-HYPERSCAN_PLIST_SUB_OFF=HYPERSCAN="@comment "
-LARGEPCAP_CMAKE_BOOL=	ENABLE_LARGE_PCAP
-PIE_CMAKE_BOOL=		ENABLE_PIE
-STATICDAQ_CMAKE_BOOL=	ENABLE_STATIC_DAQ
+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
+HYPERSCAN_LIB_DEPENDS=		libhs.so:devel/hyperscan
+HYPERSCAN_PLIST_SUB=		HYPERSCAN=""
+HYPERSCAN_PLIST_SUB_OFF=	HYPERSCAN="@comment "
+LARGEPCAP_CMAKE_BOOL=		ENABLE_LARGE_PCAP
+PIE_CMAKE_BOOL=			ENABLE_PIE
+STATICDAQ_CMAKE_BOOL=		ENABLE_STATIC_DAQ
 THREADSANITIZER_CMAKE_BOOL=	ENABLE_THREAD_SANITIZER
-TSC_CMAKE_BOOL=		ENABLE_TSC_CLOCK
-
-CMAKE_ARGS+=	-DFLEX_INCLUDE_DIR_HINT:PATH=${PREFIX}/include/flex
-
-CONFLICTS=	snort-2*
+TSC_CMAKE_BOOL=			ENABLE_TSC_CLOCK
 
 .include <bsd.port.options.mk>
 
diff --git a/security/snort3/distinfo b/security/snort3/distinfo
index 5935487bbdaf..9b83a109faeb 100644
--- a/security/snort3/distinfo
+++ b/security/snort3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653049552
-SHA256 (snort3-snort3-3.1.30.0_GH0.tar.gz) = a565eee62ce562a1469f245209b20966040d066249462d2b51bf8a95c795c719
-SIZE (snort3-snort3-3.1.30.0_GH0.tar.gz) = 3136893
+TIMESTAMP = 1654233913
+SHA256 (snort3-snort3-3.1.31.0_GH0.tar.gz) = 252b2e7d8b4bfab8daaa1c7ba0396a9dd4d01e64c3b970b091b640f0658a5ae1
+SIZE (snort3-snort3-3.1.31.0_GH0.tar.gz) = 3144215
diff --git a/security/snort3/pkg-plist b/security/snort3/pkg-plist
index 682d5a55453c..09b527dc1700 100644
--- a/security/snort3/pkg-plist
+++ b/security/snort3/pkg-plist
@@ -80,6 +80,7 @@ include/snort/hash/hash_key_operations.h
 include/snort/hash/hashes.h
 %%HYPERSCAN%%include/snort/helpers/hyper_scratch_allocator.h
 %%HYPERSCAN%%include/snort/helpers/hyper_search.h
+include/snort/hash/lru_cache_local.h
 include/snort/hash/lru_cache_shared.h
 include/snort/hash/xhash.h
 include/snort/helpers/base64_encoder.h
@@ -90,8 +91,8 @@ include/snort/helpers/json_stream.h
 include/snort/helpers/literal_search.h
 include/snort/helpers/scratch_allocator.h
 include/snort/host_tracker/host_cache.h
-include/snort/host_tracker/host_cache_allocator.h
-include/snort/host_tracker/host_cache_interface.h
+include/snort/host_tracker/cache_allocator.h
+include/snort/host_tracker/cache_interface.h
 include/snort/host_tracker/host_tracker.h
 include/snort/log/log.h
 include/snort/log/log_text.h