2 files changed, 32 insertions, 14 deletions

diff --git a/security/snort/Makefile b/security/snort/Makefile
index a86aa46e7db1..45959dae9288 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -20,17 +20,15 @@ LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 BUILD_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
 RUN_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq
 
-OPTIONS_DEFINE=		IPV6 GRE ZLIB NORMALIZER REACT \
-			PERFPROFILE LRGPCAP SOURCEFIRE NONETHER \
-			DOCS
+OPTIONS_DEFINE=		IPV6 GRE HA NORMALIZER DOCS APPID \
+			PERFPROFILE LRGPCAP SOURCEFIRE NONETHER
 
 OPTIONS_GROUP=		ADDONS DEV
 OPTIONS_GROUP_ADDONS=	BARNYARD PULLEDPORK
 OPTIONS_GROUP_DEV=	DBGSNORT
-
-OPTIONS_DEFAULT=	IPV6 GRE ZLIB NORMALIZER REACT \
-			PERFPROFILE SOURCEFIRE PULLEDPORK \
-			BARNYARD
+OPTIONS_SUB=		yes
+OPTIONS_DEFAULT=	IPV6 GRE NORMALIZER BARNYARD \
+			PERFPROFILE SOURCEFIRE PULLEDPORK
 
 GRE_DESC=		GRE support
 IPV6_DESC=		IPv6 in snort.conf
@@ -38,15 +36,14 @@ LRGPCAP_DESC=		Pcaps larger than 2GB
 NONETHER_DESC=		Non-Ethernet Decoders
 NORMALIZER_DESC=	Normalizer
 PERFPROFILE_DESC=	Performance profiling
-REACT_DESC=		React
-SOURCEFIRE_DESC=	Sourcefire-specific build options
+SOURCEFIRE_DESC=	Sourcefire recommended build options
 TARGETBASED_DESC=	Targetbased support
-ZLIB_DESC=		GZIP support
-
+APPID_DESC=		Build with application id support (EXPERIMENTAL)
+HA_DESC=		Enable high-availability state sharing (EXPERIMENTAL)
+FILEINSPECT_DESC=	Build with extended file inspection features (EXPERIMENTAL)
 ADDONS_DESC=		Depend on 3rd party addons
 BARNYARD_DESC=		Depend on barnyard2 (supports also snortsam)
 PULLEDPORK_DESC=	Depend on pulledpork
-
 DEV_DESC=		Developper options
 DBGSNORT_DESC=		Enable debugging symbols+core dumps
 
@@ -57,12 +54,16 @@ LRGPCAP_CONFIGURE_ENABLE=	large-pcap
 NONETHER_CONFIGURE_ENABLE=	non-ether-decoders
 NORMALIZER_CONFIGURE_ENABLE=	normalizer
 PERFPROFILE_CONFIGURE_ENABLE=	perfprofiling ppm
-REACT_CONFIGURE_ENABLE=		react
 SOURCEFIRE_CONFIGURE_ENABLE=	sourcefire
-ZLIB_CONFIGURE_ENABLE=		zlib
+APPID_CONFIGURE_ENABLE=		open-appid
+HA_CONFIGURE_ENABLE=		ha
+FILEINSPECT_CONFIGURE_ENABLE=	file-inspect
 
 BARNYARD_RUN_DEPENDS=	barnyard2:${PORTSDIR}/security/barnyard2
 PULLEDPORK_RUN_DEPENDS=	pulledpork.pl:${PORTSDIR}/security/pulledpork
+APPID_LIB_DEPENDS=	libluajit-5.1.so:${PORTSDIR}/lang/luajit
+APPID_CONFIGURE_ENV+=	luajit_CFLAGS="-I${LOCALBASE}/include/luajit-2.0" \
+			luajit_LIBS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.options.mk>
 
diff --git a/security/snort/pkg-plist b/security/snort/pkg-plist
index fb1ceeb0b422..367226ef62d7 100644
--- a/security/snort/pkg-plist
+++ b/security/snort/pkg-plist
@@ -1,6 +1,8 @@
 bin/snort
 bin/u2boat
 bin/u2spewfoo
+%%APPID%%bin/u2openappid
+%%APPID%%bin/u2streamer
 @unexec if cmp  -s %D/etc/snort/classification.config-sample %D/etc/snort/classification.config; then rm -f %D/etc/snort/classification.config; fi
 etc/snort/classification.config-sample
 @exec if [ ! -f %D/etc/snort/classification.config ] ; then cp -p %D/%F %B/classification.config; fi
@@ -45,6 +47,13 @@ include/snort/dynamic_output/sfrt_dir.h
 include/snort/dynamic_output/sfrt_trie.h
 include/snort/dynamic_output/snort_debug.h
 include/snort/dynamic_output/stream_api.h
+%%APPID%%include/snort/dynamic_preproc/md5.h
+%%APPID%%include/snort/dynamic_preproc/sfghash.h
+%%APPID%%include/snort/dynamic_preproc/sfhashfcn.h
+%%APPID%%include/snort/dynamic_preproc/sflsq.h
+%%APPID%%include/snort/dynamic_preproc/sfmemcap.h
+%%APPID%%include/snort/dynamic_preproc/sfprimetable.h
+%%APPID%%include/snort/dynamic_preproc/sfxhash.h
 include/snort/dynamic_preproc/appId.h
 include/snort/dynamic_preproc/bitop.h
 include/snort/dynamic_preproc/cpuclock.h
@@ -102,6 +111,10 @@ lib/snort_dynamicengine/libsf_engine.a
 lib/snort_dynamicengine/libsf_engine.so
 lib/snort_dynamicengine/libsf_engine.so.0
 lib/snort_dynamicengine/libsf_engine.so.0.0.0
+%%APPID%%lib/snort_dynamicpreprocessor/libsf_appid_preproc.a
+%%APPID%%lib/snort_dynamicpreprocessor/libsf_appid_preproc.so
+%%APPID%%lib/snort_dynamicpreprocessor/libsf_appid_preproc.so.0
+%%APPID%%lib/snort_dynamicpreprocessor/libsf_appid_preproc.so.0.0.0
 lib/snort_dynamicpreprocessor/libsf_dce2_preproc.a
 lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so
 lib/snort_dynamicpreprocessor/libsf_dce2_preproc.so.0
@@ -226,6 +239,10 @@ man/man8/snort.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/WISHLIST
 %%PORTDOCS%%%%DOCSDIR%%/generators
 %%PORTDOCS%%%%DOCSDIR%%/snort_manual.pdf
+%%APPID%%src/snort_dynamicsrc/md5.h
+%%APPID%%src/snort_dynamicsrc/sfmemcap.h
+%%APPID%%src/snort_dynamicsrc/sfprimetable.h
+%%APPID%%src/snort_dynamicsrc/sfxhash.h
 src/snort_dynamicsrc/Unified2_common.h
 src/snort_dynamicsrc/appId.h
 src/snort_dynamicsrc/bitop.h