Merge pull request #884 from bmeeks8/snort-3.2.5

7 files changed, 13 insertions, 14 deletions

diff --git a/config/snort/snort.inc b/config/snort/snort.inc
index 64ab6ea5..bb5ff792 100755
--- a/config/snort/snort.inc
+++ b/config/snort/snort.inc
@@ -40,7 +40,7 @@ require_once("filter.inc");
 require("/usr/local/pkg/snort/snort_defs.inc");
 
 // Snort GUI needs some extra PHP memory space to manipulate large rules arrays
-ini_set("memory_limit", "256M");
+ini_set("memory_limit", "384M");
 
 // Explicitly declare this as global so it works through function call includes 
 global $g, $config, $rebuild_rules, $pfSense_snort_version;
diff --git a/config/snort/snort.xml b/config/snort/snort.xml
index 1f1a7d24..c9401f05 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.7.2</version>
-	<title>Services:2.9.7.2 pkg v3.2.4</title>
+	<version>2.9.7.3</version>
+	<title>Services:2.9.7.3 pkg v3.2.5</title>
 	<include_file>/usr/local/pkg/snort/snort.inc</include_file>
 	<menu>
 		<name>Snort</name>
diff --git a/config/snort/snort_defs.inc b/config/snort/snort_defs.inc
index 912fa3d3..3f5c82e5 100644
--- a/config/snort/snort_defs.inc
+++ b/config/snort/snort_defs.inc
@@ -5,7 +5,7 @@
  * Copyright (C) 2006 Scott Ullrich
  * Copyright (C) 2009-2010 Robert Zelaya
  * Copyright (C) 2011-2012 Ermal Luci
- * Copyright (C) 2013,2014 Bill Meeks
+ * Copyright (C) 2013-2015 Bill Meeks
  * part of pfSense
  * All rights reserved.
  *
@@ -55,7 +55,7 @@ if (!defined("SNORT_BIN_VERSION")) {
 	if (!empty($snortver[0]))
 		define("SNORT_BIN_VERSION", $snortver[0]);
 	else
-		define("SNORT_BIN_VERSION", "2.9.7.2");
+		define("SNORT_BIN_VERSION", "2.9.7.3");
 }
 if (!defined("SNORT_SID_MODS_PATH"))
 	define('SNORT_SID_MODS_PATH', "{$g['vardb_path']}/snort/sidmods/");
diff --git a/config/snort/snort_generate_conf.php b/config/snort/snort_generate_conf.php
index 297e833b..646697bf 100644
--- a/config/snort/snort_generate_conf.php
+++ b/config/snort/snort_generate_conf.php
@@ -876,9 +876,9 @@ if (is_array($snortcfg['wlist_files']['item'])) {
 	}
 }
 if (!empty($blist_files))
-	$ip_lists = $blist_files;
+	$ip_lists = ", \\ \n\t" . $blist_files;
 if (!empty($wlist_files))
-	$ip_lists .= ", \\ \n" . $wlist_files;
+	$ip_lists .= ", \\ \n\t" . $wlist_files;
 if ($snortcfg['iprep_scan_local'] == 'on')
 	$ip_lists .= ", \\ \n\tscan_local";	
 
@@ -888,8 +888,7 @@ preprocessor reputation: \
 	memcap {$snortcfg['iprep_memcap']}, \
 	priority {$snortcfg['iprep_priority']}, \
 	nested_ip {$snortcfg['iprep_nested_ip']}, \
-	white {$snortcfg['iprep_white']}, \
-	{$ip_lists}
+	white {$snortcfg['iprep_white']}{$ip_lists}
 
 EOD;
 
diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php
index 941a8151..dcc5aa76 100644
--- a/config/snort/snort_migrate_config.php
+++ b/config/snort/snort_migrate_config.php
@@ -533,7 +533,7 @@ unset($r);
 
 // Log a message if we changed anything
 if ($updated_cfg) {
-	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.4";
+	$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.5";
 	log_error("[Snort] Settings successfully migrated to new configuration format...");
 }
 else
diff --git a/config/snort/snort_post_install.php b/config/snort/snort_post_install.php
index f93f1c87..7b931246 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.2.4";
-write_config("Snort pkg v3.2.4: post-install configuration saved.");
+$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.5";
+write_config("Snort pkg v3.2.5: post-install configuration saved.");
 
 /* Done with post-install, so clear flag */
 unset($g['snort_postinstall']);
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 5acf5612..b1927cef 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -392,14 +392,14 @@
 		<category>Security</category>
 		<run_depends>bin/snort:security/snort</run_depends>
 		<port_category>security</port_category>
-		<depends_on_package_pbi>snort-2.9.7.2-##ARCH##.pbi</depends_on_package_pbi>
+		<depends_on_package_pbi>snort-2.9.7.3-##ARCH##.pbi</depends_on_package_pbi>
 		<build_pbi>
 			<port>security/snort</port>
 			<ports_after>security/barnyard2</ports_after>
 		</build_pbi>
 		<build_options>barnyard2_UNSET_FORCE=ODBC PGSQL PRELUDE;barnyard2_SET_FORCE=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET_FORCE=BARNYARD PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET_FORCE=PULLEDPORK FILEINSPECT HA</build_options>
 		<config_file>https://packages.pfsense.org/packages/config/snort/snort.xml</config_file>
-		<version>3.2.4</version>
+		<version>3.2.5</version>
 		<required_version>2.2</required_version>
 		<status>Stable</status>
 		<configurationfile>/snort.xml</configurationfile>