aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2015-03-20 17:42:33 -0300
committerRenato Botelho <garga@FreeBSD.org>2015-03-20 17:42:33 -0300
commite35b8aaaf19f0ddbe428e170c149f85ce2fcbb0f (patch)
treec011ba365a7670bd3d72d3c2990afb0bd0a464c7 /config
parent3904fe81c9d994ebfeb7ff76d39ebbd312228cde (diff)
parente7ea7ecd4911c3bdacc18ea018f41c66b1029242 (diff)
downloadpfsense-packages-e35b8aaaf19f0ddbe428e170c149f85ce2fcbb0f.tar.gz
pfsense-packages-e35b8aaaf19f0ddbe428e170c149f85ce2fcbb0f.tar.bz2
pfsense-packages-e35b8aaaf19f0ddbe428e170c149f85ce2fcbb0f.zip
Merge pull request #836 from bmeeks8/snort-2.9.7.2-v3.2.4
Diffstat (limited to 'config')
-rwxr-xr-xconfig/snort/snort.xml4
-rw-r--r--config/snort/snort_defs.inc2
-rw-r--r--config/snort/snort_generate_conf.php2
-rw-r--r--config/snort/snort_migrate_config.php2
-rw-r--r--config/snort/snort_post_install.php4
-rwxr-xr-xconfig/snort/snort_rulesets.php6
6 files changed, 10 insertions, 10 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 @@
<requirements>None</requirements>
<faq>Currently there are no FAQ items provided.</faq>
<name>Snort</name>
- <version>2.9.7.0</version>
- <title>Services:2.9.7.0 pkg v3.2.3</title>
+ <version>2.9.7.2</version>
+ <title>Services:2.9.7.2 pkg v3.2.4</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 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/");
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']}";
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/config/snort/snort_rulesets.php b/config/snort/snort_rulesets.php
index c29b1810..90ce1e7d 100755
--- a/config/snort/snort_rulesets.php
+++ b/config/snort/snort_rulesets.php
@@ -452,7 +452,7 @@ if ($savemsg) {
<tr>
<td width="5%" class="listr" style="text-align: center;">
<img src="../themes/<?=$g['theme'];?>/images/icons/icon_advanced.gif" width="11" height="11" border="0" title="<?=gettext("Auto-managed by settings on SID Mgmt tab");?>" /></td>
- <td colspan="5" class="listr"><a href='suricata_rules.php?id=<?=$id;?>&openruleset=<?=$community_rules_file;?>'><?=gettext("{$msg_community}");?></a></td>
+ <td colspan="5" class="listr"><a href='snort_rules.php?id=<?=$id;?>&openruleset=<?=$community_rules_file;?>'><?=gettext("{$msg_community}");?></a></td>
</tr>
<?php else: ?>
<tr>
@@ -465,7 +465,7 @@ if ($savemsg) {
<tr>
<td width="5%" class="listr" style="text-align: center;">
<input type="checkbox" name="toenable[]" value="<?=$community_rules_file;?>" checked="checked"/></td>
- <td colspan="5" class="listr"><a href='suricata_rules.php?id=<?=$id;?>&openruleset=<?=$community_rules_file;?>'><?php echo gettext("{$msg_community}"); ?></a></td>
+ <td colspan="5" class="listr"><a href='snort_rules.php?id=<?=$id;?>&openruleset=<?=$community_rules_file;?>'><?php echo gettext("{$msg_community}"); ?></a></td>
</tr>
<?php else: ?>
<tr>
@@ -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);