From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 6fe4eb60948f405fda7c06929baffbf3c6be2e85 Date: Mon, 07 Mar 2022 18:47:56 +0000 Message-ID: <4KC6sT0zvLz2xv4@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4827751416057675353==" List-Id: --===============4827751416057675353== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=C3=BCller Date: Sat Mar 5 14:45:32 2022 +0000 Core Update 165: Rename squid-accounting add-on to proxy-accounting =20 https://lists.ipfire.org/pipermail/development/2022-February/012482.html =20 The second version of this patch omits bogus directives for restarting a service, which proxy-accounting is not. =20 Cc: Michael Tremer Cc: Adolf Belka Signed-off-by: Peter M=C3=BCller Signed-off-by: Michael Tremer commit ea04468d07bddb8b9a71fc930b1d9672062eacf5 Author: Michael Tremer Date: Mon Mar 7 18:46:34 2022 +0000 core165: Ship ids.cgi =20 Signed-off-by: Michael Tremer commit fad7d1c4c606ffcc1e86d94ea5ec2ab2cf4e2831 Author: Stefan Schantl Date: Mon Mar 7 17:52:36 2022 +0100 ids.cgi: Only read-in ignored hosts, if the ignore file exists. =20 Otherwise the CGI will crash. =20 Signed-off-by: Stefan Schantl Signed-off-by: Michael Tremer commit 7b82d83d7e2b352ca3942b31444221bc00255006 Author: Michael Tremer Date: Mon Mar 7 18:45:58 2022 +0000 core165: Ship optionsfw.cgi =20 Signed-off-by: Michael Tremer commit 8f51b0a4f527193e08d6311496d9a091691ba7a4 Author: Stefan Schantl Date: Sat Mar 5 19:13:39 2022 +0100 optionsfw.cgi: Add default settings for newly added options. =20 If no settings for those features can be obtained from the settings file, set them to the following defaults. =20 * DROPSPOOFEDMARTIAN -> on (yes) * DROPHOSTILE -> off (no - because only fresh installed systems should do this) * LOGDROPCTINVALID -> on (yes) =20 Signed-off-by: Stefan Schantl Reviewed-by: Peter M=C3=BCller Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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/cor= e/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 =20 +# 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/pa= kfire/db/meta/meta-squid-accounting" ]; then + mv -v /opt/pakfire/db/installed/meta-squid-accounting /opt/pakfire/db/insta= lled/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 =20 # 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'}) || ($cg= iparams{'WHITELIST'} eq my $new_entry_remark =3D $cgiparams{'IGNORE_ENTRY_REMARK'}; =20 # Read-in ignoredfile. - &General::readhasharray($IDS::ignored_file, \%ignored); + &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignore= d_file); =20 # 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'}) || ($cg= iparams{'WHITELIST'} eq undef($cgiparams{'ID'}); =20 # Read-in ignoredfile. - &General::readhasharray($IDS::ignored_file, \%ignored); + &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignore= d_file); =20 # Grab the configured status of the corresponding entry. my $status =3D $ignored{$id}[2]; @@ -199,7 +199,7 @@ if (($cgiparams{'WHITELIST'} eq $Lang::tr{'add'}) || ($cg= iparams{'WHITELIST'} eq my %ignored =3D (); =20 # Read-in ignoredfile. - &General::readhasharray($IDS::ignored_file, \%ignored); + &General::readhasharray($IDS::ignored_file, \%ignored) if (-e $IDS::ignored= _file); =20 # Drop entry from the hash. delete($ignored{$cgiparams{'ID'}}); @@ -1071,7 +1071,7 @@ sub show_mainpage() { } =20 # Read-in ignored hosts. - &General::readhasharray("$IDS::settingsdir/ignored", \%ignored); + &General::readhasharray("$IDS::ignored_file", \%ignored) if (-e $IDS::ignor= ed_file); =20 $checked{'ENABLE_IDS'}{'off'} =3D ''; $checked{'ENABLE_IDS'}{'on'} =3D ''; 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'} =3D 'on'; } +if (!$settings{'DROPSPOOFEDMARTIAN'}) { + $settings{'DROPSPOOFEDMARTIAN'} =3D 'on'; +} +if (!$settings{'DROPHOSTILE'}) { + $settings{'DROPHOSTILE'} =3D 'off'; +} +if (!$settings{'LOGDROPCTINVALID'}) { + $settings{'LOGDROPCTINVALID'} =3D 'on'; +} =20 $checked{'DROPNEWNOTSYN'}{'off'} =3D ''; $checked{'DROPNEWNOTSYN'}{'on'} =3D ''; hooks/post-receive -- IPFire 2.x development tree --===============4827751416057675353==--