From 3ae4e63128e24505f0af7475711d9054e3c19a00 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Sat, 4 Oct 2014 13:40:18 -0400
Subject: Bump Suricata binary to 2.0.4 and package GUI to v2.0.3

---
 config/suricata/suricata.xml                | 2 +-
 config/suricata/suricata_migrate_config.php | 2 +-
 config/suricata/suricata_post_install.php   | 2 +-
 pkg_config.10.xml                           | 4 ++--
 pkg_config.8.xml                            | 4 ++--
 pkg_config.8.xml.amd64                      | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/suricata/suricata.xml b/config/suricata/suricata.xml
index 995ed900..e76a8f23 100644
--- a/config/suricata/suricata.xml
+++ b/config/suricata/suricata.xml
@@ -42,7 +42,7 @@
 	<description>Suricata IDS/IPS Package</description>
 	<requirements>None</requirements>
 	<name>suricata</name>
-	<version>2.0.3 pkg v2.0.2</version>
+	<version>2.0.4 pkg v2.0.3</version>
 	<title>Services: Suricata IDS</title>
 	<include_file>/usr/local/pkg/suricata/suricata.inc</include_file>
 	<menu>
diff --git a/config/suricata/suricata_migrate_config.php b/config/suricata/suricata_migrate_config.php
index 4729109b..3d04ffa4 100644
--- a/config/suricata/suricata_migrate_config.php
+++ b/config/suricata/suricata_migrate_config.php
@@ -344,7 +344,7 @@ unset($r);
 
 // Write out the new configuration to disk if we changed anything
 if ($updated_cfg) {
-	$config['installedpackages']['suricata']['config'][0]['suricata_config_ver'] = "2.0.2";
+	$config['installedpackages']['suricata']['config'][0]['suricata_config_ver'] = "2.0.3";
 	log_error("[Suricata] Saving configuration settings in new format...");
 	write_config("Suricata pkg: migrate existing settings to new format during package upgrade.");
 	log_error("[Suricata] Settings successfully migrated to new configuration format...");
diff --git a/config/suricata/suricata_post_install.php b/config/suricata/suricata_post_install.php
index 5b6defeb..972539ac 100644
--- a/config/suricata/suricata_post_install.php
+++ b/config/suricata/suricata_post_install.php
@@ -238,7 +238,7 @@ if (empty($config['installedpackages']['suricata']['config'][0]['forcekeepsettin
 conf_mount_ro();
 
 // Update Suricata package version in configuration
-$config['installedpackages']['suricata']['config'][0]['suricata_config_ver'] = "2.0.2";
+$config['installedpackages']['suricata']['config'][0]['suricata_config_ver'] = "2.0.3";
 write_config("Suricata pkg: updated GUI package version number.");
 
 // Done with post-install, so clear flag
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 4736c538..a4e767f5 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1474,7 +1474,7 @@
 		<website>http://suricata-ids.org/</website>
 		<descr><![CDATA[High Performance Network IDS, IPS and Security Monitoring engine by OISF.]]></descr>
 		<category>Security</category>
-		<version>2.0.3 pkg v2.0.2</version>
+		<version>2.0.4 pkg v2.1</version>
 		<status>Stable</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file>
@@ -1484,7 +1484,7 @@
 			<ports_after>security/barnyard2</ports_after>
 		</build_pbi>
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;suricata_SET=IPFW PORTS_PCAP GEOIP JSON;suricata_UNSET=PRELUDE TESTS HTP_PORT</build_options>
-		<depends_on_package_pbi>suricata-2.0.3-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>suricata-2.0.4-##ARCH##.pbi</depends_on_package_pbi>
 	</package>
 </packages>
 </pfsensepkgs>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 479032a0..b6d253ca 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1896,7 +1896,7 @@
 		<website>http://suricata-ids.org/</website>
 		<descr><![CDATA[High Performance Network IDS, IPS and Security Monitoring engine by OISF.]]></descr>
 		<category>Security</category>
-		<version>2.0.3 pkg v2.0.2</version>
+		<version>2.0.4 pkg v2.1</version>
 		<status>Stable</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file>
@@ -1908,7 +1908,7 @@
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;suricata_SET=IPFW PORTS_PCAP GEOIP JSON;suricata_UNSET=PRELUDE TESTS HTP_PORT</build_options>
 		<build_port_path>/usr/ports/security/suricata</build_port_path>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>suricata-2.0.3-i386.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>suricata-2.0.4-i386.pbi</depends_on_package_pbi>
 	</package>
 </packages>
 </pfsensepkgs>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index d66ebd04..0ea3ee1b 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1883,7 +1883,7 @@
 		<website>http://suricata-ids.org/</website>
 		<descr><![CDATA[High Performance Network IDS, IPS and Security Monitoring engine by OISF.]]></descr>
 		<category>Security</category>
-		<version>2.0.3 pkg v2.0.2</version>
+		<version>2.0.4 pkg v2.1</version>
 		<status>Stable</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/suricata/suricata.xml</config_file>
@@ -1895,7 +1895,7 @@
 		<build_options>barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;suricata_SET=IPFW PORTS_PCAP GEOIP JSON;suricata_UNSET=PRELUDE TESTS HTP_PORT</build_options>
 		<build_port_path>/usr/ports/security/suricata</build_port_path>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<depends_on_package_pbi>suricata-2.0.3-amd64.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>suricata-2.0.4-amd64.pbi</depends_on_package_pbi>
 	</package>
 </packages>
 </pfsensepkgs>
-- 
cgit v1.2.3