aboutsummaryrefslogtreecommitdiffstats
path: root/config/snort
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-11-11 17:10:32 -0200
committerRenato Botelho <garga@FreeBSD.org>2014-11-11 17:10:32 -0200
commitbf28487b17524bbe7165c5a061d63c9f7ceb5ba2 (patch)
tree451bd062d82b7caee061784ab69ae7cd564e1bef /config/snort
parentf4ae260c8ae8e54f0d40bfd337fbe9ed42253adb (diff)
parent1a4a8a76dde91010ec684ac5ee76a7ec74dee8d7 (diff)
downloadpfsense-packages-bf28487b17524bbe7165c5a061d63c9f7ceb5ba2.tar.gz
pfsense-packages-bf28487b17524bbe7165c5a061d63c9f7ceb5ba2.tar.bz2
pfsense-packages-bf28487b17524bbe7165c5a061d63c9f7ceb5ba2.zip
Merge pull request #725 from bmeeks8/snort-2.9.6.2-v3.1.5
Diffstat (limited to 'config/snort')
-rwxr-xr-xconfig/snort/snort.inc2
-rwxr-xr-xconfig/snort/snort.xml3
-rw-r--r--config/snort/snort_migrate_config.php2
-rw-r--r--config/snort/snort_post_install.php4
4 files changed, 5 insertions, 6 deletions
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 264ef34e..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>
@@ -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>
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']);