diff --git a/security/snort3/Makefile b/security/snort3/Makefile index 0ff859f9ed97..71aa6baeaaa8 100644 --- a/security/snort3/Makefile +++ b/security/snort3/Makefile @@ -1,72 +1,75 @@ PORTNAME= snort -DISTVERSION= 3.1.62.0 +DISTVERSION= 3.1.63.0 PORTEPOCH= 1 CATEGORIES= security PKGNAMESUFFIX= 3 MAINTAINER= bofh@FreeBSD.org COMMENT= Lightweight network intrusion detection system WWW= https://www.snort.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libdaq.so:net/libdaq \ libdnet.so:net/libdnet \ libhwloc.so:devel/hwloc2 \ libpcap.so:net/libpcap \ libpcre.so:devel/pcre \ libuuid.so:misc/e2fsprogs-libuuid USES= cmake compiler:c++14-lang cpe iconv localbase luajit pathfix pkgconfig \ shebangfix ssl USE_GITHUB= yes GH_ACCOUNT= snort3 GH_PROJECT= snort3 SHEBANG_FILES= tools/appid_detector_builder.sh CMAKE_ARGS+= -DFLEX_INCLUDE_DIR_HINT:PATH=${PREFIX}/include/flex CONFLICTS= snort-2* OPTIONS_DEFINE= ADDRESSSANITIZER DEBUG DOCS FLATBUFFERS HYPERSCAN \ - LARGEPCAP PIE STATICDAQ THREADSANITIZER TSC + LARGEPCAP LIBUNWIND PIE STATICDAQ THREADSANITIZER TSC OPTIONS_DEFAULT= STATICDAQ OPTIONS_DEFAULT_amd64= HYPERSCAN OPTIONS_SUB= yes ADDRESSSANITIZER_DESC= Enable address sanitizer FLATBUFFERS_DESC= Enable flatbuffers support HYPERSCAN_DESC= Enable high-performance regular expression lib LARGEPCAP_DESC= Enable support for pcaps larger than 2 GB +LIBUNWIND_DESC= Print stack trace in case of crash PIE_DESC= Enable PIE (Broken) STATICDAQ_DESC= Link static DAQ modules 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 +LIBUNWIND_LIB_DEPENDS= libunwind.so:devel/libunwind +LIBUNWIND_CMAKE_BOOL= ENABLE_LIBUNWIND PIE_CMAKE_BOOL= ENABLE_PIE STATICDAQ_CMAKE_BOOL= ENABLE_STATIC_DAQ THREADSANITIZER_CMAKE_BOOL= ENABLE_THREAD_SANITIZER TSC_CMAKE_BOOL= ENABLE_TSC_CLOCK .include .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 .include diff --git a/security/snort3/distinfo b/security/snort3/distinfo index b2a59b2a94d7..946233af3512 100644 --- a/security/snort3/distinfo +++ b/security/snort3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685101117 -SHA256 (snort3-snort3-3.1.62.0_GH0.tar.gz) = 1f18936da65d52702f75e5b9ffe2cfbc9c9373201801ad275f6e636451f7e06f -SIZE (snort3-snort3-3.1.62.0_GH0.tar.gz) = 3245025 +TIMESTAMP = 1685968779 +SHA256 (snort3-snort3-3.1.63.0_GH0.tar.gz) = 7ca415ac8098cd5ee001dc751966d4a6028961ca9cfc788447b7ea7048f53f85 +SIZE (snort3-snort3-3.1.63.0_GH0.tar.gz) = 3246802 diff --git a/security/snort3/files/patch-cmake_include__libraries.cmake b/security/snort3/files/patch-cmake_include__libraries.cmake new file mode 100644 index 000000000000..e6956ad1c847 --- /dev/null +++ b/security/snort3/files/patch-cmake_include__libraries.cmake @@ -0,0 +1,10 @@ +--- cmake/include_libraries.cmake.orig 2023-06-05 12:40:26 UTC ++++ cmake/include_libraries.cmake +@@ -26,4 +26,6 @@ if (ENABLE_SAFEC) + endif (ENABLE_SAFEC) + find_package(ICONV QUIET) + find_package(UUID QUIET) +-find_package(Libunwind) ++if (ENABLE_LIBUNWIND) ++ find_package(Libunwind) ++endif (ENABLE_LIBUNWIND) diff --git a/security/snort3/files/patch-config.cmake.h.in b/security/snort3/files/patch-config.cmake.h.in index 31b9973dfe56..46b4fec88ac8 100644 --- a/security/snort3/files/patch-config.cmake.h.in +++ b/security/snort3/files/patch-config.cmake.h.in @@ -1,11 +1,11 @@ ---- config.cmake.h.in.orig 2021-03-27 18:13:03 UTC +--- config.cmake.h.in.orig 2023-06-02 19:53:06 UTC +++ config.cmake.h.in -@@ -167,5 +167,8 @@ +@@ -173,5 +173,8 @@ /* Define if `thread_local` keyword should be used */ #cmakedefine USE_THREAD_LOCAL 1 +/* Define to 1 if you have the GNU form of the `sighandler_t' function. */ +#cmakedefine HAVE_SIGHANDLER_T 1 + #endif diff --git a/security/snort3/files/patch-src_control_control.h b/security/snort3/files/patch-src_control_control.h index 96725a313534..d99f74fa5418 100644 --- a/security/snort3/files/patch-src_control_control.h +++ b/security/snort3/files/patch-src_control_control.h @@ -1,11 +1,10 @@ ---- src/control/control.h.orig 2021-09-08 19:39:41 UTC +--- src/control/control.h.orig 2023-06-02 19:53:06 UTC +++ src/control/control.h -@@ -26,6 +26,7 @@ - #include +@@ -28,6 +28,7 @@ #include #include #include +#include #include "main/snort_types.h"