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 591ba49c033cc437caa107a9648ae816378a38d1 (commit) via 7270984c460653f2215271b86286f74e6e9fb6ca (commit) via aa892602ddb83121b828353e8754f9530bc8ef8e (commit) via 0a60842a284e96420d4a9e07e4649cbad85de273 (commit) from bf92e5596827c6a9942c2b9eec0e0d664beab486 (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 591ba49c033cc437caa107a9648ae816378a38d1 Merge: bf92e5596 7270984c4 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Dec 22 10:41:54 2023 +0000
Merge remote-tracking branch 'origin/master' into next
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/oldcore/182/filelists/files | 1 + html/cgi-bin/credits.cgi | 3 ++- html/cgi-bin/index.cgi | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-)
Difference in files: diff --git a/config/rootfiles/oldcore/182/filelists/files b/config/rootfiles/oldcore/182/filelists/files index 6ed086324..ee7ddacc7 100644 --- a/config/rootfiles/oldcore/182/filelists/files +++ b/config/rootfiles/oldcore/182/filelists/files @@ -253,6 +253,7 @@ lib/firmware/rtw89/rtw8851b_fw.bin lib/firmware/rtw89/rtw8852b_fw-1.bin srv/web/ipfire/cgi-bin/connections.cgi srv/web/ipfire/cgi-bin/dhcp.cgi +srv/web/ipfire/cgi-bin/index.cgi srv/web/ipfire/cgi-bin/tor.cgi usr/lib/libgcc_s.so.1 usr/lib/libstdc++.so.6 diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi index 2d9697a65..bc1c1639e 100644 --- a/html/cgi-bin/credits.cgi +++ b/html/cgi-bin/credits.cgi @@ -79,8 +79,8 @@ Timo Eissler, Ben Schweikert, Daniel Weismüller, Peter Pfeiffer, -Daniel Glanzmann, Robin Roevens, +Daniel Glanzmann, Heiner Schmeling, Stephan Feddersen, Stéphane Pautrel, @@ -118,6 +118,7 @@ Jakub Ratajczak, Jorrit de Jonge, Przemek Zdroik, Roberto Peña, +Sebastien GISLAIN, Alexander Rudolf Gruber, Andrew Bellows, Axel Gembe, diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index c2c0962dc..adec877cb 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -74,7 +74,7 @@ my %mainsettings = ();
my $connstate = &Header::connectionstatus();
-if ( -e "/var/ipfire/main/gpl-accepted" ) { +if ( -e "/var/ipfire/main/gpl_accepted" ) { if ($connstate =~ /$Lang::tr{'connecting'}/ || /$Lang::tr{'connection closed'}/ ){ $refresh = "<meta http-equiv='refresh' content='5;'>"; }elsif ($connstate =~ /$Lang::tr{'dod waiting'}/ || -e "${General::swroot}/main/refreshindex") {
hooks/post-receive -- IPFire 2.x development tree