From ae3323845cd71bfae33f12203e6362f03fc634d9 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Wed, 23 Jul 2014 15:37:29 -0400
Subject: Update Snort package to latest 2.9.6.2 binary and fix some GUI bugs.

---
 config/snort/snort.xml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'config/snort/snort.xml')

diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 977db98a..d9bc0ee6 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.6.0</version>
-	<title>Services:2.9.6.0 pkg v3.0.13</title>
+	<version>2.9.6.2</version>
+	<title>Services:2.9.6.2 pkg v3.1</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
@@ -74,12 +74,17 @@
 		<item>https://packages.pfsense.org/packages/config/snort/snort_check_cron_misc.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/www/snort/</prefix>
+		<prefix>/usr/local/pkg/snort/</prefix>
+		<chmod>077</chmod>
+		<item>https://packages.pfsense.org/packages/config/snort/snort_conf_template.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/snort/snort_migrate_config.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/www/snort/</prefix>
+		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/snort/snort_post_install.php</item>
 	</additional_files_needed>
@@ -119,7 +124,7 @@
 		<item>https://packages.pfsense.org/packages/config/snort/snort_download_updates.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/www/snort/</prefix>
+		<prefix>/usr/local/pkg/snort/</prefix>
 		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/snort/snort_check_for_rule_updates.php</item>
 	</additional_files_needed>
@@ -248,6 +253,11 @@
 		<chmod>077</chmod>
 		<item>https://packages.pfsense.org/packages/config/snort/snort_iprep_list_browser.php</item>
 	</additional_files_needed>
+	<additional_files_needed>
+		<prefix>/usr/local/pkg/snort/</prefix>
+		<chmod>077</chmod>
+		<item>https://packages.pfsense.org/packages/config/snort/snort_generate_conf.php</item>
+	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/widgets/javascript/</prefix>
 		<chmod>0644</chmod>
@@ -269,13 +279,13 @@
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		<![CDATA[
-		if ($GLOBALS['pfSense_snort_version'] == "3.0.13")
+		if ($GLOBALS['pfSense_snort_version'] == "3.1")
 		sync_snort_package_config();
 		]]>
 	</custom_php_resync_config_command>
 	<custom_php_install_command>
 		<![CDATA[
-		include_once("/usr/local/www/snort/snort_post_install.php");
+		include_once("/usr/local/pkg/snort/snort_post_install.php");
 		]]>
 	</custom_php_install_command>
 	<custom_php_deinstall_command>
-- 
cgit v1.2.3


From 8d9fa4aa122bc12e81faf5f81125edc2f64e3853 Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Fri, 25 Jul 2014 13:01:18 -0400
Subject: Bump Snort GUI package version to 3.1.1 for bug fix.

---
 config/snort/snort.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/snort/snort.xml')

diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index d9bc0ee6..3feede80 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</title>
+	<title>Services:2.9.6.2 pkg v3.1.1</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
@@ -279,7 +279,7 @@
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		<![CDATA[
-		if ($GLOBALS['pfSense_snort_version'] == "3.1")
+		if ($GLOBALS['pfSense_snort_version'] == "3.1.1")
 		sync_snort_package_config();
 		]]>
 	</custom_php_resync_config_command>
-- 
cgit v1.2.3


From 29d04728a1f94feeefe8a8df07a6343fa554ca9b Mon Sep 17 00:00:00 2001
From: bmeeks8 <bmeeks8@bellsouth.net>
Date: Mon, 28 Jul 2014 11:42:51 -0400
Subject: Bump Snort GUI package version to v3.1.2 -- bug fixes.

---
 config/snort/snort.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'config/snort/snort.xml')

diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 3feede80..663ce4eb 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.1</title>
+	<title>Services:2.9.6.2 pkg v3.1.2</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
@@ -279,7 +279,7 @@
 	</custom_add_php_command>
 	<custom_php_resync_config_command>
 		<![CDATA[
-		if ($GLOBALS['pfSense_snort_version'] == "3.1.1")
+		if ($GLOBALS['pfSense_snort_version'] == "3.1.2")
 		sync_snort_package_config();
 		]]>
 	</custom_php_resync_config_command>
-- 
cgit v1.2.3