From 56adca230fadc29251f4462f6b154d4d43f343f2 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 7 Jan 2017 13:26:39 -0500 Subject: [PATCH 1/4] Explicity check for "off" on option default so empty values default properly. --- .../files/usr/local/www/suricata/suricata_global.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php index 352628ef921c..60dea8c159c0 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php +++ b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php @@ -50,7 +50,7 @@ $pconfig['forcekeepsettings'] = $config['installedpackages']['suricata']['config'][0]['forcekeepsettings'] == "on" ? 'on' : 'off'; $pconfig['snortcommunityrules'] = $config['installedpackages']['suricata']['config'][0]['snortcommunityrules'] == "on" ? 'on' : 'off'; $pconfig['snort_rules_file'] = $config['installedpackages']['suricata']['config'][0]['snort_rules_file']; - $pconfig['autogeoipupdate'] = $config['installedpackages']['suricata']['config'][0]['autogeoipupdate'] == "on" ? 'on' : 'off'; + $pconfig['autogeoipupdate'] = $config['installedpackages']['suricata']['config'][0]['autogeoipupdate'] == "off" ? 'off' : 'on'; $pconfig['hide_deprecated_rules'] = $config['installedpackages']['suricata']['config'][0]['hide_deprecated_rules'] == "on" ? 'on' : 'off'; } From 6380537a533a121560270480930288b3c26a3adf Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 7 Jan 2017 13:43:29 -0500 Subject: [PATCH 2/4] Delete a leftover PID file on Suricata stop so subsequent start will succeed. --- .../files/usr/local/pkg/suricata/suricata.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc index ff746b4d33da..00d9939089c3 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc +++ b/security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc @@ -87,6 +87,9 @@ function suricata_stop($suricatacfg, $if_real) { killbypid("{$g['varrun_path']}/suricata_{$if_real}{$suricata_uuid}.pid"); } } + // Make sure the PID file is actually deleted so Suricata will restart without error + unlink_if_exists("{$g['varrun_path']}/suricata_{$if_real}{$suricata_uuid}.pid"); + // Stop Barnyard2 on the interface if running suricata_barnyard_stop($suricatacfg, $if_real); } From e75618ddd7ec17d63258bd672871391686659552 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 7 Jan 2017 16:01:37 -0500 Subject: [PATCH 3/4] Bump pfSense-pkg-suricata to version 3.0_12. --- security/pfSense-pkg-suricata/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/pfSense-pkg-suricata/Makefile b/security/pfSense-pkg-suricata/Makefile index c00e62519612..f92feaf17a6b 100644 --- a/security/pfSense-pkg-suricata/Makefile +++ b/security/pfSense-pkg-suricata/Makefile @@ -2,7 +2,7 @@ PORTNAME= pfSense-pkg-suricata PORTVERSION= 3.0 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security MASTER_SITES= # empty DISTFILES= # empty From b149547f5bc292d1bd8c60defd79a196c9bcda11 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Sat, 7 Jan 2017 16:08:46 -0500 Subject: [PATCH 4/4] Update the filename in the example for Snort rules download package. --- .../files/usr/local/www/suricata/suricata_global.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php index 60dea8c159c0..daaf8f888a53 100644 --- a/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php +++ b/security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php @@ -236,7 +236,7 @@ 'Snort VRT Rules Filename', 'text', $pconfig['snort_rules_file'] -))->setHelp('Enter the rules tarball filename (filename only, do not include the URL.)
Example: snortrules-snapshot-2980.tar.gz'); +))->setHelp('Enter the rules tarball filename (filename only, do not include the URL.)
Example: snortrules-snapshot-2990.tar.gz'); $section->addInput(new Form_Input( 'oinkcode', 'Snort VRT Oinkmaster Code',