diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-11-03 21:13:20 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-11-03 21:13:20 -0200 |
| commit | 5d378610aa05134f8aa120fae0d426580f89c8d4 (patch) | |
| tree | eff1e9e383ecb777c025ad2ea1df6a6bd91b4496 /config | |
| parent | 9489f1e306a168d8d26b05841cda77dccd323644 (diff) | |
| parent | bd4191a0c0a81588441d719c2fb465b8e3aca29e (diff) | |
| download | pfsense-packages-5d378610aa05134f8aa120fae0d426580f89c8d4.tar.gz pfsense-packages-5d378610aa05134f8aa120fae0d426580f89c8d4.tar.bz2 pfsense-packages-5d378610aa05134f8aa120fae0d426580f89c8d4.zip | |
Merge pull request #723 from bmeeks8/snort-2.9.6.2-v3.1.4
Diffstat (limited to 'config')
| -rwxr-xr-x | config/snort/snort.inc | 2 | ||||
| -rwxr-xr-x | config/snort/snort.xml | 2 | ||||
| -rwxr-xr-x | config/snort/snort_check_for_rule_updates.php | 2 | ||||
| -rw-r--r-- | config/snort/snort_migrate_config.php | 2 | ||||
| -rw-r--r-- | config/snort/snort_post_install.php | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/config/snort/snort.inc b/config/snort/snort.inc index 3a384dee..e19119cf 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.3"; +$pfSense_snort_version = "3.1.4"; /* 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 b52a1b7e..264ef34e 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.3</title> + <title>Services:2.9.6.2 pkg v3.1.4</title> <include_file>/usr/local/pkg/snort/snort.inc</include_file> <menu> <name>Snort</name> diff --git a/config/snort/snort_check_for_rule_updates.php b/config/snort/snort_check_for_rule_updates.php index fc78cf28..edf99dc8 100755 --- a/config/snort/snort_check_for_rule_updates.php +++ b/config/snort/snort_check_for_rule_updates.php @@ -790,7 +790,7 @@ if ($snortdownload == 'on' || $emergingthreats == 'on' || $snortcommunityrules = } error_log(gettext("\tRestarting Snort to activate the new set of rules...\n"), 3, $snort_rules_upd_log); touch("{$g['varrun_path']}/snort_pkg_starting.lck"); - snort_start_all_interfaces(TRUE); + snort_restart_all_interfaces(TRUE); sleep(3); unlink_if_exists("{$g['varrun_path']}/snort_pkg_starting.lck"); if ($pkg_interface <> "console") diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php index 9569c475..a134e0aa 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.3"; + $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.4"; 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 c295b881..48ba48e9 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.3"; -write_config("Snort pkg v3.1.3: post-install configuration saved."); +$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.1.4"; +write_config("Snort pkg v3.1.4: post-install configuration saved."); /* Done with post-install, so clear flag */ unset($g['snort_postinstall']); |