Snort changes submitted by Rob Iscool

4 files changed, 16 insertions, 15 deletions

diff --git a/packages/snort/snort.inc b/packages/snort/snort.inc
index 34e00ffd..d4c5f543 100644
--- a/packages/snort/snort.inc
+++ b/packages/snort/snort.inc
@@ -753,4 +753,4 @@ function snort_advanced() {
 	sync_package_snort();
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/packages/snort/snort.xml b/packages/snort/snort.xml
index ac5d3e12..1625de43 100644
--- a/packages/snort/snort.xml
+++ b/packages/snort/snort.xml
@@ -8,7 +8,7 @@
 /* ========================================================================== */
 /*
     authng.xml
-    part of pfSense (http://www.pfSense.com)
+    part of pfSense (http://www.pfsense.com)
     Copyright (C) 2007 to whom it may belong
     All rights reserved.
 
@@ -106,6 +106,11 @@
 		<item>http://www.pfsense.com/packages/config/snort/bin/snort2c</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/usr/local/bin/</prefix>
+		<chmod>077</chmod>
+		<item>http://www.pfsense.com/packages/config/snort/bin/mons2c</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
 		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/snort/snort_download_rules.php</item>
@@ -146,16 +151,11 @@
 		<item>http://www.pfsense.com/packages/config/snort/snort_alerts.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/pf/</prefix>
+		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/snort/snort_dynamic_ip_reload.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
-		<prefix>/usr/local/pkg/pf/</prefix>
-		<chmod>077</chmod>
-		<item>http://www.pfsense.com/packages/config/snort/snort_xmlrpc_sync.php</item>
-	</additional_files_needed>
-	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
 		<chmod>077</chmod>
 		<item>http://www.pfsense.com/packages/config/snort/snort_advanced.xml</item>
@@ -177,6 +177,10 @@
 			<type>select</type>
 			<options>
 				<option>
+					<name>ac-bnfa</name>
+					<value>ac-bnfa</value>
+				</option>
+				<option>
 					<name>lowmem</name>
 					<value>lowmem</value>
 				</option>
@@ -197,10 +201,6 @@
 					<value>ac-sparsebands</value>
 				</option>
 				<option>
-					<name>mwm</name>
-					<value>mwm</value>
-				</option>
-				<option>
 					<name>acs</name>
 					<value>acs</value>
 				</option>
diff --git a/packages/snort/snort_check_for_rule_updates.php b/packages/snort/snort_check_for_rule_updates.php
index fc27eb83..92f32900 100644
--- a/packages/snort/snort_check_for_rule_updates.php
+++ b/packages/snort/snort_check_for_rule_updates.php
@@ -51,6 +51,7 @@ if(!$password) {
 }
 
 $last_ruleset_download = $config['installedpackages']['snort']['last_ruleset_download'];
+ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
 $text = file_get_contents("http://www.snort.org/pub-bin/downloads.cgi");
 if (preg_match_all("/.*RELEASED\: (.*)\</", $text, $matches))
         $last_update_date = trim($matches[1][0]);
@@ -68,6 +69,7 @@ if($date1ts > $date2ts or !$last_ruleset_download) {
 	/* setup some variables */
 	$snort_filename = "snortrules-snapshot-CURRENT.tar.gz";
 	$snort_filename_md5 = "snortrules-snapshot-CURRENT.tar.gz.md5";
+	ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
 	$dl = "http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}";
 	$dl_md5 = "http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename_md5}";
 
diff --git a/packages/snort/snort_download_rules.php b/packages/snort/snort_download_rules.php
index 8d9f7e54..6326a5fe 100644
--- a/packages/snort/snort_download_rules.php
+++ b/packages/snort/snort_download_rules.php
@@ -95,7 +95,7 @@ include("head.inc");
 		echo "</div>\n";
 		ob_flush();
 		sleep(1);
-		ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');		
+		ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
 		$text = file_get_contents("http://www.snort.org/pub-bin/downloads.cgi");
 		echo "<script type=\"text/javascript\">\n";
 		echo "$('loading').style.visibility = 'hidden';\n";
@@ -182,6 +182,7 @@ if($config['installedpackages']['snortadvanced']['config'][0]['subscriber'])
 	$premium_subscriber = "_s";
 $snort_filename = "snortrules-snapshot-CURRENT{$premium_subscriber}.tar.gz";
 $snort_filename_md5 = "snortrules-snapshot-CURRENT.tar.gz.md5";
+ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
 $dl = "http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename}";
 $dl_md5 = "http://www.snort.org/pub-bin/oinkmaster.cgi/{$oinkid}/{$snort_filename_md5}";
 
@@ -192,14 +193,12 @@ exec("/bin/rm -rf {$tmpfname};/bin/mkdir -p {$tmpfname}");
 /* download snort rules */
 $static_output = gettext("Downloading current snort rules... ");
 update_all_status($static_output);
-ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
 download_file_with_progress_bar($dl, $tmpfname . "/{$snort_filename}");
 verify_downloaded_file($tmpfname . "/{$snort_filename}");
 
 /* download snort rules md5 file */
 $static_output = gettext("Downloading current snort rules md5... ");
 update_all_status($static_output);
-ini_set('user_agent','Mozilla/4.0 (compatible; MSIE 6.0)');
 download_file_with_progress_bar($dl_md5, $tmpfname . "/{$snort_filename_md5}");
 verify_downloaded_file($tmpfname . "/{$snort_filename_md5}");