[git.ipfire.org] IPFire 2.x development tree branch, master, updated. 262809b881398c77f31d73a06f4b51461820fe85

[Michael Tremer <git@ipfire.org>]

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, master has been updated
       via  262809b881398c77f31d73a06f4b51461820fe85 (commit)
      from  f0acc9e4a3a446307684dfe9ee9031313407546a (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 262809b881398c77f31d73a06f4b51461820fe85
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Thu May 1 09:41:03 2025 +0200

    core194: Fix cert name and change other check to ! -s
    
    - This v2 version corrects the b! -z to ! -s
    - Error in hostcert extension
    - -z is for use with strings and not with files. This should have been ! -s. Thanks to
       @Nick for spotting this and flagging it up. Th ! -z would do the test against the
       filename string and as this doesn't change then it would always come up true.
    - I thought I had tested the original patch of this change but obviously not because
       there was missing whitespace and filenames not quoted plus the fixes I have added
       in this patch.
    - I definitely tested this out this time by copying it from the update.sh and applying
       it to my vm system. I have also tested this out with the hostcert.pem file present
       and not and with the index.txt file empty and containing something. This now works
       as it should, which is to only carry out the edit on the serial file if the
       hostcert.pem file is present AND the index.txt file is empty.
    - I clearly need to look more carefully at and test even more carefully at any bash
       statements that I put together.
    
    Tested-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 config/rootfiles/core/194/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/194/update.sh b/config/rootfiles/core/194/update.sh
index b758c7bf6..344045ff4 100644
--- a/config/rootfiles/core/194/update.sh
+++ b/config/rootfiles/core/194/update.sh
@@ -104,7 +104,7 @@ ldconfig
 /usr/local/bin/filesystem-cleanup
 
 # Increment ipsec serial file if x509 certificates present and no content in index.txt
-if [ -e "/var/ipfire/certs/hostcert.pm" ] && [ -z "/var/ipfire/certs/index.txt" ]; then
+if [ -e "/var/ipfire/certs/hostcert.pem" ] && [ ! -s "/var/ipfire/certs/index.txt" ]; then
     sed -i "s/01/02/" /var/ipfire/certs/serial
 fi
 


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