Bump Snort package to 2.9.5.6 v3.0.4

8 files changed, 27 insertions, 15 deletions

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index d983d995..777ae9d8 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -51,10 +51,10 @@ $snortver = array();
 exec("/usr/local/bin/snort -V 2>&1 |/usr/bin/grep Version | /usr/bin/cut -c20-26", $snortver);
 $snort_version = $snortver[0];
 if (empty($snort_version))
-	$snort_version = "2.9.5.5";
+	$snort_version = "2.9.5.6";
 
 /* package version */
-$pfSense_snort_version = "3.0.2";
+$pfSense_snort_version = "3.0.4";
 $snort_package_version = "Snort {$snort_version} pkg v{$pfSense_snort_version}";
 
 // Define SNORTDIR and SNORTLIBDIR constants according to pfSense version
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 9d4f1d61..a2d14bf0 100755
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -46,8 +46,8 @@
 	<requirements>None</requirements>
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>Snort</name>
-	<version>2.9.5.5</version>
-	<title>Services:2.9.5.5 pkg v3.0.2</title>
+	<version>2.9.5.6</version>
+	<title>Services:2.9.5.6 pkg v3.0.4</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
@@ -244,7 +244,7 @@
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		<![CDATA[
-		if ($GLOBALS['pfSense_snort_version'] == "3.0.2")
+		if ($GLOBALS['pfSense_snort_version'] == "3.0.4")
 		sync_snort_package_config();
 		]]>
 	</custom_php_resync_config_command>
diff --git a/config/snort/snort_check_for_rule_updates.php b/config/snort/snort_check_for_rule_updates.php
index 0306c90d..9a69db1c 100755
--- a/config/snort/snort_check_for_rule_updates.php
+++ b/config/snort/snort_check_for_rule_updates.php
@@ -96,7 +96,7 @@ exec("/usr/local/bin/snort -V 2>&1 |/usr/bin/grep Version | /usr/bin/cut -c20-26
 // Save the version with decimal delimiters for use in extracting the rules
 $snort_version = $snortver[0];
 if (empty($snort_version))
-	$snort_version = "2.9.5.5";
+	$snort_version = "2.9.5.6";
 
 // Create a collapsed version string for use in the tarball filename
 $snortver[0] = str_replace(".", "", $snortver[0]);
diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php
index 1a812b24..218237ab 100644
--- a/config/snort/snort_migrate_config.php
+++ b/config/snort/snort_migrate_config.php
@@ -330,7 +330,7 @@ unset($r);
 
 // Write out the new configuration to disk if we changed anything
 if ($updated_cfg) {
-	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.2";
+	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.4";
 	log_error("[Snort] Saving configuration settings in new format...");
 	write_config();
 	log_error("[Snort] Settings successfully migrated to new configuration format...");
diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php
index a3c8eced..945ddd04 100644
--- a/config/snort/snort_post_install.php
+++ b/config/snort/snort_post_install.php
@@ -1417,7 +1417,7 @@ if ($config['installedpackages']['snortglobal']['forcekeepsettings'] == 'on') {
 }
 
 /* Update Snort package version in configuration */
-$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.2";
+$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.0.4";
 write_config();
 
 /* Done with post-install, so clear flag */
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 75bcedde..e519a088 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -393,7 +393,7 @@
 		<website>http://www.snort.org</website>
 		<descr>Snort is an open source network intrusion prevention and detection system (IDS/IPS). Combining the benefits of signature, protocol, and anomaly-based inspection.</descr>
 		<category>Security</category>
-		<depends_on_package_pbi>snort-2.9.5.5-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>snort-2.9.5.6-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<port>security/snort</port>
 			<ports_after>security/barnyard2</ports_after>
@@ -401,7 +401,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.2</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>
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>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 9ab48dcb..6a9e6173 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -491,13 +491,13 @@
 		<category>Security</category>
 		<depends_on_package_base_url>http://files.pfsense.org/packages/amd64/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-amd64.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-amd64.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>
@@ -512,7 +512,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>