git: 886923a37e00 - main - security/snort3: Update version 3.1.1.0=>3.1.3.0

Tue Apr 20 19:46:19 UTC 2021

The branch main has been updated by bofh:

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

commit 886923a37e002671ab80c7267e414ca4712aacbd
Author:     Muhammad Moinur Rahman <bofh at FreeBSD.org>
AuthorDate: 2021-04-20 19:36:45 +0000
Commit:     Muhammad Moinur Rahman <bofh at FreeBSD.org>
CommitDate: 2021-04-20 19:46:10 +0000

    security/snort3: Update version 3.1.1.0=>3.1.3.0
    
    - Mark BROKEN for 11.X and 12.X. Cannot detect flex from ports. There is
      an ongoing issue at upstream.
      https://github.com/snort3/snort3/issues/168
    - Use OPTIONSNG for couple of OPTIONS
    
    Reported by:    adridg
---
 security/snort3/Makefile                      | 18 ++++++++----------
 security/snort3/distinfo                      |  6 +++---
 security/snort3/files/patch-config.cmake.h.in |  4 ++--
 security/snort3/pkg-plist                     |  4 +++-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/security/snort3/Makefile b/security/snort3/Makefile
index 5a53bf8353b4..d5f7cf761579 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.1.0
+DISTVERSION=	3.1.3.0
 PORTEPOCH=	1
 CATEGORIES=	security
 PKGNAMESUFFIX=	3
@@ -12,6 +12,9 @@ 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 \
@@ -44,15 +47,16 @@ 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=libflatbuffers.so:devel/flatbuffers
+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
 
-FLATBUFFERS_LIB_DEPENDS=libflatbuffers.so:devel/flatbuffers
-HYPERSCAN_LIB_DEPENDS=	libhs.so:devel/hyperscan
-
 CONFLICTS=	snort-2*
 
 .include <bsd.port.options.mk>
@@ -63,12 +67,6 @@ LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit-openresty
 LIB_DEPENDS+=	libluajit-5.1.so:lang/luajit
 .endif
 
-.if ${PORT_OPTIONS:MHYPERSCAN}
-PLIST_SUB+=	HYPERSCAN=""
-.else
-PLIST_SUB+=	HYPERSCAN="@comment "
-.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 7b50622dfbcd..a722c9f26bd4 100644
--- a/security/snort3/distinfo
+++ b/security/snort3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1612994962
-SHA256 (snort3-snort3-3.1.1.0_GH0.tar.gz) = 78b5ebcc0ffef53122f32938c3d3da443a3f090d6d3ebf4fdb5c7e7afc830e19
-SIZE (snort3-snort3-3.1.1.0_GH0.tar.gz) = 2856842
+TIMESTAMP = 1618266885
+SHA256 (snort3-snort3-3.1.3.0_GH0.tar.gz) = 8df5b99be747e2cae141da8635527da2e31a7e568c70e2a58e53f0d50ee94461
+SIZE (snort3-snort3-3.1.3.0_GH0.tar.gz) = 2936470
diff --git a/security/snort3/files/patch-config.cmake.h.in b/security/snort3/files/patch-config.cmake.h.in
index 79348296e3e8..31b9973dfe56 100644
--- a/security/snort3/files/patch-config.cmake.h.in
+++ b/security/snort3/files/patch-config.cmake.h.in
@@ -1,6 +1,6 @@
---- config.cmake.h.in.orig	2020-07-10 23:41:43 UTC
+--- config.cmake.h.in.orig	2021-03-27 18:13:03 UTC
 +++ config.cmake.h.in
-@@ -164,5 +164,8 @@
+@@ -167,5 +167,8 @@
  /* Define if `thread_local` keyword should be used */
  #cmakedefine USE_THREAD_LOCAL 1
  
diff --git a/security/snort3/pkg-plist b/security/snort3/pkg-plist
index 59390b400df4..a936695bb24d 100644
--- a/security/snort3/pkg-plist
+++ b/security/snort3/pkg-plist
@@ -131,6 +131,7 @@ include/snort/network_inspectors/appid/tp_appid_types.h
 include/snort/network_inspectors/packet_tracer/packet_tracer.h
 include/snort/network_inspectors/reputation/reputation_common.h
 include/snort/network_inspectors/rna/rna_fingerprint.h
+include/snort/network_inspectors/rna/rna_fingerprint_smb.h
 include/snort/network_inspectors/rna/rna_fingerprint_tcp.h
 include/snort/network_inspectors/rna/rna_fingerprint_udp.h
 include/snort/network_inspectors/rna/rna_fingerprint_ua.h
@@ -187,6 +188,7 @@ include/snort/pub_sub/finalize_packet_event.h
 include/snort/pub_sub/http_events.h
 include/snort/pub_sub/opportunistic_tls_event.h
 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/sfip/sf_cidr.h
@@ -217,7 +219,6 @@ include/snort/utils/sflsq.h
 include/snort/utils/stats.h
 include/snort/utils/util.h
 include/snort/utils/util_cstring.h
-include/snort/utils/util_jsnorm.h
 include/snort/utils/util_unfold.h
 include/snort/utils/util_utf.h
 lib/snort/daqs/daq_file.so
@@ -250,6 +251,7 @@ libdata/pkgconfig/snort.pc
 %%PORTDOCS%%%%DOCSDIR%%/high_availability.txt
 %%PORTDOCS%%%%DOCSDIR%%/http_inspect.txt
 %%PORTDOCS%%%%DOCSDIR%%/http2_inspect.txt
+%%PORTDOCS%%%%DOCSDIR%%/iec104.txt
 %%PORTDOCS%%%%DOCSDIR%%/overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/params.txt
 %%PORTDOCS%%%%DOCSDIR%%/perf_monitor.txt
