[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bf4bd9dd36470b9091ad03856e9f7cfd89d9e98d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. bf4bd9dd36470b9091ad03856e9f7cfd89d9e98d

[Arne Fitzenreiter]

[-- Attachment #1: Type: text/plain, Size: 3098 bytes --]

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  bf4bd9dd36470b9091ad03856e9f7cfd89d9e98d (commit)
       via  6515a2780201e9209e370cd4562bef5cb771f1a5 (commit)
      from  25b6a76646691f91f6f267792700dde6adcfc91b (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 bf4bd9dd36470b9091ad03856e9f7cfd89d9e98d
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sun May 19 15:13:23 2024 +0200

    core186: ship header.pl
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 6515a2780201e9209e370cd4562bef5cb771f1a5
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed May 15 13:20:03 2024 +0000

    header.pl: Fix parsing BOOTP leases
    
    If the lease has been handed out over BOOTP, it will never expire.
    However, the parser did not account for this case at all which is fixed
    in this patch.
    
    Fixes: #13689 - BOOTP breaks the list of DHCP leases due to erroneous parsing
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/cfgroot/header.pl                  | 8 ++++++--
 config/rootfiles/core/186/filelists/files | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl
index 5164e9731..a67ff92ee 100644
--- a/config/cfgroot/header.pl
+++ b/config/cfgroot/header.pl
@@ -454,12 +454,16 @@ END
 			$hostname = "";
 		}
 
-		if ($line =~ /^\s*ends/) {
-			$line =~ /(\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/;
+		if ($line =~ /^\s*ends \d (\d+)\/(\d+)\/(\d+) (\d+):(\d+):(\d+)/) {
 			$endtime = timegm($6, $5, $4, $3, $2 - 1, $1 - 1900);
 			($sec, $min, $hour, $mday, $mon, $year, $wday, $yday, $dst) = localtime($endtime);
 			$endtime_print = sprintf ("%02d/%02d/%d %02d:%02d:%02d",$mday,$mon+1,$year+1900,$hour,$min,$sec);
 			$expired = $endtime < time();
+
+		} elsif ($line =~ /^\s*ends never/) {
+			$endtime = 0;
+			$endtime_print = $Lang::tr{'never'};
+			$expired = 0;
 		}
 
 		if ($line =~ /^\s*hardware ethernet/) {
diff --git a/config/rootfiles/core/186/filelists/files b/config/rootfiles/core/186/filelists/files
index c3c0fc8bc..3f0d11ae2 100644
--- a/config/rootfiles/core/186/filelists/files
+++ b/config/rootfiles/core/186/filelists/files
@@ -15,4 +15,5 @@ etc/rc.d/rc6.d/K01grub-btrfsd
 srv/web/ipfire/cgi-bin/vulnerabilities.cgi
 usr/local/bin/ipsec-interfaces
 usr/sbin/unbound-dhcp-leases-bridge
+var/ipfire/header.pl
 var/ipfire/ipblocklist/sources


hooks/post-receive
--
IPFire 2.x development tree