pfSense-pkg-suricata-6.0.6_1 - Fix PHP8 compatibility issues. Redmine Issue #13531. #1192
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jim-p
requested changes
Oct 3, 2022
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_flow_stream.php
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_global.php
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_check_cron_misc.inc
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_check_cron_misc.inc
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_migrate_config.php
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_migrate_config.php
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_migrate_config.php
Outdated
Show resolved
Hide resolved
security/pfSense-pkg-suricata/files/usr/local/www/suricata/suricata_rules_edit.php
Outdated
Show resolved
Hide resolved
linnemannr
reviewed
Oct 14, 2022
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_check_cron_misc.inc
Outdated
Show resolved
Hide resolved
linnemannr
reviewed
Oct 19, 2022
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata.inc
Outdated
Show resolved
Hide resolved
|
I believe the Suricata GUI package update for PHP 8.1 is ready for merging unless there are additional reviewer comments. |
jim-p
approved these changes
Oct 20, 2022
linnemannr
reviewed
Oct 20, 2022
security/pfSense-pkg-suricata/files/usr/local/pkg/suricata/suricata_generate_yaml.php
Show resolved
Hide resolved
linnemannr
reviewed
Oct 20, 2022
| @@ -129,12 +117,12 @@ | |||
| /* from the package configuration. The status is now */ | |||
| /* stored in a local file. */ | |||
| /**********************************************************/ | |||
| if (isset($config['installedpackages']['suricata']['config'][0]['last_rule_upd_status'])) { | |||
| unset($config['installedpackages']['suricata']['config'][0]['last_rule_upd_status']); | |||
| if (config_path_enabled('installedpackages/suricata/config/0', 'last_rule_upd_status')) { | |||
There was a problem hiding this comment.
For these and the following, I'd suggest straying away from config_path_enabled() as the intent there is to check if a particular element or property is enabled, with the ultimate goal of being able to abstract out what the implementation of 'enabled' is in the backend of the config. I'd recommend instead using empty as above, or if these properties are optional use config_get_path('foo/bar/baz') !== null
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
pfSense-pkg-suricata-6.0.6_1
This update fixes a number of PHP8 compatibility issues and introduces the new config_path() and array_path() functions.
New Features:
Bug Fixes: