From 3ecae655db5132090a687c24a931cd19ea0f0ceb Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Tue, 11 Nov 2014 13:50:42 -0500 Subject: Fix bug preventing pkg config sync and Nano start failure on reboots. --- config/snort/snort.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/config/snort/snort.xml b/config/snort/snort.xml index 264ef34e..b7eae3b9 100755 --- a/config/snort/snort.xml +++ b/config/snort/snort.xml @@ -309,7 +309,6 @@ -- cgit v1.2.3 From 1a4a8a76dde91010ec684ac5ee76a7ec74dee8d7 Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Tue, 11 Nov 2014 13:57:31 -0500 Subject: Bump Snort GUI pkg version to 3.1.5 --- config/snort/snort.inc | 2 +- config/snort/snort.xml | 2 +- config/snort/snort_migrate_config.php | 2 +- config/snort/snort_post_install.php | 4 ++-- pkg_config.10.xml | 2 +- pkg_config.8.xml | 2 +- pkg_config.8.xml.amd64 | 2 +- 7 files changed, 8 insertions(+), 8 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 b7eae3b9..91d42532 100755 --- a/config/snort/snort.xml +++ b/config/snort/snort.xml @@ -47,7 +47,7 @@ Currently there are no FAQ items provided. Snort 2.9.6.2 - Services:2.9.6.2 pkg v3.1.4 + Services:2.9.6.2 pkg v3.1.5 /usr/local/pkg/snort/snort.inc Snort 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']); diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 1310f1e2..e18fdff4 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -331,7 +331,7 @@ barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS https://packages.pfsense.org/packages/config/snort/snort.xml - 2.9.6.2 pkg v3.1.4 + 2.9.6.2 pkg v3.1.5 2.2 Stable /snort.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index e1f6cc24..c1fdf260 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -469,7 +469,7 @@ barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS https://packages.pfsense.org/packages/config/snort/snort.xml - 2.9.6.2 pkg v3.1.4 + 2.9.6.2 pkg v3.1.5 2.1 Stable /snort.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 87cc2107..ba790cd4 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -456,7 +456,7 @@ barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP;snort_SET=TARGETBASED PERFPROFILE SOURCEFIRE GRE IPV6 MPLS NORMALIZER ZLIB;snort_UNSET=PULLEDPORK;perl_SET=THREADS https://packages.pfsense.org/packages/config/snort/snort.xml - 2.9.6.2 pkg v3.1.4 + 2.9.6.2 pkg v3.1.5 2.1 Stable /snort.xml -- cgit v1.2.3