Merge pull request #251 from bmeeks8/pfSense-pkg-suricata-3.0_12

pfsense · Jan 9, 2017 · 50d3719 · 50d3719
2 parents 636946c + b149547
commit 50d3719
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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

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
@@ -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);
 }

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
@@ -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';
 }
 
@@ -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.)<br />Example: snortrules-snapshot-2980.tar.gz');
+))->setHelp('Enter the rules tarball filename (filename only, do not include the URL.)<br />Example: snortrules-snapshot-2990.tar.gz');
 $section->addInput(new Form_Input(
 	'oinkcode',
 	'Snort VRT Oinkmaster Code',