[Midnightbsd-cvs] mports [15596] add barnyard2 for snort and update snort to 2.9.x

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Nov 16 16:08:18 EST 2013


Revision: 15596
          http://svnweb.midnightbsd.org/mports/?rev=15596
Author:   laffer1
Date:     2013-11-16 16:08:18 -0500 (Sat, 16 Nov 2013)
Log Message:
-----------
add barnyard2 for snort and update snort to 2.9.x

Modified Paths:
--------------
    trunk/security/Makefile
    trunk/security/snort/Makefile
    trunk/security/snort/distinfo
    trunk/security/snort/files/pkg-message.in
    trunk/security/snort/pkg-plist

Added Paths:
-----------
    trunk/security/barnyard2/
    trunk/security/barnyard2/Makefile
    trunk/security/barnyard2/distinfo
    trunk/security/barnyard2/files/
    trunk/security/barnyard2/files/barnyard2.in
    trunk/security/barnyard2/files/pkg-message.in
    trunk/security/barnyard2/pkg-descr
    trunk/security/barnyard2/pkg-plist
    trunk/security/snort/files/patch-etc__snort.conf
    trunk/security/snort/files/snort.in

Removed Paths:
-------------
    trunk/security/snort/files/patch-snort.conf
    trunk/security/snort/files/pkg-message-dynamicplugin
    trunk/security/snort/files/snort.sh.in

Property Changed:
----------------
    trunk/security/snort/distinfo
    trunk/security/snort/files/pkg-message.in
    trunk/security/snort/pkg-plist

Modified: trunk/security/Makefile
===================================================================
--- trunk/security/Makefile	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/Makefile	2013-11-16 21:08:18 UTC (rev 15596)
@@ -3,6 +3,7 @@
 COMMENT = Security tools
 
 SUBDIR += aide
+SUBDIR += barnyard2
 SUBDIR += ca_root_nss
 SUBDIR += chroot_safe
 SUBDIR += clamav

Added: trunk/security/barnyard2/Makefile
===================================================================
--- trunk/security/barnyard2/Makefile	                        (rev 0)
+++ trunk/security/barnyard2/Makefile	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,153 @@
+# $MidnightBSD$
+
+PORTNAME=	barnyard2
+PORTVERSION=	1.12
+CATEGORIES=	security
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Interpreter for Snort unified2 binary output files
+
+LICENSE=	gpl2
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	firnsy
+GH_TAGNAME=	v2-${PORTVERSION}
+GH_COMMIT=	3c1f553
+
+OPTIONS_DEFINE=	64BIT ARUBA BRO GRE IPV6 MPLS MYSQL MYSQL_SSL ODBC PRELUDE PGSQL
+NO_OPTIONS_SORT=yes
+
+64BIT_DESC=	Enable 64bit compilation (experimental)
+ARUBA_DESC=	Enable aruba support
+BRO_DESC=	Enable bro support (libbroccoli)
+GRE_DESC=	Enable gre support
+MYSQL_SSL_DESC=	Enable mysql ssl support (experimental)
+PRELUDE_DESC=	Enable prelude support
+
+.if defined(SLAVE)
+OPTIONS_DEFINE+=	TCL
+OPTIONS_DESC=	Enable tcl support for sguil
+OPTIONS_DEFAULT+=	TCL
+.endif
+
+USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
+LIBTOOLIZE_ARGS=--copy --force
+AUTOMAKE_ARGS=	--add-missing --copy
+ACLOCAL_ARGS=	-I m4 -I ${LOCALBASE}/share/aclocal
+
+USE_RC_SUBR=	barnyard2
+GNU_CONFIGURE=	yes
+
+SUB_FILES=	pkg-message
+
+PORTDOCS1=	README RELEASE.NOTES
+PORTDOCS2=	INSTALL README.aruba README.database README.sguil README.snortsam
+PORTDOCS=	${PORTDOCS1} ${PORTDOCS2}
+PORTEXAMPLES=	SCHEMA_ACCESS create_db2 create_mssql create_mysql create_oracle.sql create_postgresql
+
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:M64BIT}
+CONFIGURE_ARGS+=	--enable-64bit-gcc
+.else
+CONFIGURE_ARGS+=	--disable-64bit-gcc
+.endif
+
+.if ${PORT_OPTIONS:MARUBA}
+CONFIGURE_ARGS+=	--enable-aruba
+.else
+CONFIGURE_ARGS+=	--disable-aruba
+.endif
+
+.if ${PORT_OPTIONS:MBRO}
+BROKEN=			Bro port is in transition right now, so this is not supported at this time
+BUILD_DEPENDS+=		bro:${PORTSDIR}/security/bro-barnyard2
+CONFIGURE_ARGS+=	--enable-bro --with-broccoli=${LOCALBASE}/lib
+.else
+CONFIGURE_ARGS+=	--disable-bro
+.endif
+
+.if ${PORT_OPTIONS:MGRE}
+CONFIGURE_ARGS+=	--enable-gre
+.else
+CONFIGURE_ARGS+=	--disable-gre
+.endif
+
+.if ${PORT_OPTIONS:MIPV6}
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
+
+.if ${PORT_OPTIONS:MMPLS}
+CONFIGURE_ARGS+=	--enable-mpls
+.else
+CONFIGURE_ARGS+=	--disable-mpls
+.endif
+
+.if ${PORT_OPTIONS:MMYSQL}
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--with-mysql \
+			--with-mysql-includes=${LOCALBASE}/include/mysql \
+			--with-mysql-libraries=${LOCALBASE}/lib/mysql
+.else
+CONFIGURE_ARGS+=	--without-mysql
+.endif
+
+.if ${PORT_OPTIONS:MMYSQL_SSL}
+USE_MYSQL=		yes
+CONFIGURE_ARGS+=	--enable-mysql-ssl-support
+.else
+CONFIGURE_ARGS+=	--disable-mysql-ssl-support
+.endif
+
+.if ${PORT_OPTIONS:MODBC}
+LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
+CONFIGURE_ARGS+=	--with-odbc
+.else
+CONFIGURE_ARGS+=	--without-odbc
+.endif
+
+.if ${PORT_OPTIONS:MPRELUDE}
+BUILD_DEPENDS+=	prelude-manager:${PORTSDIR}/security/prelude-manager
+CONFIGURE_ARGS+=	--enable-prelude
+.else
+CONFIGURE_ARGS+=	--disable-prelude
+.endif
+
+.if ${PORT_OPTIONS:MPGSQL}
+USE_PGSQL=		yes
+WANT_PGSQL_VER=		92+
+CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}/bin/pg_config --with-pgsql-includes=${LOCALBASE}/include/postgresql/server
+.else
+CONFIGURE_ARGS+=	--without-postgresql
+.endif
+
+.if ${PORT_OPTIONS:MTCL}
+USE_TCL=		yes
+CONFIGURE_ARGS+=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER}
+.else
+CONFIGURE_ARGS+=	--without-tcl
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} 's|/etc|${LOCALBASE}/etc|' \
+		${WRKSRC}/etc/barnyard2.conf
+
+post-install:
+	@${CP} ${WRKSRC}/etc/barnyard2.conf ${PREFIX}/etc/barnyard2.conf.sample
+	if [ ! -f ${PREFIX}/etc/barnyard2.conf ]; then \
+		${CP} -p ${PREFIX}/etc/barnyard2.conf.sample ${PREFIX}/etc/barnyard2.conf; \
+	fi
+
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS1} ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS2} ${DOCSDIR}
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	cd ${WRKSRC}/schemas && ${INSTALL_DATA} ${PORTEXAMPLES} ${EXAMPLESDIR}
+.endif
+
+.include <bsd.port.mk>

