From 3ecae655db5132090a687c24a931cd19ea0f0ceb Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Tue, 11 Nov 2014 13:50:42 -0500
Subject: Fix bug preventing pkg config sync and Nano start failure on reboots.

---
 config/snort/snort.xml | 1 -
 1 file changed, 1 deletion(-)

(limited to 'config')

diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 264ef34e..b7eae3b9 100755
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -309,7 +309,6 @@
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		<![CDATA[
-		if ($GLOBALS['pfSense_snort_version'] == "3.1.3")
 		sync_snort_package_config();
 		]]>
 	</custom_php_resync_config_command>
-- 
cgit v1.2.3


From 1a4a8a76dde91010ec684ac5ee76a7ec74dee8d7 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Tue, 11 Nov 2014 13:57:31 -0500
Subject: Bump Snort GUI pkg version to 3.1.5

---
 config/snort/snort.inc                | 2 +-
 config/snort/snort.xml                | 2 +-
 config/snort/snort_migrate_config.php | 2 +-
 config/snort/snort_post_install.php   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'config')

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index e19119cf..5c113d27 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -51,7 +51,7 @@ $snortver = array();
 exec("/usr/local/bin/snort -V 2>&1 |/usr/bin/grep Version | /usr/bin/cut -c20-26", $snortver);
 
 /* Used to indicate latest version of this include file has been loaded */
-$pfSense_snort_version = "3.1.4";
+$pfSense_snort_version = "3.1.5";
 
 /* get installed package version for display */
 $snort_package_version = "Snort {$config['installedpackages']['package'][get_pkg_id("snort")]['version']}";
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index b7eae3b9..91d42532 100755
--- a/config/snort/snort.xml
+++ b/config/snort/snort.xml
@@ -47,7 +47,7 @@
 	<faq>Currently there are no FAQ items provided.</faq>
 	<name>Snort</name>
 	<version>2.9.6.2</version>
-	<title>Services:2.9.6.2 pkg v3.1.4</title>
+	<title>Services:2.9.6.2 pkg v3.1.5</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php
index a134e0aa..a722d52b 100644
--- a/config/snort/snort_migrate_config.php
+++ b/config/snort/snort_migrate_config.php
@@ -490,7 +490,7 @@ unset($r);
 
 // Log a message if we changed anything
 if ($updated_cfg) {
-	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.4";
+	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.5";
 	log_error("[Snort] Saving configuration settings in new format...");
 	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 48ba48e9..5009a8b3 100644
--- a/config/snort/snort_post_install.php
+++ b/config/snort/snort_post_install.php
@@ -263,8 +263,8 @@ if (stristr($config['widgets']['sequence'], "snort_alerts-container") === FALSE)
 	$config['widgets']['sequence'] .= ",{$snort_widget_container}";
 
 /* Update Snort package version in configuration */
-$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.4";
-write_config("Snort pkg v3.1.4: post-install configuration saved.");
+$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.5";
+write_config("Snort pkg v3.1.5: post-install configuration saved.");
 
 /* Done with post-install, so clear flag */
 unset($g['snort_postinstall']);
-- 
cgit v1.2.3