Date: Wed, 31 Jul 2019 19:27:54 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r507729 - in head/security/snort3: . files Message-ID: <201907311927.x6VJRs9m058189@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Wed Jul 31 19:27:54 2019 New Revision: 507729 URL: https://svnweb.freebsd.org/changeset/ports/507729 Log: security/snort3: Update version 3.0.0-255=>3.0.0-258 - Change RUN_DEPENDS to libdaq-3* - Add USES=localbase - Add FLATBUFFERS option Reported by: ozkan.kirik@gmail.com Added: head/security/snort3/files/patch-src_flow_ha.cc (contents, props changed) head/security/snort3/files/patch-src_main_analyzer.cc (contents, props changed) Modified: head/security/snort3/Makefile head/security/snort3/distinfo head/security/snort3/pkg-plist Modified: head/security/snort3/Makefile ============================================================================== --- head/security/snort3/Makefile Wed Jul 31 19:09:43 2019 (r507728) +++ head/security/snort3/Makefile Wed Jul 31 19:27:54 2019 (r507729) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= snort -DISTVERSION= 3.0.0-255 -PORTREVISION= 1 +DISTVERSION= 3.0.0-258 PORTEPOCH= 1 CATEGORIES= security PKGNAMESUFFIX= 3 @@ -14,16 +13,16 @@ COMMENT= Lightweight network intrusion detection syste LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= daq>=2.2.2:net/daq \ +BUILD_DEPENDS= libdaq>=0:net/libdaq \ bash>0:shells/bash LIB_DEPENDS= libpcre.so:devel/pcre \ libdnet.so:net/libdnet \ libpcap.so:net/libpcap \ libluajit-5.1.so:lang/luajit \ libhwloc.so:devel/hwloc -RUN_DEPENDS= daq>=2.2.2:net/daq +RUN_DEPENDS= libdaq>=0:net/libdaq -USES= cmake compiler:c++11-lang cpe libtool pathfix pkgconfig shebangfix ssl iconv +USES= cmake compiler:c++11-lang cpe libtool localbase pathfix pkgconfig shebangfix ssl iconv USE_GITHUB= yes GH_ACCOUNT= snort3 @@ -31,16 +30,14 @@ GH_PROJECT= snort3 SHEBANG_FILES= tools/appid_detector_builder.sh -LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} - -OPTIONS_DEFINE= ADDRESSSANITIZER DEBUG DOCS LARGEPCAP PIE THREADSANITIZER STATICDAQ +OPTIONS_DEFINE= ADDRESSSANITIZER DEBUG DOCS FLATBUFFERS LARGEPCAP PIE THREADSANITIZER STATICDAQ OPTIONS_DEFINE_amd64= HYPERSCAN TSC OPTIONS_DEFAULT= STATICDAQ ADDRESSSANITIZER_DESC= Enable address sanitizer DEBUG_DESC= Enable debug DOCS_DESC= Enable documentation -# FLATBUFFERS_DESC= Enable flatbuffers support // Doesn't get detected +FLATBUFFERS_DESC= Enable flatbuffers support HYPERSCAN_DESC= Enable high-performance regular expression lib LARGEPCAP_DESC= Enable support for pcaps larger than 2 GB PIE_DESC= Enable PIE (Broken) @@ -57,7 +54,7 @@ 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 +FLATBUFFERS_LIB_DEPENDS= libflatbuffers.so:devel/flatbuffers HYPERSCAN_LIB_DEPENDS= libhs.so:devel/hyperscan CONFLICTS= snort-2* Modified: head/security/snort3/distinfo ============================================================================== --- head/security/snort3/distinfo Wed Jul 31 19:09:43 2019 (r507728) +++ head/security/snort3/distinfo Wed Jul 31 19:27:54 2019 (r507729) @@ -1,3 +1,3 @@ -TIMESTAMP = 1557135966 -SHA256 (snort3-snort3-3.0.0-255_GH0.tar.gz) = 65467078ef7d77dd78b24c3639acca86d8710f33d6700c482043a7e3c9500803 -SIZE (snort3-snort3-3.0.0-255_GH0.tar.gz) = 6363224 +TIMESTAMP = 1563993608 +SHA256 (snort3-snort3-3.0.0-258_GH0.tar.gz) = 93db0d36d18c22dd78caf46c6fdfb7121886784167b5e5b3e6fcbddddc2cdfe2 +SIZE (snort3-snort3-3.0.0-258_GH0.tar.gz) = 6361952 Added: head/security/snort3/files/patch-src_flow_ha.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/snort3/files/patch-src_flow_ha.cc Wed Jul 31 19:27:54 2019 (r507729) @@ -0,0 +1,10 @@ +--- src/flow/ha.cc.orig 2019-07-31 09:26:02 UTC ++++ src/flow/ha.cc +@@ -35,6 +35,7 @@ + #include "flow_key.h" + #include "ha_module.h" + #include "session.h" ++#include <array> + + using namespace snort; + Added: head/security/snort3/files/patch-src_main_analyzer.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/snort3/files/patch-src_main_analyzer.cc Wed Jul 31 19:27:54 2019 (r507729) @@ -0,0 +1,11 @@ +--- src/main/analyzer.cc.orig 2019-07-31 10:41:21 UTC ++++ src/main/analyzer.cc +@@ -94,7 +94,7 @@ class RetryQueue (public) + RetryQueue(unsigned interval_ms) + { + assert(interval_ms > 0); +- interval = { interval_ms / 1000, (interval_ms % 1000) * 1000 }; ++ interval = { static_cast<time_t>(interval_ms / 1000), static_cast<suseconds_t>( (interval_ms % 1000) * 1000 )}; + } + + ~RetryQueue() Modified: head/security/snort3/pkg-plist ============================================================================== --- head/security/snort3/pkg-plist Wed Jul 31 19:09:43 2019 (r507728) +++ head/security/snort3/pkg-plist Wed Jul 31 19:27:54 2019 (r507729) @@ -41,6 +41,7 @@ include/snort/flow/expect_cache.h include/snort/flow/flow.h include/snort/flow/flow_key.h include/snort/flow/flow_stash.h +include/snort/flow/ha.h include/snort/flow/stash_item.h include/snort/framework/api_options.h include/snort/framework/base_api.h @@ -105,6 +106,7 @@ include/snort/network_inspectors/appid/http_xff_fields include/snort/network_inspectors/packet_tracer/packet_tracer.h include/snort/packet_io/active.h include/snort/packet_io/sfdaq.h +include/snort/packet_io/sfdaq_instance.h include/snort/profiler/memory_context.h include/snort/profiler/memory_defs.h include/snort/profiler/memory_profiler_defs.h @@ -138,6 +140,7 @@ include/snort/protocols/vlan.h include/snort/protocols/wlan.h include/snort/pub_sub/appid_events.h include/snort/pub_sub/expect_events.h +include/snort/pub_sub/finalize_packet_event.h include/snort/pub_sub/http_events.h include/snort/pub_sub/sip_events.h include/snort/search_engines/search_common.h @@ -156,6 +159,8 @@ include/snort/time/tsc_clock.h include/snort/utils/bitop.h include/snort/utils/cpp_macros.h include/snort/utils/endian.h +include/snort/utils/event_gen.h +include/snort/utils/infractions.h include/snort/utils/kmap.h include/snort/utils/primed_allocator.h include/snort/utils/safec.h @@ -191,7 +196,6 @@ libdata/pkgconfig/snort.pc %%PORTDOCS%%%%DOCSDIR%%/connectors.txt %%PORTDOCS%%%%DOCSDIR%%/counts.txt %%PORTDOCS%%%%DOCSDIR%%/daq.txt -%%PORTDOCS%%%%DOCSDIR%%/daq_readme.txt %%PORTDOCS%%%%DOCSDIR%%/data.txt %%PORTDOCS%%%%DOCSDIR%%/dcerpc.txt %%PORTDOCS%%%%DOCSDIR%%/differences.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907311927.x6VJRs9m058189>