From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZpFqj4yT1z33J6 for ; Thu, 1 May 2025 13:52:49 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZpFqj4g1Gz2xVX for ; Thu, 1 May 2025 13:52:49 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZpFqj0ghzz1Zc for ; Thu, 1 May 2025 13:52:49 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746107569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=IaoIinQmTg6U4Al+hU2QBmb/Wr5kGGKCvdAwIZtRe2s=; b=3RdAx/HflYG6diz0pYnLV+Pm/r1T8jrwq2qIRBMszH8lNr7tLDpsjHE5JKtiuItYoHUHVd z1MKHWWe6cs0OYDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746107569; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=IaoIinQmTg6U4Al+hU2QBmb/Wr5kGGKCvdAwIZtRe2s=; b=kJ1STXvi7AM+LdsVOGr9IuCinetj7gVuVMSTOc3bf19N/n4mUZsT8BAnHar0x2xRnSLG+F tt1scXt/VLky4aKB3VYSDRvWutSAtoQg1cr5dRU+v9uudMMcK1aY9G2Ja8OdoMGmecoaGe jsd7y8rZtzstCz0MwniOlkFtGPaoFvOfF07muehv4B11LoK033tMzVMGKQh/jDx77tKEk3 d7o9GkcZ4/qNSrQ/O9OKIr9TybJepegcqhDfYKIa0qMdWmNYHOCHs3zfLP8VnW+5PxPlU4 5+XKH5WqRLOW0a7vU1f6xGXRE5blOxVIkHmU6Q5Iqwt9AMiozP1thdvW7fTdgA== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ZpFqh6MzNz2yP2; Thu, 1 May 2025 13:52:48 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, master, updated. 262809b881398c77f31d73a06f4b51461820fe85 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: f0acc9e4a3a446307684dfe9ee9031313407546a X-Git-Newrev: 262809b881398c77f31d73a06f4b51461820fe85 Message-Id: <4ZpFqh6MzNz2yP2@people01.haj.ipfire.org> Date: Thu, 1 May 2025 13:52:48 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 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 Signed-off-by: Adolf Belka Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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