Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pfSense-pkg-suricata-4.0.13_3 -- Fix remaining PHP 7.2 warnings and remove deprecated file #551

Merged
merged 3 commits into from
Aug 15, 2018
Merged

pfSense-pkg-suricata-4.0.13_3 -- Fix remaining PHP 7.2 warnings and remove deprecated file #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
329dea8
Fix remaining 'undef constant' PHP errors in Suricata package.
bmeeks8 Aug 15, 2018
706c9f5
Remove no longer needed PHP file from Suricata package.
bmeeks8 Aug 15, 2018
70ad41d
Bump Suricata package version to 4.0.13_3.
bmeeks8 Aug 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions security/pfSense-pkg-suricata/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PORTNAME= pfSense-pkg-suricata
PORTVERSION= 4.0.13
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= # empty
DISTFILES= # empty
Expand Down Expand Up @@ -75,8 +75,6 @@ do-install:
${STAGEDIR}${PREFIX}/www/suricata
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/suricata/suricata_interfaces_edit.php \
${STAGEDIR}${PREFIX}/www/suricata
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/suricata/suricata_download_rules.php \
${STAGEDIR}${PREFIX}/www/suricata
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/suricata/suricata_rules.php \
${STAGEDIR}${PREFIX}/www/suricata
${INSTALL_DATA} ${FILESDIR}${PREFIX}/www/suricata/suricata_rulesets.php \
Expand Down
5 changes: 2 additions & 3 deletions security/pfSense-pkg-suricata/files/etc/inc/priv/suricata.priv.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* suricata.priv.inc
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2014 Bill Meeks
* Copyright (c) 2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2018 Bill Meeks
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -31,7 +31,6 @@ $priv_list['page-services-suricata']['match'][] = "suricata/suricata_barnyard.ph
$priv_list['page-services-suricata']['match'][] = "suricata/suricata_blocked.php*";
$priv_list['page-services-suricata']['match'][] = "suricata/suricata_check_for_rule_updates.php*";
$priv_list['page-services-suricata']['match'][] = "suricata/suricata_define_vars.php*";
$priv_list['page-services-suricata']['match'][] = "suricata/suricata_download_rules.php*";
$priv_list['page-services-suricata']['match'][] = "suricata/suricata_download_updates.php*";
$priv_list['page-services-suricata']['match'][] = "suricata/suricata_app_parsers.php*";
$priv_list['page-services-suricata']['match'][] = "suricata/suricata_libhtp_policy_engine.php*";
Expand Down
6 changes: 3 additions & 3 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_barnyard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* suricata_barnyard.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
* Copyright (c) 2014 Bill Meeks
* Copyright (c) 2018 Bill Meeks
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -477,7 +477,7 @@
?>

<div class="infoblock">
<?=print_info_box('<strong>Note:</strong> Please save your settings before you click start.', info)?>
<?=print_info_box('<strong>Note:</strong> Please save your settings before you click start.', 'info')?>
</div>

<script type="text/javascript">
Expand Down
87 changes: 0 additions & 87 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_download_rules.php
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_flow_stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* suricata_flow_stream.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
* Copyright (c) 2016 Bill Meeks
* Copyright (c) 2018 Bill Meeks
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -809,7 +809,7 @@
?>

<div class="infoblock">
<?=print_info_box('<strong>Note:</strong> Please save your settings before you exit. Changes will rebuild the rules file. This may take several seconds. Suricata must also be restarted to activate any changes made on this screen.', info)?>
<?=print_info_box('<strong>Note:</strong> Please save your settings before you exit. Changes will rebuild the rules file. This may take several seconds. Suricata must also be restarted to activate any changes made on this screen.', 'info')?>
</div>

<?php } ?>
Expand Down
4 changes: 2 additions & 2 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* suricata_global.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
Expand Down Expand Up @@ -427,7 +427,7 @@
</div>

<div class="infoblock">
<?=print_info_box('<strong>Note:</strong> Changing any settings on this page will affect all Suricata-configured interfaces.', info)?>
<?=print_info_box('<strong>Note:</strong> Changing any settings on this page will affect all Suricata-configured interfaces.', 'info')?>
</div>

