This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 6fe4eb60948f405fda7c06929baffbf3c6be2e85 (commit) via ea04468d07bddb8b9a71fc930b1d9672062eacf5 (commit) via fad7d1c4c606ffcc1e86d94ea5ec2ab2cf4e2831 (commit) via 7b82d83d7e2b352ca3942b31444221bc00255006 (commit) via 8f51b0a4f527193e08d6311496d9a091691ba7a4 (commit) from cad86575323c49037aff053210325cfdf98deafa (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 6fe4eb60948f405fda7c06929baffbf3c6be2e85 Author: Peter Müller peter.mueller@ipfire.org Date: Sat Mar 5 14:45:32 2022 +0000
Core Update 165: Rename squid-accounting add-on to proxy-accounting
https://lists.ipfire.org/pipermail/development/2022-February/012482.html
The second version of this patch omits bogus directives for restarting a service, which proxy-accounting is not.
Cc: Michael Tremer michael.tremer@ipfire.org Cc: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit ea04468d07bddb8b9a71fc930b1d9672062eacf5 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 7 18:46:34 2022 +0000
core165: Ship ids.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fad7d1c4c606ffcc1e86d94ea5ec2ab2cf4e2831 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Mon Mar 7 17:52:36 2022 +0100
ids.cgi: Only read-in ignored hosts, if the ignore file exists.
Otherwise the CGI will crash.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 7b82d83d7e2b352ca3942b31444221bc00255006 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Mar 7 18:45:58 2022 +0000
core165: Ship optionsfw.cgi
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 8f51b0a4f527193e08d6311496d9a091691ba7a4 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Mar 5 19:13:39 2022 +0100
optionsfw.cgi: Add default settings for newly added options.
If no settings for those features can be obtained from the settings file, set them to the following defaults.
* DROPSPOOFEDMARTIAN -> on (yes) * DROPHOSTILE -> off (no - because only fresh installed systems should do this) * LOGDROPCTINVALID -> on (yes)
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Reviewed-by: Peter Müller peter.mueller@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/165/filelists/files | 2 ++ config/rootfiles/core/165/update.sh | 8 ++++++++ html/cgi-bin/ids.cgi | 8 ++++---- html/cgi-bin/optionsfw.cgi | 9 +++++++++ 4 files changed, 23 insertions(+), 4 deletions(-)
Difference in files: diff --git a/config/rootfiles/core/165/filelists/files b/config/rootfiles/core/165/filelists/files index 34be4b071..d03e3f529 100644 --- a/config/rootfiles/core/165/filelists/files +++ b/config/rootfiles/core/165/filelists/files @@ -5,8 +5,10 @@ opt/pakfire/etc/pakfire.conf opt/pakfire/lib/functions.pl srv/web/ipfire/cgi-bin/backup.cgi srv/web/ipfire/cgi-bin/firewall.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/logs.cgi/ovpnclients.dat srv/web/ipfire/cgi-bin/media.cgi +srv/web/ipfire/cgi-bin/optionsfw.cgi srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/qos.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi diff --git a/config/rootfiles/core/165/update.sh b/config/rootfiles/core/165/update.sh index fe4449fff..f505628e4 100644 --- a/config/rootfiles/core/165/update.sh +++ b/config/rootfiles/core/165/update.sh @@ -97,6 +97,14 @@ rm -rvf \ /var/ipfire/dhcpc/dhcpcd-hooks/10-mtu \ /var/ipfire/firewall/p2protocols
+# Rename squid-accounting add-on to proxy-accounting, if installed +# (see: https://lists.ipfire.org/pipermail/development/2022-February/012482.html) +if [ -e "/opt/pakfire/db/installed/meta-squid-accounting" ] && [ -e "/opt/pakfire/db/meta/meta-squid-accounting" ]; then + mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/installed/meta-proxy-accounting + mv -v /opt/pakfire/db/meta/meta-squid-accounting /opt/pakfire/db/meta/meta-proxy-accounting + mv -v /opt/pakfire/db/rootfiles/squid-accounting /opt/pakfire/db/rootfiles/proxy-accounting +fi + # Stop services
# Extract files diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 27e61e9bb..722715667 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -103,7 +103,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq my $new_entry_remark = $cgiparams{'IGNORE_ENTRY_REMARK'};
# Read-in ignoredfile. - &General::readhasharray($IDS::ignored_file, %ignored); + &General::readhasharray($IDS::ignored_file, %ignored) if (-e $IDS::ignored_file);
# Check if we should edit an existing entry and got an ID. if (($cgiparams{'WHITELIST'} eq $Lang::tr{'update'}) && ($cgiparams{'ID'})) { @@ -165,7 +165,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq undef($cgiparams{'ID'});
# Read-in ignoredfile. - &General::readhasharray($IDS::ignored_file, %ignored); + &General::readhasharray($IDS::ignored_file, %ignored) if (-e $IDS::ignored_file);
# Grab the configured status of the corresponding entry. my $status = $ignored{$id}[2]; @@ -199,7 +199,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cgiparams{'WHITELIST'} eq my %ignored = ();
# Read-in ignoredfile. - &General::readhasharray($IDS::ignored_file, %ignored); + &General::readhasharray($IDS::ignored_file, %ignored) if (-e $IDS::ignored_file);
# Drop entry from the hash. delete($ignored{$cgiparams{'ID'}}); @@ -1071,7 +1071,7 @@ sub show_mainpage() { }
# Read-in ignored hosts. - &General::readhasharray("$IDS::settingsdir/ignored", %ignored); + &General::readhasharray("$IDS::ignored_file", %ignored) if (-e $IDS::ignored_file);
$checked{'ENABLE_IDS'}{'off'} = ''; $checked{'ENABLE_IDS'}{'on'} = ''; diff --git a/html/cgi-bin/optionsfw.cgi b/html/cgi-bin/optionsfw.cgi index 5611b71b7..fbff67b2f 100644 --- a/html/cgi-bin/optionsfw.cgi +++ b/html/cgi-bin/optionsfw.cgi @@ -88,6 +88,15 @@ if (!$settings{'MASQUERADE_ORANGE'}) { if (!$settings{'MASQUERADE_BLUE'}) { $settings{'MASQUERADE_BLUE'} = 'on'; } +if (!$settings{'DROPSPOOFEDMARTIAN'}) { + $settings{'DROPSPOOFEDMARTIAN'} = 'on'; +} +if (!$settings{'DROPHOSTILE'}) { + $settings{'DROPHOSTILE'} = 'off'; +} +if (!$settings{'LOGDROPCTINVALID'}) { + $settings{'LOGDROPCTINVALID'} = 'on'; +}
$checked{'DROPNEWNOTSYN'}{'off'} = ''; $checked{'DROPNEWNOTSYN'}{'on'} = '';
hooks/post-receive -- IPFire 2.x development tree