From ec1200d91b3ad257379cf8d267c3098073b78b5d Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Tue, 28 Jan 2014 16:19:59 -0500
Subject: Bump Snort package to 2.9.5.6 v3.0.4

---
 pkg_config.8.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'pkg_config.8.xml')

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index b5505b8e..47709a5d 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -504,13 +504,13 @@
 		<category>Security</category>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
 		<depends_on_package>mysql-client-5.5.34.tbz</depends_on_package>
-		<depends_on_package>barnyard2-1.12.tbz</depends_on_package>
+		<depends_on_package>barnyard2-1.13.tbz</depends_on_package>
 		<depends_on_package>libnet11-1.1.6,1.tbz</depends_on_package>
 		<depends_on_package>libdnet-1.11_3.tbz</depends_on_package>
 		<depends_on_package>libpcap-1.4.0.tbz</depends_on_package>
 		<depends_on_package>daq-2.0.1.tbz</depends_on_package>
-		<depends_on_package>snort-2.9.5.5.tbz</depends_on_package>
-		<depends_on_package_pbi>snort-2.9.5.5-i386.pbi</depends_on_package_pbi>
+		<depends_on_package>snort-2.9.5.6.tbz</depends_on_package>
+		<depends_on_package_pbi>snort-2.9.5.6-i386.pbi</depends_on_package_pbi>
 		<build_port_path>/usr/ports/devel/pcre</build_port_path>
 		<build_port_path>/usr/ports/net/daq</build_port_path>
 		<build_port_path>/usr/ports/net/libnet</build_port_path>
@@ -525,7 +525,11 @@
 		<!-- Use both styles for now, since our snort port isn't yet optionsng, but barnyard2 and others are. -->
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL;snort_SET=TARGETBASED PERFPROFILE DECODERPRE FLEXRESP3 GRE IPV6 MPLS NORMALIZER ZLIB;perl_SET=THREADS;WITH_THREADS=yes;WITH_IPV6=true;WITH_MPLS=true;WITH_GRE=true;WITH_TARGETBASED=true;WITH_PERFPROFILE=true;WITH_DECODERPRE=true;WITH_ZLIB=true;WITH_NORMALIZER=true;WITH_REACT=true;WITH_FLEXRESP3=true;WITHOUT_ODBC=true;WITHOUT_POSTGRESQL=true;WITHOUT_PRELUDE=true;NOPORTDOCS=true</build_options>
 		<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
+<<<<<<< Updated upstream
 		<version>2.9.5.5 pkg v3.0.3</version>
+=======
+		<version>2.9.5.6 pkg v3.0.4</version>
+>>>>>>> Stashed changes
 		<required_version>2.0</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>
-- 
cgit v1.2.3


From 6cde50b14bd3f75584f391500a4e337c5d45bcc3 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Tue, 28 Jan 2014 16:24:16 -0500
Subject: Bump Snort package to 2.9.5.6 v3.0.4

---
 pkg_config.8.xml | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'pkg_config.8.xml')

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 47709a5d..e2d5998c 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -525,11 +525,7 @@
 		<!-- Use both styles for now, since our snort port isn't yet optionsng, but barnyard2 and others are. -->
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL;snort_SET=TARGETBASED PERFPROFILE DECODERPRE FLEXRESP3 GRE IPV6 MPLS NORMALIZER ZLIB;perl_SET=THREADS;WITH_THREADS=yes;WITH_IPV6=true;WITH_MPLS=true;WITH_GRE=true;WITH_TARGETBASED=true;WITH_PERFPROFILE=true;WITH_DECODERPRE=true;WITH_ZLIB=true;WITH_NORMALIZER=true;WITH_REACT=true;WITH_FLEXRESP3=true;WITHOUT_ODBC=true;WITHOUT_POSTGRESQL=true;WITHOUT_PRELUDE=true;NOPORTDOCS=true</build_options>
 		<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
-<<<<<<< Updated upstream
-		<version>2.9.5.5 pkg v3.0.3</version>
-=======
 		<version>2.9.5.6 pkg v3.0.4</version>
->>>>>>> Stashed changes
 		<required_version>2.0</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>
-- 
cgit v1.2.3


From f39947784f044a819d41916451336b5a827e033d Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Mon, 17 Feb 2014 22:45:16 -0500
Subject: Enable new PORT_PCAP options knob for barnyard2.

---
 pkg_config.8.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkg_config.8.xml')

diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e2d5998c..312dadb4 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -523,7 +523,7 @@
 			<ports_after>security/barnyard2</ports_after>
 		</build_pbi>
 		<!-- Use both styles for now, since our snort port isn't yet optionsng, but barnyard2 and others are. -->
-		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL;snort_SET=TARGETBASED PERFPROFILE DECODERPRE FLEXRESP3 GRE IPV6 MPLS NORMALIZER ZLIB;perl_SET=THREADS;WITH_THREADS=yes;WITH_IPV6=true;WITH_MPLS=true;WITH_GRE=true;WITH_TARGETBASED=true;WITH_PERFPROFILE=true;WITH_DECODERPRE=true;WITH_ZLIB=true;WITH_NORMALIZER=true;WITH_REACT=true;WITH_FLEXRESP3=true;WITHOUT_ODBC=true;WITHOUT_POSTGRESQL=true;WITHOUT_PRELUDE=true;NOPORTDOCS=true</build_options>
+		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP;snort_SET=TARGETBASED PERFPROFILE DECODERPRE FLEXRESP3 GRE IPV6 MPLS NORMALIZER ZLIB;perl_SET=THREADS;WITH_THREADS=yes;WITH_IPV6=true;WITH_MPLS=true;WITH_GRE=true;WITH_TARGETBASED=true;WITH_PERFPROFILE=true;WITH_DECODERPRE=true;WITH_ZLIB=true;WITH_NORMALIZER=true;WITH_REACT=true;WITH_FLEXRESP3=true;WITHOUT_ODBC=true;WITHOUT_POSTGRESQL=true;WITHOUT_PRELUDE=true;NOPORTDOCS=true</build_options>
 		<config_file>http://www.pfsense.com/packages/config/snort/snort.xml</config_file>
 		<version>2.9.5.6 pkg v3.0.4</version>
 		<required_version>2.0</required_version>
-- 
cgit v1.2.3