<script type="text/javascript">
Expand Down
4 changes: 2 additions & 2 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_interfaces_edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* suricata_interfaces_edit.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
Expand Down Expand Up @@ -1469,7 +1469,7 @@ function suricata_get_config_lists($lists) {
?>

<div class="infoblock">
<?=print_info_box('<strong>Note:</strong> Please save your settings before you attempt to start Suricata.', info)?>
<?=print_info_box('<strong>Note:</strong> Please save your settings before you attempt to start Suricata.', 'info')?>
</div>

<script type="text/javascript">
Expand Down
6 changes: 3 additions & 3 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_logs_mgmt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* suricata_logs_mgmt.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
* Copyright (c) 2016 Bill Meeks
* Copyright (c) 2018 Bill Meeks
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -474,7 +474,7 @@
?>

<div class="infoblock">
<?=print_info_box('<strong>Note:</strong> Changing any settings on this page will affect all Suricata-configured interfaces.', info)?>
<?=print_info_box('<strong>Note:</strong> Changing any settings on this page will affect all Suricata-configured interfaces.', 'info')?>
</div>

<script language="JavaScript">
Expand Down
6 changes: 3 additions & 3 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_passlist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* suricata_passlist.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
* Copyright (c) 2014 Bill Meeks
* Copyright (c) 2018 Bill Meeks
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -198,7 +198,7 @@ function suricata_is_passlist_used($list) {
</div>

<div class="infoblock">
<?=print_info_box('<strong>Note:</strong><ol><li>Here you can create Pass List files for your Suricata package rules. Hosts on a Pass List are never blocked by Suricata.</li><li>Add all the IP addresses or networks (in CIDR notation) you want to protect against Suricata block decisions.</li><li>The default Pass List includes the WAN IP and gateway, defined DNS servers, VPNs and locally-attached networks.</li><li>Be careful, it is very easy to get locked out of your system by altering the default settings.</li><li>To use a custom Pass List on an interface, you must manually assign the list using the drop-down control on the Interface Settings tab.</li></ol><p>Remember you must restart Suricata on the interface for changes to take effect!</p>', info)?>
<?=print_info_box('<strong>Note:</strong><ol><li>Here you can create Pass List files for your Suricata package rules. Hosts on a Pass List are never blocked by Suricata.</li><li>Add all the IP addresses or networks (in CIDR notation) you want to protect against Suricata block decisions.</li><li>The default Pass List includes the WAN IP and gateway, defined DNS servers, VPNs and locally-attached networks.</li><li>Be careful, it is very easy to get locked out of your system by altering the default settings.</li><li>To use a custom Pass List on an interface, you must manually assign the list using the drop-down control on the Interface Settings tab.</li></ol><p>Remember you must restart Suricata on the interface for changes to take effect!</p>', 'info')?>
</div>

<?php include("foot.inc"); ?>
6 changes: 3 additions & 3 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_select_alias.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* suricata_select_alias.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
* Copyright (c) 2014 Bill Meeks
* Copyright (c) 2018 Bill Meeks
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -216,7 +216,7 @@

print_info_box('<strong>' . gettext('Note:') . '<br></strong>' . gettext('Fully-Qualified Domain Name (FQDN) host Aliases cannot be used as Suricata configuration parameters. ' .
' Aliases resolving to a single FQDN value are disabled in the list above. ' .
'In the case of nested Aliases where one or more of the nested values is a FQDN host, the FQDN host will not be included in the {$title} configuration.'), info, false);
'In the case of nested Aliases where one or more of the nested values is a FQDN host, the FQDN host will not be included in the {$title} configuration.'), 'info', false);
?>
</div>
</form>
Expand Down
6 changes: 3 additions & 3 deletions security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_suppress.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
* suricata_suppress.php
*
* part of pfSense (https://www.pfsense.org)
* Copyright (c) 2006-2016 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2006-2018 Rubicon Communications, LLC (Netgate)
* Copyright (c) 2003-2004 Manuel Kasper
* Copyright (c) 2005 Bill Marquette
* Copyright (c) 2009 Robert Zelaya Sr. Developer
* Copyright (c) 2016 Bill Meeks
* Copyright (c) 2018 Bill Meeks
* All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
Expand Down Expand Up @@ -190,7 +190,7 @@ function suricata_find_suppresslist_interface($supplist) {


<div class="infoblock">
<?=print_info_box('<p><strong>Note:</strong> Here you can create event filtering and suppression for your Suricata package rules.</p><p>Please note that you must restart a running Interface so that changes can take effect.</p><p>You cannot delete a Suppress List that is currently assigned to a Suricata interface (instance).</p><p>You must first unassign the Suppress List on the Interface Edit tab.</p>', info)?>
<?=print_info_box('<p><strong>Note:</strong> Here you can create event filtering and suppression for your Suricata package rules.</p><p>Please note that you must restart a running Interface so that changes can take effect.</p><p>You cannot delete a Suppress List that is currently assigned to a Suricata interface (instance).</p><p>You must first unassign the Suppress List on the Interface Edit tab.</p>', 'info')?>
</div>

<?php include("foot.inc"); ?>
1 change: 0 additions & 1 deletion security/pfSense-pkg-suricata/pkg-plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ www/suricata/suricata_global.php
www/suricata/suricata_alerts.php
www/suricata/suricata_interfaces.php
www/suricata/suricata_interfaces_edit.php
www/suricata/suricata_download_rules.php
www/suricata/suricata_rules.php
www/suricata/suricata_rulesets.php
www/suricata/suricata_rules_flowbits.php
Expand Down