git: 74c83f74927c - main - security/snort3: Upsate version 3.1.3.0=>3.1.5.0

[Muhammad Moinur Rahman]

The branch main has been updated by bofh:

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

commit 74c83f74927cef4895c1f0667d109624441e6d4a
Author:     Muhammad Moinur Rahman <bofh at FreeBSD.org>
AuthorDate: 2021-05-21 18:10:29 +0000
Commit:     Muhammad Moinur Rahman <bofh at FreeBSD.org>
CommitDate: 2021-05-21 18:13:30 +0000

    security/snort3: Upsate version 3.1.3.0=>3.1.5.0
    
    - UNBREAK for FreeBSD 11.X and 12.X
    
    Relnotes:       https://github.com/snort3/snort3/releases/tag/3.1.5.0
    MFH:            2021Q2
---
 security/snort3/Makefile  | 11 +++++++----
 security/snort3/distinfo  |  6 +++---
 security/snort3/pkg-plist |  3 +++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/security/snort3/Makefile b/security/snort3/Makefile
index 200f008f8831..7f48ebe9040b 100644
--- a/security/snort3/Makefile
+++ b/security/snort3/Makefile
@@ -1,7 +1,7 @@
 # Created by: Mark Felder <feld at FreeBSD.org>
 
 PORTNAME=	snort
-DISTVERSION=	3.1.3.0
+DISTVERSION=	3.1.5.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security
@@ -13,9 +13,6 @@ COMMENT=	Lightweight network intrusion detection system
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_FreeBSD_11=	fails to detect flex from ports
-BROKEN_FreeBSD_12=	fails to detect flex from ports
-
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libdnet.so:net/libdnet \
 		libpcap.so:net/libpcap \
@@ -58,6 +55,8 @@ 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*
 
 .include <bsd.port.options.mk>
@@ -68,6 +67,10 @@ LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit-openresty
 LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
 .endif
 
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
+BUILD_DEPENDS=	flex>0:textproc/flex
+.endif
+
 post-patch:
 	${REINPLACE_CMD} -e 's|_LIBDIR}/pkgconfig|_PREFIX}/libdata/pkgconfig|g' \
 		${WRKSRC}/cmake/create_pkg_config.cmake
diff --git a/security/snort3/distinfo b/security/snort3/distinfo
index a722c9f26bd4..1abceeb7a87f 100644
--- a/security/snort3/distinfo
+++ b/security/snort3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1618266885
-SHA256 (snort3-snort3-3.1.3.0_GH0.tar.gz) = 8df5b99be747e2cae141da8635527da2e31a7e568c70e2a58e53f0d50ee94461
-SIZE (snort3-snort3-3.1.3.0_GH0.tar.gz) = 2936470
+TIMESTAMP = 1621617379
+SHA256 (snort3-snort3-3.1.5.0_GH0.tar.gz) = 9209ca675c55e1c9dee1cb15e571b29c317f6e167b54f22e7bc18a6164218b1b
+SIZE (snort3-snort3-3.1.5.0_GH0.tar.gz) = 2956323
diff --git a/security/snort3/pkg-plist b/security/snort3/pkg-plist
index a936695bb24d..034af2d1cdb2 100644
--- a/security/snort3/pkg-plist
+++ b/security/snort3/pkg-plist
@@ -120,6 +120,7 @@ include/snort/mime/file_mime_paf.h
 include/snort/mime/file_mime_process.h
 include/snort/network_inspectors/appid/appid_api.h
 include/snort/network_inspectors/appid/appid_app_descriptor.h
+include/snort/network_inspectors/appid/appid_debug.h
 include/snort/network_inspectors/appid/appid_dns_session.h
 include/snort/network_inspectors/appid/appid_http_session.h
 include/snort/network_inspectors/appid/appid_session_api.h
@@ -177,6 +178,7 @@ include/snort/protocols/token_ring.h
 include/snort/protocols/udp.h
 include/snort/protocols/vlan.h
 include/snort/protocols/wlan.h
+include/snort/pub_sub/appid_debug_log_event.h
 include/snort/pub_sub/appid_events.h
 include/snort/pub_sub/cip_events.h
 include/snort/pub_sub/daq_message_event.h
@@ -191,6 +193,7 @@ include/snort/pub_sub/sip_events.h
 include/snort/pub_sub/smb_events.h
 include/snort/search_engines/search_common.h
 include/snort/search_engines/search_tool.h
+include/snort/service_inspectors/ssl/ssl_flow_data.h
 include/snort/sfip/sf_cidr.h
 include/snort/sfip/sf_ip.h
 include/snort/sfip/sf_returns.h