Added: trunk/security/barnyard2/distinfo
===================================================================
--- trunk/security/barnyard2/distinfo	                        (rev 0)
+++ trunk/security/barnyard2/distinfo	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,2 @@
+SHA256 (barnyard2-1.12.tar.gz) = 30b31ec4ad1d2c05493f10e082496b42111807497443f01bb2648859eff246a9
+SIZE (barnyard2-1.12.tar.gz) = 425744

Added: trunk/security/barnyard2/files/barnyard2.in
===================================================================
--- trunk/security/barnyard2/files/barnyard2.in	                        (rev 0)
+++ trunk/security/barnyard2/files/barnyard2.in	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# $FreeBSD$
+#
+# PROVIDE: barnyard2
+# REQUIRE: DAEMON%%MYSQL%%%%PGSQL%%
+#
+# Add the following lines to /etc/rc.conf to enable barnyard2:
+# barnyard2_enable (bool):	Set to YES to enable barnyard2
+# 				Default: NO
+# barnyard2_flags (str):		Extra flags passed to barnyard2
+#				Default: -D
+# barnyard2_conf (str):		Barnyard configuration file
+#				Default: %%PREFIX%%/etc/barnyard2.conf
+# optional, multi-barnyard2:
+# barnyard2_rules="1 2 3"
+# barnyard2_1_flags="-D"
+# barnyard2_1_pidfile=""
+# #$command $flags $args
+#
+# USAGE: barnyard2 [-options]
+
+. /etc/rc.subr
+
+name="barnyard2"
+rcvar=barnyard2_enable
+
+load_rc_config $name
+
+# set some defaults
+: ${barnyard2_enable="NO"}
+: ${barnyard2_conf="%%PREFIX%%/etc/barnyard2.conf"}
+: ${barnyard2_flags="-D"}
+
+command="%%PREFIX%%/bin/barnyard2"
+command_args="-c ${barnyard2_conf} -D"
+
+if [ -n "${barnyard2_rules}" ];then
+  _1=$1
+  rc=0
+  if [ $# -gt 1 ];then shift; barnyard2_rules=$*; fi
+  for i in ${barnyard2_rules}; do
+    echo -n "$i:"
+    eval barnyard2_flags=\$barnyard2_${i}_flags
+    eval pidfile=\$barnyard2_${i}_pidfile
+    eval barnyard2_conf=\$barnyard2_${i}_conf
+    command_args="-c $barnyard2_conf -D"
+    run_rc_command "$_1"
+    if [ $? -ne 0 ];then rc=1 ; fi
+    unset _pidcmd _rc_restart_done
+  done
+else
+   run_rc_command "$1"
+fi

Added: trunk/security/barnyard2/files/pkg-message.in
===================================================================
--- trunk/security/barnyard2/files/pkg-message.in	                        (rev 0)
+++ trunk/security/barnyard2/files/pkg-message.in	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,16 @@
+Read the notes in the barnyard2.conf file for how to configure
+%%PREFIX%%/etc/barnyard2.conf after installation.  For addtional information
+see the Securixlive FAQ at http://www.securixlive.com/barnyard2/faq.php.
+
+In order to enable barnyard2 to start on boot, you must edit /etc/rc.conf
+with the appropriate flags, etc.  See the FreeBSD Handbook for syntax:
+http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/configtuning-rcng.html
+
+For the various options available, type % barnyard2 -h after install or read
+the options in the startup script - in %%PREFIX%%/etc/rc.d.
+
+Barnyard2 can process unified2 files from snort or suricata.  It can also
+interact with snortsam firewall rules as well as the sguil-sensor. Those
+ports must be installed separately if you wish to use them.
+
+************************************************************************

Added: trunk/security/barnyard2/pkg-descr
===================================================================
--- trunk/security/barnyard2/pkg-descr	                        (rev 0)
+++ trunk/security/barnyard2/pkg-descr	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,24 @@
+Barnyard is a critical tool for the parsing of Snort's unified binary files,
+processing and on-forwarding to a variety of output plugins. Unfortunately
+it has not seen an updated in over 4 years and is not going to be maintained
+by the original developers. With the new version of the unified format
+(ie. unified2) arriving we need something to bridge this gap.
+
+The SXL team love barnyard. So much so that we want it to stay and have been
+tinkering around with the code to give it a breath of new life. Here is what
+we have achieved to far for this reinvigorated code base:
+
+    * Parsing of the new unified2 log files.
+    * Maintaining majority of the command syntax of barnyard.
+    * Addressed all associated bug reports and feature requests arising since
+		barnyard-0.2.0.
+    * Completely rewritten code based on the GPLv2 Snort making it entirely
+		GPLv2.
+
+This is an effort to fuse the awesome work of Snort and the original concept
+of barnyard giving it a fresh update along the way. We've come a long way so
+far and have a very stable build that we've integrated into our NSMnow
+framework.  If you have any feature requests, bugs or gripes then send them
+our way.
+
+WWW: http://www.securixlive.com/barnyard2/

Added: trunk/security/barnyard2/pkg-plist
===================================================================
--- trunk/security/barnyard2/pkg-plist	                        (rev 0)
+++ trunk/security/barnyard2/pkg-plist	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,4 @@
+bin/barnyard2
+ at unexec if cmp -s %D/etc/barnyard2.conf %D/etc/barnyard2.conf.sample; then rm -f %D/etc/barnyard2.conf; fi
+etc/barnyard2.conf.sample
+ at exec [ -f %B/barnyard2.conf ] || cp -p %B/%f %B/barnyard2.conf

Modified: trunk/security/snort/Makefile
===================================================================
--- trunk/security/snort/Makefile	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/snort/Makefile	2013-11-16 21:08:18 UTC (rev 15596)
@@ -1,38 +1,57 @@
 # $MidnightBSD$
 
 PORTNAME=	snort
-PORTVERSION=	2.8.2.1
-PORTREVISION=	2
+PORTVERSION=	2.9.5.3
 CATEGORIES=	security
-MASTER_SITES=	http://www.snort.org/dl/current/
+MASTER_SITES=	SF/snort/snort \
+		http://mirrors.rit.edu/zi/
 
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Lightweight network intrusion detection system
 
-LICENSE=        gpl2
+LICENSE=	gpl2
 
-MAKE_JOBS_UNSAFE=	yes
 
 LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+BUILD_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq \
+		${LOCALBASE}/lib/libnet11/libnet.a:${PORTSDIR}/net/libnet
+RUN_DEPENDS=	daq>=2.0.0:${PORTSDIR}/net/daq \
+		${LOCALBASE}/lib/libnet11/libnet.a:${PORTSDIR}/net/libnet
 
-OPTIONS=	DYNAMIC "Enable dynamic plugin support" on \
-		FLEXRESP "Flexible response to events" off \
-		FLEXRESP2 "Flexible response to events (version 2)" off \
-		MYSQL "Enable MySQL support" off \
-		ODBC "Enable ODBC support" off \
-		POSTGRESQL "Enable PostgreSQL support" off \
-		PRELUDE "Enable Prelude NIDS integration" off \
-		PERPROFILE "Enable Performance Profiling" off
+OPTIONS_DEFINE=	IPV6 MPLS GRE TARGETBASED ZLIB NORMALIZER REACT \
+		PERFPROFILE FLEXRESP3 LRGPCAP SNORTSAM SOURCEFIRE \
+		DBGSNORT BARNYARD PULLEDPORK NONETHER
+OPTIONS_DEFAULT=IPV6 MPLS GRE ZLIB NORMALIZER REACT PERFPROFILE \
+		FLEXRESP3 SOURCEFIRE TARGETBASED PULLEDPORK \
+		BARNYARD
 
-USE_RC_SUBR=	snort.sh
+GRE_DESC=		Enable GRE support
+TARGETBASED_DESC=	Enable targetbased support
+ZLIB_DESC=		Enable GZIP support
+NONETHER_DESC=		Enable non-Ethernet Decoders
+NORMALIZER_DESC=	Enable normalizer
+REACT_DESC=		Enable react
+PERFPROFILE_DESC=	Enable performance profiling
+FLEXRESP3_DESC=		Enable flexible response on events (v3)
+LRGPCAP_DESC=		Enable pcaps larger than 2GB
+SNORTSAM_DESC=		Enable unofficial Snortsam patch
+SOURCEFIRE_DESC=	Enable Sourcefire-specific build options
+DBGSNORT_DESC=		Enable debugging symbols+core dumps
+BARNYARD_DESC=		Depend on Barnyard2
+PULLEDPORK_DESC=	Depend on pulledpork
+
+.include <bsd.mport.options.mk>
+
+USE_RC_SUBR=	snort
 SUB_FILES=	pkg-message
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+MAKE_JOBS_UNSAFE=	yes
 
 CONFIG_DIR?=	${PREFIX}/etc/snort
 CONFIG_FILES=	classification.config gen-msg.map reference.config \
-		sid-msg.map snort.conf threshold.conf unicode.map
+		snort.conf threshold.conf unicode.map
 RULES_DIR=	${PREFIX}/etc/snort/rules
 LOGS_DIR=	/var/log/snort
 
@@ -39,126 +58,154 @@
 MAN8=		snort.8
 DOCS=		RELEASE.NOTES doc/AUTHORS doc/BUGS doc/CREDITS \
 		doc/README* doc/USAGE doc/*.pdf
+PREPROC_RULE_DIR=	${RULES_DIR}/../preproc_rules
+PREPROC_RULES=		decoder.rules preprocessor.rules sensitive-data.rules
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_FLEXRESP)
-LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet10-config
-.elif defined(WITH_FLEXRESP2)
+USE_AUTOTOOLS=	libtool
+USE_LDCONFIG=	yes
 LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet11-config
-.endif
-
 .if exists(${LIBNET_CONFIG})
 LIBNET_CFLAGS!=	${LIBNET_CONFIG} --cflags
 LIBNET_LIBS!=	${LIBNET_CONFIG} --libs
+.else
+LIBNET_CFLAGS=	-I${LOCALBASE}/include/libnet11
+LIBNET_LIBS=	-L${LOCALBASE}/lib/libnet11 -lnet
+.endif
 LIBNET_INCDIR=	${LIBNET_CFLAGS:M-I*:S/-I//}
 LIBNET_LIBDIR=	${LIBNET_LIBS:M-L*:S/-L//}
+
+CFLAGS+=	-fstack-protector
+CONFIGURE_ARGS=	--enable-dynamicplugin --enable-reload \
+		--enable-reload-error-restart \
+		--with-dnet-includes=${LIBNET_INCDIR} \
+		--with-dnet-libraries=${LIBNET_LIBDIR}
+
+PLIST_SUB+=	DYNAMIC=""
+
+.if empty(PORT_OPTIONS:MFLEXRESP3)
+CONFIGURE_ARGS+=--disable-flexresp3 --disable-active-response
 .endif
 
-.if !defined(WITHOUT_DYNAMIC)
-USE_AUTOTOOLS=	libtool
-USE_LDCONFIG=	yes
-CONFIGURE_ARGS+=	--enable-dynamicplugin
-PLIST_SUB+=	DYNAMIC=""
+.if ${PORT_OPTIONS:MLRGPCAP}
+CONFIGURE_ARGS+=--enable-large-pcap
+.endif
+
+.if ${PORT_OPTIONS:MDBGSNORT}
+CONFIGURE_ARGS+=--enable-corefiles --enable-debug
+MAKE_ENV+=	DONTSTRIP="yes"
 .else
-PLIST_SUB+=	DYNAMIC="@comment "
+CONFIGURE_ARGS+=--disable-corefiles
 .endif
 
-.if defined(WITH_FLEXRESP)
-.if defined(WITH_FLEXRESP2)
-IGNORE=			options FLEXRESP and FLEXRESP2 are mutually exclusive
+.if ${PORT_OPTIONS:MSOURCEFIRE}
+CONFIGURE_ARGS+=--enable-sourcefire
 .endif
-BUILD_DEPENDS+=		${LIBNET_CONFIG}:${PORTSDIR}/net/libnet10
-CONFIGURE_ARGS+=	--enable-flexresp \
-			--with-libnet-includes=${LIBNET_INCDIR} \
-			--with-libnet-libraries=${LIBNET_LIBDIR}
+
+.if empty(PORT_OPTIONS:MPERFPROFILE)
+CONFIGURE_ARGS+=--disable-perfprofiling --disable-ppm
 .endif
 
-.if defined(WITH_FLEXRESP2)
-BUILD_DEPENDS+=		${LIBNET_CONFIG}:${PORTSDIR}/net/libnet \
-			libdnet*>=1.10_1:${PORTSDIR}/net/libdnet
-CONFIGURE_ARGS+=	--enable-flexresp2 \
-			--with-libnet-includes=${LIBNET_INCDIR} \
-			--with-libnet-libraries=${LIBNET_LIBDIR}
+.if empty(PORT_OPTIONS:MIPV6)
+CONFIGURE_ARGS+=--disable-ipv6
 .endif
 
-.if defined(WITH_MYSQL)
-USE_MYSQL=		yes
-CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--with-mysql=no
+.if empty(PORT_OPTIONS:MGRE)
+CONFIGURE_ARGS+=--disable-gre
 .endif
 
-.if defined(WITH_ODBC)
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
-LDFLAGS+=		${PTHREAD_LIBS}
-.else
-CONFIGURE_ARGS+=	--with-odbc=no
+.if ${PORT_OPTIONS:MNONETHER}
+CONFIGURE_ARGS+=--enable-non-ether-decoders
 .endif
 
-.if defined(WITH_POSTGRESQL)
-USE_PGSQL=		yes
-CONFIGURE_ARGS+=	--with-postgresql=${LOCALBASE}
-.if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
-LDFLAGS+=		-lssl -lcrypto
+.if empty(PORT_OPTIONS:MMPLS)
+CONFIGURE_ARGS+=--disable-mpls
 .endif
-.else
-CONFIGURE_ARGS+=	--with-postgresql=no
+
+.if empty(PORT_OPTIONS:MTARGETBASED)
+CONFIGURE_ARGS+=--disable-targetbased
 .endif
 
-.if defined(WITH_PRELUDE)
-LIB_DEPENDS+=		prelude.14:${PORTSDIR}/security/libprelude
-CONFIGURE_ARGS+=	--enable-prelude
-PLIST_SUB+=		PRELUDE=""
-.else
-CONFIGURE_ARGS+=	--disable-prelude
-PLIST_SUB+=		PRELUDE="@comment "
+.if empty(PORT_OPTIONS:MZLIB)
+CONFIGURE_ARGS+=--disable-zlib
 .endif
 
-.if defined(WITH_PERPROFILE)
-CONFIGURE_ARGS+=	--enable-perfprofiling
+.if ${PORT_OPTIONS:MNORMALIZER}
+CONFIGURE_ARGS+=--enable-normalizer
 .endif
 
+.if ${PORT_OPTIONS:MREACT}
+CONFIGURE_ARGS+=--enable-react
+.endif
+
+.if ${PORT_OPTIONS:MSNORTSAM}
+BROKEN=		current snortsam patch fails to apply
+USE_AUTOTOOLS+=	automake
+USES+=		pkgconfig
+PATCH_SITES+=	http://www.snortsam.net/files/snort-plugin/:snortsam
+PATCHFILES+=	snortsam-2.9.2.2.diff.gz:snortsam
+.endif
+
+.if ${PORT_OPTIONS:MBARNYARD}
+RUN_DEPENDS+=	barnyard2:${PORTSDIR}/security/barnyard2
+.endif
+
+.if ${PORT_OPTIONS:MPULLEDPORK}
+RUN_DEPENDS+=	pulledpork.pl:${PORTSDIR}/security/pulledpork
+.endif
+
 post-patch:
-	${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e \
-	    's|lib/snort_|lib/snort/|g'
-	${REINPLACE_CMD} "s,/etc/snort.conf,${CONFIG_DIR}/snort.conf," \
-		${WRKSRC}/src/snort.c ${WRKSRC}/snort.8
-	${REINPLACE_CMD} -e 's|lib/snort_|lib/snort/|g' ${WRKSRC}/etc/snort.conf
-.if defined(WITH_FLEXRESP) || defined(WITH_FLEXRESP2)
-	${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name 'Makefile.in' | ${XARGS} ${REINPLACE_CMD} -e 's|lib/snort_|lib/snort/|g'
+	@${REINPLACE_CMD} "s,/etc/snort.conf,${CONFIG_DIR}/snort.conf," ${WRKSRC}/src/snort.c ${WRKSRC}/snort.8
+	@${REINPLACE_CMD} -e 's|lib/snort_|lib/snort/|g' ${WRKSRC}/etc/snort.conf
+	@${REINPLACE_CMD} -e 's|^dynamicdetection|#dynamicdetection|' ${WRKSRC}/etc/snort.conf
+	@${REINPLACE_CMD} -e '/var HOME_NET/s/any/[YOU_NEED_TO_SET_HOME_NET_IN_snort.conf]/' ${WRKSRC}/etc/snort.conf
+	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in \
+		${WRKSRC}/src/dynamic-preprocessors/libs/Makefile.in ${WRKSRC}/src/dynamic-output/libs/Makefile.in
+	@${REINPLACE_CMD} -e 's|libnet-config|${LIBNET_CONFIG}|g' ${WRKSRC}/configure
+.if empty(PORT_OPTIONS:MIPV6)
+	@${REINPLACE_CMD} -e 's|^ipvar |var |' ${WRKSRC}/etc/snort.conf
+	@${REINPLACE_CMD} -e '/normalize_ip6/s/^preprocessor/#preprocessor/'  ${WRKSRC}/etc/snort.conf
+	@${REINPLACE_CMD} -e '/normalize_icmp6/s/^preprocessor/#preprocessor/'  ${WRKSRC}/etc/snort.conf
 .endif
-.if defined(WITHOUT_DYNAMIC)
-	${REINPLACE_CMD} -e "s,-am: install-libLTLIBRARIES,-am:," \
-		${WRKSRC}/src/dynamic-plugins/sf_engine/Makefile.in
+	@${REINPLACE_CMD} -e '/^# include .PREPROC_RULE/s/# include/include/' ${WRKSRC}/etc/snort.conf
+.if empty(PORT_OPTIONS:MDOCS)
+	@${REINPLACE_CMD} '/SUBDIRS = /s/doc//' ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e '/README.u2boat/d' \
+		-e '/test.*docdir.*MKDIR.*DEST/d' ${WRKSRC}/tools/u2boat/Makefile.*
 .endif
 
 pre-configure:
-.if defined(WITHOUT_DYNAMIC)
-	@${CAT} ${PATCHDIR}/pkg-message-dynamicplugin
-	@sleep 5
+.if ${PORT_OPTIONS:MSNORTSAM}
+	@${FIND} ${WRKSRC} -name 'Makefile.am' | ${XARGS} ${REINPLACE_CMD} -e 's|lib/snort_|lib/snort/|g'
+	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.am \
+		${WRKSRC}/src/dynamic-preprocessors/libs/Makefile.am \
+		${WRKSRC}/src/dynamic-output/libs/Makefile.am
+	@${ECHO_MSG} "===>   Rebuilding required files for snortsam patches..."
+	@cd ${WRKSRC} && ${SH} ${WRKSRC}/autojunk.sh
+	@${ECHO_MSG} "===>   Done.  Configuring..."
 .endif
 
 post-install:
-.if !defined(WITHOUT_DYNAMIC)
-	@${LIBTOOL} --finish ${LOCALBASE}/snort/dynamicpreprocessor
-.endif
+	#@${LIBTOOL} --finish ${LOCALBASE}/lib/snort/dynamicpreprocessor
 	[ -d ${CONFIG_DIR} ] || ${MKDIR} ${CONFIG_DIR}
-	[ -d ${EXAMPLESDIR} ] || ${MKDIR} ${EXAMPLESDIR}
 	[ -d ${RULES_DIR} ] || ${MKDIR} ${RULES_DIR}
 	[ -d ${LOGS_DIR} ] || ${MKDIR} ${LOGS_DIR}
 .for f in ${CONFIG_FILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${CONFIG_DIR}/${f}-sample
-	${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EXAMPLESDIR}/${f}-sample
 	@if [ ! -f ${CONFIG_DIR}/${f} ]; then \
 		${CP} -p ${CONFIG_DIR}/${f}-sample ${CONFIG_DIR}/${f} ; \
 	fi
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/schemas/create* ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
+	@${MKDIR} ${PREPROC_RULE_DIR}
+.for f in ${PREPROC_RULES}
+	${INSTALL_DATA} ${WRKSRC}/preproc_rules/${f} ${PREPROC_RULE_DIR}/${f}-sample
+	@if [ ! -f ${PREPROC_RULE_DIR}/${f} ]; then \
+		${CP} -p ${PREPROC_RULE_DIR}/${f}-sample ${PREPROC_RULE_DIR}/${f} ; \
+	fi
+.endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: trunk/security/snort/distinfo
===================================================================
--- trunk/security/snort/distinfo	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/snort/distinfo	2013-11-16 21:08:18 UTC (rev 15596)
@@ -1,3 +1,2 @@
-SHA256 (snort-2.8.2.1.tar.gz) = 55ffb0bf34eac5ce48e3b517a83d6c05f838d864586cebbd7d14d575ba2d5d7b
-RMD160 (snort-2.8.2.1.tar.gz) = cb29c82ad3acf81d9af05473bbc8bf71586c6768
-SIZE (snort-2.8.2.1.tar.gz) = 4377110
+SHA256 (snort-2.9.5.3.tar.gz) = 3efd31fd337e836af53d790fc2997f49fcc351e5071d4c6e4f586a88b070c52a
+SIZE (snort-2.9.5.3.tar.gz) = 5047591


Property changes on: trunk/security/snort/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Added: trunk/security/snort/files/patch-etc__snort.conf
===================================================================
--- trunk/security/snort/files/patch-etc__snort.conf	                        (rev 0)
+++ trunk/security/snort/files/patch-etc__snort.conf	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,15 @@
+--- ./etc/snort.conf.orig	2010-03-19 20:41:00.000000000 +0100
++++ ./etc/snort.conf	2010-04-27 22:26:53.000000000 +0200
+@@ -57,9 +57,9 @@
+ # Path to your rules files (this can be a relative path)
+ # Note for Windows users:  You are advised to make this an absolute path,
+ # such as:  c:\snort\rules
+-var RULE_PATH ../rules
+-var SO_RULE_PATH ../so_rules
+-var PREPROC_RULE_PATH ../preproc_rules
++var RULE_PATH ./rules
++var SO_RULE_PATH ./so_rules
++var PREPROC_RULE_PATH ./preproc_rules
+ 
+ ###################################################
+ # Step #2: Configure the decoder.  For more information, see README.decode

Deleted: trunk/security/snort/files/patch-snort.conf
===================================================================
--- trunk/security/snort/files/patch-snort.conf	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/snort/files/patch-snort.conf	2013-11-16 21:08:18 UTC (rev 15596)
@@ -1,13 +0,0 @@
---- etc/snort.conf.orig	Thu Aug  5 11:55:37 2004
-+++ etc/snort.conf	Wed Aug 11 15:52:47 2004
-@@ -106,8 +106,8 @@
- # Path to your rules files (this can be a relative path)
- # Note for Windows users:  You are advised to make this an absolute path,
- # such as:  c:\snort\rules
--var RULE_PATH ../rules
-+var RULE_PATH ./rules
--var PREPROC_RULE_PATH ../preproc_rules
-+var PREPROC_RULE_PATH ./preproc_rules
- 
- # Configure the snort decoder
- # ============================

Deleted: trunk/security/snort/files/pkg-message-dynamicplugin
===================================================================
--- trunk/security/snort/files/pkg-message-dynamicplugin	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/snort/files/pkg-message-dynamicplugin	2013-11-16 21:08:18 UTC (rev 15596)
@@ -1,10 +0,0 @@
-NOTE: The port has been configured without support for dynamic plugins.
-      It is recommended that you enable dynamic plugins by pressing
-      Ctrl-C now, run 'make config' and enable the DYNAMIC option.
-
-      If you choose not to enable dynamic plugins, the default Snort
-      configuration file may reference some dynamic plugins and
-      preprocessors that may cause Snort to not work properly or throw
-      errors. Please read the Snort documentation for more information
-      regarding dynamic plugins and which configuration directives
-      are affected.

Modified: trunk/security/snort/files/pkg-message.in
===================================================================
--- trunk/security/snort/files/pkg-message.in	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/snort/files/pkg-message.in	2013-11-16 21:08:18 UTC (rev 15596)
@@ -1,10 +1,13 @@
+=========================================================================
 Snort uses rcNG startup script and must be enabled via /etc/rc.conf
 Please see %%PREFIX%%/etc/rc.d/snort
 for list of available variables and their description.
 Configuration files are located in %%PREFIX%%/etc/snort directory.
 
-NOTE: Starting with Snort 2.4.0 (released on 2005-04-22) 
-      the rules are no longer included with the distribution.
-      Please download them from http://www.snort.org/rules/.
-      You might consider installing security/oinkmaster port to simplify
-      rules downloads and updates.
+Please note that, by default, snort will truncate packets larger than the
+default snaplen of 15158 bytes.  Additionally, LRO may cause issues with
+Stream5 target-based reassembly.  It is recommended to disable LRO, if
+your card supports it.
+
+This can be done by appending '-lro' to your ifconfig_ line in rc.conf.
+=========================================================================


Property changes on: trunk/security/snort/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Added: trunk/security/snort/files/snort.in
===================================================================
--- trunk/security/snort/files/snort.in	                        (rev 0)
+++ trunk/security/snort/files/snort.in	2013-11-16 21:08:18 UTC (rev 15596)
@@ -0,0 +1,72 @@
+#!/bin/sh
+# $MidnightBSD$
+
+# PROVIDE: snort
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: shutdown
+
+# Add the following lines to /etc/rc.conf to enable snort:
+# snort_enable (bool):		Set to YES to enable snort
+# 				Default: NO
+# snort_flags (str):		Extra flags passed to snort
+#				Default: -D -q
+# snort_interface (str):	Network interface to sniff
+#				Default: ""
+# snort_conf (str):		Snort configuration file
+#				Default: ${PREFIX}/etc/snort/snort.conf
+# snort_expression (str):	filter expression
+#				If your expression is very long, set
+#				kern.ps_arg_cache_limit sysctl variable
+#				to large value. Otherwise, snort won't
+#				restart!
+#				Default: ""
+#
+# To enable multi interface, use:
+# snort_rules="eth0 eth1"
+# defaults will follow, snort.conf becomes 'snort_eth0.conf', etc.
+
+. /etc/rc.subr
+
+name="snort"
+rcvar=snort_enable
+extra_commands=reload
+
+command="%%PREFIX%%/bin/snort"
+
+load_rc_config $name
+
+[ -z "$snort_enable" ]    && snort_enable="NO"
+[ -z "$snort_conf" ]      && snort_conf="%%PREFIX%%/etc/snort/snort.conf"
+[ -z "$snort_flags" ]     && snort_flags="-D -q"
+
+[ -n "$snort_interface" ] && snort_flags="$snort_flags -i $snort_interface" \
+                          && pidfile="/var/run/snort_${snort_interface}.pid"
+[ -n "$snort_conf" ]      && snort_flags="$snort_flags -c $snort_conf"
+[ -n "$snort_expression" ] && snort_flags="$snort_flags $snort_expression"
+
+if [ -n "$snort_rules" ]; then
+  _1=$1
+  if [ $# -gt 1 ]; then shift; snort_rules=$*; fi
+  snort_conf=""
+  snort_flags=""
+  rc=0
+  for i in ${snort_rules}; do
+	eval _conf=\$snort_${i}_conf
+	eval _flags=\$snort_${i}_flags
+	[ -z "$_flags" ] && _flags="-D -q"
+	eval _intf=\$snort_${i}_interface
+	eval _expr=\$snort_${i}_expression
+        if [ -n "$_intf" ] ;then
+            _conf="$_conf -i $_intf"
+	   eval pidfile="/var/run/snort_$_intf.pid"
+        fi
+	command_args="$_flags -c $_conf $_expr"
+        run_rc_command "$_1"
+        if [ $? -ne 0 ]; then rc=1; fi
+	unset _pidcmd _rc_restart_done
+   done
+   exit $rc
+else
+   run_rc_command "$1"
+fi

Deleted: trunk/security/snort/files/snort.sh.in
===================================================================
--- trunk/security/snort/files/snort.sh.in	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/snort/files/snort.sh.in	2013-11-16 21:08:18 UTC (rev 15596)
@@ -1,45 +0,0 @@
-#!/bin/sh
-# $MidnightBSD$
-# $FreeBSD: ports/security/snort/files/snort.sh.in,v 1.3 2007/06/14 02:51:01 clsung Exp $
-
-# PROVIDE: snort
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
-# KEYWORD: shutdown
-
-# Add the following lines to /etc/rc.conf to enable snort:
-# snort_enable (bool):		Set to YES to enable snort
-# 				Default: NO
-# snort_flags (str):		Extra flags passed to snort
-#				Default: -Dq
-# snort_interface (str):	Network interface to sniff
-#				Default: "" 
-# snort_conf (str):		Snort configuration file
-#				Default: ${PREFIX}/etc/snort/snort.conf
-# snort_expression (str):	filter expression
-#				If your expression is very long, set 
-#				kern.ps_arg_cache_limit sysctl variable
-#				to large value. Otherwise, snort won't
-#				restart!
-#				Default: ""
-#
-
-. %%RC_SUBR%%
-
-name="snort"
-rcvar=`set_rcvar`
-
-command="%%PREFIX%%/bin/snort"
-
-load_rc_config $name
-
-[ -z "$snort_enable" ]    && snort_enable="NO"
-[ -z "$snort_conf" ]      && snort_conf="%%PREFIX%%/etc/snort/snort.conf"
-[ -z "$snort_flags" ]     && snort_flags="-Dq"
-
-[ -n "$snort_interface" ] && snort_flags="$snort_flags -i $snort_interface" \
-                          && pidfile="/var/run/snort_${snort_interface}.pid"
-[ -n "$snort_conf" ]      && snort_flags="$snort_flags -c $snort_conf"
-[ -n "$snort_expression" ] && snort_flags="$snort_flags $snort_expression"
-
-run_rc_command "$1"

Modified: trunk/security/snort/pkg-plist
===================================================================
--- trunk/security/snort/pkg-plist	2013-11-16 20:52:29 UTC (rev 15595)
+++ trunk/security/snort/pkg-plist	2013-11-16 21:08:18 UTC (rev 15596)
@@ -1,5 +1,6 @@
- at comment $FreeBSD: ports/security/snort/pkg-plist,v 1.29 2008/04/09 09:57:59 clsung Exp $
 bin/snort
+bin/u2boat
+bin/u2spewfoo
 @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
@@ -9,9 +10,6 @@
 @unexec if cmp  -s %D/etc/snort/reference.config-sample %D/etc/snort/reference.config; then rm -f %D/etc/snort/reference.config; fi
 etc/snort/reference.config-sample
 @exec if [ ! -f %D/etc/snort/reference.config ] ; then cp -p %D/%F %B/reference.config; fi
- at unexec if cmp  -s %D/etc/snort/sid-msg.map-sample %D/etc/snort/sid-msg.map; then rm -f %D/etc/snort/sid-msg.map; fi
-etc/snort/sid-msg.map-sample
- at exec if [ ! -f %D/etc/snort/sid-msg.map ] ; then cp -p %D/%F %B/sid-msg.map; fi
 @unexec if cmp  -s %D/etc/snort/snort.conf-sample %D/etc/snort/snort.conf; then rm -f %D/etc/snort/snort.conf; fi
 etc/snort/snort.conf-sample
 @exec if [ ! -f %D/etc/snort/snort.conf ] ; then cp -p %D/%F %B/snort.conf; fi
@@ -22,45 +20,142 @@
 etc/snort/unicode.map-sample
 @exec if [ ! -f %D/etc/snort/unicode.map ] ; then cp -p %D/%F %B/unicode.map; fi
 @dirrmtry etc/snort/rules
+ at unexec if cmp  -s %D/etc/snort/preproc_rules/decoder.rules %D/etc/snort/preproc_rules/decoder.rules; then rm -f %D/etc/snort/preproc_rules/decoder.rules;fi
+etc/snort/preproc_rules/decoder.rules-sample
+ at exec if [ ! -f %D/etc/snort/preproc_rules/decoder.rules ] ; then cp -p %D/%F %B/decoder.rules; fi
+ at unexec if cmp  -s %D/etc/snort/preproc_rules/preprocessor.rules %D/etc/snort/preproc_rules/preprocessor.rules; then rm -f %D/etc/snort/preproc_rules/preprocessor.rules;fi
+etc/snort/preproc_rules/preprocessor.rules-sample
+ at exec if [ ! -f %D/etc/snort/preproc_rules/preprocessor.rules ] ; then cp -p %D/%F %B/preprocessor.rules; fi
+ at unexec if cmp  -s %D/etc/snort/preproc_rules/sensitive-data.rules %D/etc/snort/preproc_rules/sensitive-data.rules; then rm -f %D/etc/snort/preproc_rules/sensitive-data.rules;fi
+etc/snort/preproc_rules/sensitive-data.rules-sample
+ at exec if [ ! -f %D/etc/snort/preproc_rules/decoder.rules ] ; then cp -p %D/%F %B/; fi
+ at dirrmtry etc/snort/preproc_rules
 @dirrmtry etc/snort
 %%DYNAMIC%%src/snort_dynamicsrc/bitop.h
-%%DYNAMIC%%src/snort_dynamicsrc/debug.h
+%%DYNAMIC%%src/snort_dynamicsrc/event.h
+%%DYNAMIC%%src/snort_dynamicsrc/file_api.h
+%%DYNAMIC%%src/snort_dynamicsrc/file_lib.h
+%%DYNAMIC%%src/snort_dynamicsrc/obfuscation.h
 %%DYNAMIC%%src/snort_dynamicsrc/pcap_pkthdr32.h
+%%DYNAMIC%%src/snort_dynamicsrc/plugin_enum.h
 %%DYNAMIC%%src/snort_dynamicsrc/preprocids.h
 %%DYNAMIC%%src/snort_dynamicsrc/profiler.h
+%%DYNAMIC%%src/snort_dynamicsrc/rule_option_types.h
+%%DYNAMIC%%src/snort_dynamicsrc/snort_debug.h
+%%DYNAMIC%%src/snort_dynamicsrc/sfPolicyUserData.c
+%%DYNAMIC%%src/snort_dynamicsrc/sfPolicyUserData.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_base64decode.c
+%%DYNAMIC%%src/snort_dynamicsrc/sf_base64decode.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_common.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_define.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_engine.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_meta.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preproc_lib.c
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preproc_lib.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_dynamic_preprocessor.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_email_attach_decode.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_email_attach_decode.c
+%%DYNAMIC%%src/snort_dynamicsrc/sf_ip.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_decompression.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_protocols.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_seqnums.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_snort_packet.h
 %%DYNAMIC%%src/snort_dynamicsrc/sf_snort_plugin_api.h
+%%DYNAMIC%%src/snort_dynamicsrc/sf_types.h
+%%DYNAMIC%%src/snort_dynamicsrc/sfcontrol.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfghash.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfhashfcn.h
+%%DYNAMIC%%src/snort_dynamicsrc/idle_processing.h
 %%DYNAMIC%%src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.c
 %%DYNAMIC%%src/snort_dynamicsrc/sfsnort_dynamic_detection_lib.h
+%%DYNAMIC%%src/snort_dynamicsrc/signature.h
 %%DYNAMIC%%src/snort_dynamicsrc/str_search.h
 %%DYNAMIC%%src/snort_dynamicsrc/stream_api.h
+%%DYNAMIC%%src/snort_dynamicsrc/treenodes.h
+%%DYNAMIC%%src/snort_dynamicsrc/util_unfold.h
+%%DYNAMIC%%src/snort_dynamicsrc/util_unfold.c
+%%DYNAMIC%%src/snort_dynamicsrc/Unified2_common.h
 %%DYNAMIC%%@dirrmtry src/snort_dynamicsrc
 %%DYNAMIC%%@dirrmtry src
+include/snort/dynamic_output/output_lib.h
+include/snort/dynamic_output/output_api.h
+include/snort/dynamic_output/output_common.h
+include/snort/dynamic_output/obfuscation.h
+include/snort/dynamic_output/ipv6_port.h
+include/snort/dynamic_output/sf_ip.h
+include/snort/dynamic_output/snort_debug.h
+include/snort/dynamic_output/sfPolicy.h
+include/snort/dynamic_output/sf_dynamic_common.h
+include/snort/dynamic_output/stream_api.h
+include/snort/dynamic_output/preprocids.h
+include/snort/dynamic_output/bitop.h
+include/snort/dynamic_output/sf_snort_packet.h
+include/snort/dynamic_output/sf_protocols.h
+include/snort/dynamic_output/sfrt.h
+include/snort/dynamic_output/sfrt_dir.h
+include/snort/dynamic_output/sfrt_trie.h
+ at dirrmtry include/snort/dynamic_output
+%%DYNAMIC%%include/snort/dynamic_preproc/ssl.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfcommon.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_preproc_info.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_snort_packet.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_protocols.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_seqnums.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_snort_plugin_api.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_decompression.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfPolicyUserData.h
+%%DYNAMIC%%include/snort/dynamic_preproc/snort_debug.h
+%%DYNAMIC%%include/snort/dynamic_preproc/snort_bounds.h
+%%DYNAMIC%%include/snort/dynamic_preproc/cpuclock.h
+%%DYNAMIC%%include/snort/dynamic_preproc/file_api.h
+%%DYNAMIC%%include/snort/dynamic_preproc/file_lib.h
+%%DYNAMIC%%include/snort/dynamic_preproc/profiler.h
+%%DYNAMIC%%include/snort/dynamic_preproc/bitop.h
+%%DYNAMIC%%include/snort/dynamic_preproc/idle_processing.h
+%%DYNAMIC%%include/snort/dynamic_preproc/mempool.h
+%%DYNAMIC%%include/snort/dynamic_preproc/segment_mem.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_sdlist_types.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_ip.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_common.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_engine.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_define.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_meta.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_preprocessor.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sf_dynamic_preproc_lib.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfcontrol.h
+%%DYNAMIC%%include/snort/dynamic_preproc/ipv6_port.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfPolicy.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt_dir.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt_flat.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt_flat_dir.h
+%%DYNAMIC%%include/snort/dynamic_preproc/sfrt_trie.h
+%%DYNAMIC%%include/snort/dynamic_preproc/obfuscation.h
+%%DYNAMIC%%include/snort/dynamic_preproc/stream_api.h
+%%DYNAMIC%%include/snort/dynamic_preproc/str_search.h
+%%DYNAMIC%%include/snort/dynamic_preproc/preprocids.h
+%%DYNAMIC%%@dirrmtry include/snort/dynamic_preproc
+ at dirrmtry include/snort
+lib/snort/dynamic_output/libsf_dynamic_output.a
+lib/snort/dynamic_output/libsf_dynamic_output.la
+ at dirrmtry lib/snort/dynamic_output
+%%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.a
+%%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.la
 %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.so
 %%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.so.0
-%%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.la
-%%DYNAMIC%%lib/snort/dynamicengine/libsf_engine.a
 %%DYNAMIC%%@dirrmtry lib/snort/dynamicengine
-%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.so
-%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.so.0
-%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.la
-%%DYNAMIC%%lib/snort/dynamicrules/lib_sfdynamic_example_rule.a
 %%DYNAMIC%%@dirrmtry lib/snort/dynamicrules
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.a
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.la
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/lib_sfdynamic_preprocessor_example.so.0
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.a
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.la
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.so
-%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dcerpc_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamic_preproc/libsf_dynamic_preproc.la
+%%DYNAMIC%%lib/snort/dynamic_preproc/libsf_dynamic_preproc.a
+%%DYNAMIC%%@dirrmtry lib/snort/dynamic_preproc
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dce2_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dce2_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dce2_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dce2_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dnp3_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dnp3_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dnp3_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dnp3_preproc.so
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.a
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_dns_preproc.so
@@ -69,6 +164,34 @@
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.so
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ftptelnet_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_gtp_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_gtp_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_gtp_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_gtp_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_imap_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_imap_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_imap_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_imap_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_modbus_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_modbus_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_modbus_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_modbus_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_pop_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_pop_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_pop_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_pop_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_reputation_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_reputation_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_reputation_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_reputation_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sdf_preproc.so.0
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sip_preproc.a
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sip_preproc.la
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sip_preproc.so
+%%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_sip_preproc.so.0
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.a
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.la
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_smtp_preproc.so
@@ -83,19 +206,6 @@
 %%DYNAMIC%%lib/snort/dynamicpreprocessor/libsf_ssl_preproc.so.0
 %%DYNAMIC%%@dirrmtry lib/snort/dynamicpreprocessor
 %%DYNAMIC%%@dirrmtry lib/snort
-%%EXAMPLESDIR%%/classification.config-sample
-%%EXAMPLESDIR%%/create_db2
-%%EXAMPLESDIR%%/create_mssql
-%%EXAMPLESDIR%%/create_mysql
-%%EXAMPLESDIR%%/create_oracle.sql
-%%EXAMPLESDIR%%/create_postgresql
-%%EXAMPLESDIR%%/gen-msg.map-sample
-%%EXAMPLESDIR%%/reference.config-sample
-%%EXAMPLESDIR%%/sid-msg.map-sample
-%%EXAMPLESDIR%%/snort.conf-sample
-%%EXAMPLESDIR%%/threshold.conf-sample
-%%EXAMPLESDIR%%/unicode.map-sample
- at dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
@@ -103,49 +213,60 @@
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/PROBLEMS
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.ARUBA
-%%PORTDOCS%%%%DOCSDIR%%/README.FLEXRESP
-%%PORTDOCS%%%%DOCSDIR%%/README.FLEXRESP2
-%%PORTDOCS%%%%DOCSDIR%%/README.INLINE
+%%PORTDOCS%%%%DOCSDIR%%/README.GTP
 %%PORTDOCS%%%%DOCSDIR%%/README.PLUGINS
 %%PORTDOCS%%%%DOCSDIR%%/README.PerfProfiling
 %%PORTDOCS%%%%DOCSDIR%%/README.SMTP
 %%PORTDOCS%%%%DOCSDIR%%/README.UNSOCK
 %%PORTDOCS%%%%DOCSDIR%%/README.WIN32
+%%PORTDOCS%%%%DOCSDIR%%/README.active
 %%PORTDOCS%%%%DOCSDIR%%/README.alert_order
 %%PORTDOCS%%%%DOCSDIR%%/README.asn1
+%%PORTDOCS%%%%DOCSDIR%%/README.counts
 %%PORTDOCS%%%%DOCSDIR%%/README.csv
-%%PORTDOCS%%%%DOCSDIR%%/README.database
-%%PORTDOCS%%%%DOCSDIR%%/README.dcerpc
+%%PORTDOCS%%%%DOCSDIR%%/README.daq
+%%PORTDOCS%%%%DOCSDIR%%/README.dcerpc2
 %%PORTDOCS%%%%DOCSDIR%%/README.decode
+%%PORTDOCS%%%%DOCSDIR%%/README.decoder_preproc_rules
+%%PORTDOCS%%%%DOCSDIR%%/README.dnp3
 %%PORTDOCS%%%%DOCSDIR%%/README.dns
 %%PORTDOCS%%%%DOCSDIR%%/README.event_queue
-%%PORTDOCS%%%%DOCSDIR%%/README.flow
-%%PORTDOCS%%%%DOCSDIR%%/README.flow-portscan
+%%PORTDOCS%%%%DOCSDIR%%/README.filters
 %%PORTDOCS%%%%DOCSDIR%%/README.flowbits
 %%PORTDOCS%%%%DOCSDIR%%/README.frag3
 %%PORTDOCS%%%%DOCSDIR%%/README.ftptelnet
 %%PORTDOCS%%%%DOCSDIR%%/README.gre
 %%PORTDOCS%%%%DOCSDIR%%/README.http_inspect
+%%PORTDOCS%%%%DOCSDIR%%/README.imap
 %%PORTDOCS%%%%DOCSDIR%%/README.ipip
 %%PORTDOCS%%%%DOCSDIR%%/README.ipv6
+%%PORTDOCS%%%%DOCSDIR%%/README.modbus
+%%PORTDOCS%%%%DOCSDIR%%/README.multipleconfigs
+%%PORTDOCS%%%%DOCSDIR%%/README.normalize
 %%PORTDOCS%%%%DOCSDIR%%/README.pcap_readmode
+%%PORTDOCS%%%%DOCSDIR%%/README.pop
 %%PORTDOCS%%%%DOCSDIR%%/README.ppm
+%%PORTDOCS%%%%DOCSDIR%%/README.reload
+%%PORTDOCS%%%%DOCSDIR%%/README.reputation
+%%PORTDOCS%%%%DOCSDIR%%/README.sensitive_data
 %%PORTDOCS%%%%DOCSDIR%%/README.sfportscan
+%%PORTDOCS%%%%DOCSDIR%%/README.sip
 %%PORTDOCS%%%%DOCSDIR%%/README.ssh
 %%PORTDOCS%%%%DOCSDIR%%/README.ssl
-%%PORTDOCS%%%%DOCSDIR%%/README.stream4
 %%PORTDOCS%%%%DOCSDIR%%/README.stream5
 %%PORTDOCS%%%%DOCSDIR%%/README.tag
 %%PORTDOCS%%%%DOCSDIR%%/README.thresholding
+%%PORTDOCS%%%%DOCSDIR%%/README.unified2
+%%PORTDOCS%%%%DOCSDIR%%/README.u2boat
 %%PORTDOCS%%%%DOCSDIR%%/README.variables
-%%PORTDOCS%%%%DOCSDIR%%/README.wireless
+%%PORTDOCS%%%%DOCSDIR%%/README.rzb_saac
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE.NOTES
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/USAGE
 %%PORTDOCS%%%%DOCSDIR%%/WISHLIST
-%%PORTDOCS%%%%DOCSDIR%%/faq.pdf
 %%PORTDOCS%%%%DOCSDIR%%/generators
 %%PORTDOCS%%%%DOCSDIR%%/snort_manual.pdf
-%%PORTDOCS%%%%DOCSDIR%%/snort_schema_v106.pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+libdata/pkgconfig/snort.pc
+libdata/pkgconfig/snort_output.pc
+libdata/pkgconfig/snort_preproc.pc


Property changes on: trunk/security/snort/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list