[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 786082f365d125d14c26c8ea23157f27261da252

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 786082f365d125d14c26c8ea23157f27261da252

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2903 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 3.x development tree".

The branch, master has been updated
       via  786082f365d125d14c26c8ea23157f27261da252 (commit)
       via  5776daeb519f6a9e90ca13640002fd02713fddbf (commit)
      from  905b8cbfbdf341e433d39436527f3ad28632f7fa (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 786082f365d125d14c26c8ea23157f27261da252
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Sep 13 17:55:49 2023 +0000

    ca-certificates: Fix generating certificate store
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 5776daeb519f6a9e90ca13640002fd02713fddbf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Sep 13 17:55:02 2023 +0000

    p11-kit: Update to 0.25.0
    
    This change also sets the path for p11-kit to search for certificates.
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

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

Summary of changes:
 ca-certificates/ca-certificates.nm | 8 +++++---
 p11-kit/p11-kit.nm                 | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/ca-certificates/ca-certificates.nm b/ca-certificates/ca-certificates.nm
index c06d3cc6e..bc5365cbb 100644
--- a/ca-certificates/ca-certificates.nm
+++ b/ca-certificates/ca-certificates.nm
@@ -5,7 +5,7 @@
 
 name       = ca-certificates
 version    = 2022.12
-release    = 2
+release    = 3
 
 groups     = System/Base
 url        = https://www.mozilla.org/
@@ -25,7 +25,7 @@ build
 
 	requires
 		openssl
-		p11-kit
+		p11-kit >= 0.25
 		python3
 	end
 
@@ -60,9 +60,11 @@ build
 		EOF
 		) > ca-bundle.trust.crt
 
+		mkdir -pv /etc/pki/ca-trust/source
+
 		# Collect all certs for p11-kit
 		for p in certs/*.tmp-p11-kit; do
-			cat "${p}" >> ca-bundle.trust.p11-kit
+			cat "${p}" >> /etc/pki/ca-trust/source/ca-bundle.trust.p11-kit
 		done
 
 		trust extract \
diff --git a/p11-kit/p11-kit.nm b/p11-kit/p11-kit.nm
index 5470a6136..00afe62d0 100644
--- a/p11-kit/p11-kit.nm
+++ b/p11-kit/p11-kit.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = p11-kit
-version    = 0.24.1
+version    = 0.25.0
 release    = 1
 
 groups     = System/Libraries
@@ -35,7 +35,8 @@ build
 	end
 
 	build
-		%{meson}
+		%{meson} \
+			-D trust_paths=/etc/pki/ca-trust/source
 		%{meson_build}
 	end
 


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