From 10a2e2916eb36f455f31c63481a4d6df49415321 Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Tue, 17 Mar 2015 18:30:44 -0400 Subject: Fix typo in URL for GPLv2 Community Rules details link. --- config/snort/snort_rulesets.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php index c29b1810..6515fdb5 100755 --- a/config/snort/snort_rulesets.php +++ b/config/snort/snort_rulesets.php @@ -452,7 +452,7 @@ if ($savemsg) { " /> - + @@ -465,7 +465,7 @@ if ($savemsg) { - + -- cgit v1.2.3 From a4644ce84330da8a87c4028f980ec5b42f0ca08b Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Tue, 17 Mar 2015 18:34:46 -0400 Subject: Fix missing $ in front of array variable name. --- config/snort/snort_rulesets.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php index 6515fdb5..90ce1e7d 100755 --- a/config/snort/snort_rulesets.php +++ b/config/snort/snort_rulesets.php @@ -531,7 +531,7 @@ if ($savemsg) { sort($snortrules); $i = count($emergingrules); if ($i < count($snortsorules)) - $i = count(snortsorules); + $i = count($snortsorules); if ($i < count($snortrules)) $i = count($snortrules); -- cgit v1.2.3 From 8c7616c68ed07d6e53303c4a8d6dba2a50f7c98e Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Tue, 17 Mar 2015 18:38:04 -0400 Subject: Bump default for Snort binary version to 2.9.7.2 --- config/snort/snort_defs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/snort/snort_defs.inc b/config/snort/snort_defs.inc index 43ecada6..906dd465 100644 --- a/config/snort/snort_defs.inc +++ b/config/snort/snort_defs.inc @@ -50,7 +50,7 @@ if (!defined("SNORT_BIN_VERSION")) { if (!empty($snortver[0])) define("SNORT_BIN_VERSION", $snortver[0]); else - define("SNORT_BIN_VERSION", "2.9.7.0"); + define("SNORT_BIN_VERSION", "2.9.7.2"); } if (!defined("SNORT_SID_MODS_PATH")) define('SNORT_SID_MODS_PATH', "{$g['vardb_path']}/snort/sidmods/"); -- cgit v1.2.3 From 09c709ffc15c5cebd7439c33c6060aa86e8cc9de Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Tue, 17 Mar 2015 18:57:13 -0400 Subject: Need to trim trailing backslash off OpenAppID path. --- config/snort/snort_generate_conf.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/snort/snort_generate_conf.php b/config/snort/snort_generate_conf.php index 1d56fc13..297e833b 100644 --- a/config/snort/snort_generate_conf.php +++ b/config/snort/snort_generate_conf.php @@ -895,7 +895,7 @@ EOD; /* def AppID preprocessor */ $appid_memcap = $snortcfg['sf_appid_mem_cap'] * 1024 * 1024; -$appid_params = "app_detector_dir " . SNORT_APPID_ODP_PATH . ", \\\n\tmemcap {$appid_memcap}"; +$appid_params = "app_detector_dir " . rtrim(SNORT_APPID_ODP_PATH, '/') . ", \\\n\tmemcap {$appid_memcap}"; if ($snortcfg['sf_appid_statslog'] == "on") { $appid_params .= ", \\\n\tapp_stats_filename app-stats.log"; $appid_params .= ", \\\n\tapp_stats_period {$snortcfg['sf_appid_stats_period']}"; -- cgit v1.2.3 From e7ea7ecd4911c3bdacc18ea018f41c66b1029242 Mon Sep 17 00:00:00 2001 From: bmeeks8 Date: Tue, 17 Mar 2015 19:24:10 -0400 Subject: Bump Snort package version to 2.9.7.2-v3.2.4 --- config/snort/snort.xml | 4 ++-- config/snort/snort_migrate_config.php | 2 +- config/snort/snort_post_install.php | 4 ++-- pkg_config.10.xml | 4 ++-- pkg_config.8.xml | 4 ++-- pkg_config.8.xml.amd64 | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/snort/snort.xml b/config/snort/snort.xml index 60573130..1f1a7d24 100755 --- a/config/snort/snort.xml +++ b/config/snort/snort.xml @@ -46,8 +46,8 @@ None Currently there are no FAQ items provided. Snort - 2.9.7.0 - Services:2.9.7.0 pkg v3.2.3 + 2.9.7.2 + Services:2.9.7.2 pkg v3.2.4 /usr/local/pkg/snort/snort.inc Snort diff --git a/config/snort/snort_migrate_config.php b/config/snort/snort_migrate_config.php index de8ac308..941a8151 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.3"; + $config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.4"; 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 7ab8b3db..f93f1c87 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.3"; -write_config("Snort pkg v3.2.3: post-install configuration saved."); +$config['installedpackages']['snortglobal']['snort_config_ver'] = "3.2.4"; +write_config("Snort pkg v3.2.4: 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 80c5d24a..bb481fb4 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -353,14 +353,14 @@ http://www.snort.org Snort is an open source network intrusion prevention and detection system (IDS/IPS). Combining the benefits of signature, protocol, and anomaly-based inspection. Security - snort-2.9.7.0-##ARCH##.pbi + snort-2.9.7.2-##ARCH##.pbi security/snort security/barnyard2 barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET=PULLEDPORK FILEINSPECT HA;perl_SET=THREADS https://packages.pfsense.org/packages/config/snort/snort.xml - 2.9.7.0 pkg v3.2.3 + 2.9.7.2 pkg v3.2.4 2.2 Stable /snort.xml diff --git a/pkg_config.8.xml b/pkg_config.8.xml index 209deb0c..642ddcb4 100644 --- a/pkg_config.8.xml +++ b/pkg_config.8.xml @@ -486,14 +486,14 @@ Snort is an open source network intrusion prevention and detection system (IDS/IPS). Combining the benefits of signature, protocol, and anomaly-based inspection. Security https://files.pfsense.org/packages/8/All/ - snort-2.9.7.0-i386.pbi + snort-2.9.7.2-i386.pbi security/snort security/barnyard2 barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET=PULLEDPORK FILEINSPECT HA;perl_SET=THREADS https://packages.pfsense.org/packages/config/snort/snort.xml - 2.9.7.0 pkg v3.2.3 + 2.9.7.2 pkg v3.2.4 2.1 Stable /snort.xml diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64 index 448a30d5..9bd32dd8 100644 --- a/pkg_config.8.xml.amd64 +++ b/pkg_config.8.xml.amd64 @@ -473,14 +473,14 @@ Snort is an open source network intrusion prevention and detection system (IDS/IPS). Combining the benefits of signature, protocol, and anomaly-based inspection. Security https://files.pfsense.org/packages/amd64/8/All/ - snort-2.9.7.0-amd64.pbi + snort-2.9.7.2-amd64.pbi security/snort security/barnyard2 barnyard2_UNSET=ODBC PGSQL PRELUDE;barnyard2_SET=GRE IPV6 MPLS MYSQL PORT_PCAP BRO;snort_SET=PERFPROFILE SOURCEFIRE GRE IPV6 NORMALIZER APPID;snort_UNSET=PULLEDPORK FILEINSPECT HA;perl_SET=THREADS https://packages.pfsense.org/packages/config/snort/snort.xml - 2.9.7.0 pkg v3.2.3 + 2.9.7.2 pkg v3.2.4 2.1 Stable /snort.xml -- cgit v1.2.3