MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 12:59:02 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ca-certificates: upgrade 20241223 -> 20250419

Browse Source 
0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch
0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
refreshed for 20250419

0002-sbin-update-ca-certificates-add-a-sysroot-option.patch
removed since it's included in 20250419

(From OE-Core rev: e39cc1fb7234bf2b37856296d3c0d10ddf8cae64)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu 2025-05-12 17:02:50 +08:00 committed by Richard Purdie
parent b2483c9111
commit 890c360c55
4 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-support/ca-certificates/ca-certificates/0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch
View File

@ -1,4 +1,4 @@
From 630736f427c0a1bd0be0b5a2f6d51d63b2c4c9fd Mon Sep 17 00:00:00 2001
From 743774cd53ed1c45bb660eddacf6dadb5ee3e145 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 18 Oct 2021 12:05:49 +0200
Subject: [PATCH] Revert "mozilla/certdata2pem.py: print a warning for expired
@ -16,10 +16,10 @@ Signed-off-by: Alexander Kanavin <alex@linutronix.de>
3 files changed, 1 insertion(+), 13 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 52d41ca..bdb2c8a 100644
index dbe3e9c..496e05d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -138,7 +138,6 @@ ca-certificates (20211004) unstable; urgency=low
@@ -156,7 +156,6 @@ ca-certificates (20211004) unstable; urgency=low
- "Trustis FPS Root CA"
- "Staat der Nederlanden Root CA - G3"
* Blacklist expired root certificate "DST Root CA X3" (closes: #995432)

6
meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch
View File

@ -1,4 +1,4 @@
From 348163df412e53b1b7ec3e81ae5f22caa0227c37 Mon Sep 17 00:00:00 2001
From 63086d41f76b1c3357e23c6509df72d3f75af20c Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Mon, 6 Jul 2015 15:19:41 +0100
Subject: [PATCH] ca-certificates: remove Debianism in run-parts invocation
@ -22,10 +22,10 @@ Signed-off-by: Maciej Borzecki <maciej.borzecki@rndity.com>
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index 36cdd9a..2d3e1fe 100755
index 91d8024..1e737b9 100755
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -202,9 +202,7 @@ if [ -d "$HOOKSDIR" ]
@@ -210,9 +210,7 @@ if [ -d "$HOOKSDIR" ]
then
echo "Running hooks in $HOOKSDIR..."

36
meta/recipes-support/ca-certificates/ca-certificates/0002-sbin-update-ca-certificates-add-a-sysroot-option.patch
View File

@ -1,36 +0,0 @@
From d6bb773745c2e95fd1a414e916fbed64e0d8df66 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
Date: Mon, 31 Mar 2025 17:42:25 +0200
Subject: [PATCH] sbin/update-ca-certificates: add a --sysroot option
This allows using the script in cross-compilation environments
where the script needs to prefix the sysroot to every other
directory it operates on. There are individual options
to set those directories, but using a common prefix option
instead is a lot less clutter and more robust.
Upstream-Status: Submitted [https://salsa.debian.org/debian/ca-certificates/-/merge_requests/13]
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
sbin/update-ca-certificates | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates
index 4bb77a0..1e737b9 100755
--- a/sbin/update-ca-certificates
+++ b/sbin/update-ca-certificates
@@ -59,6 +59,14 @@ do
--hooksdir)
shift
HOOKSDIR="$1";;
+ --sysroot)
+ shift
+ SYSROOT="$1"
+ CERTSCONF="$1/${CERTSCONF}"
+ CERTSDIR="$1/${CERTSDIR}"
+ LOCALCERTSDIR="$1/${LOCALCERTSDIR}"
+ ETCCERTSDIR="$1/${ETCCERTSDIR}"
+ HOOKSDIR="$1/${HOOKSDIR}";;
--help|-h|*)
echo "$0: [--verbose] [--fresh]"
exit;;

3
meta/recipes-support/ca-certificates/ca-certificates_20241223.bb → meta/recipes-support/ca-certificates/ca-certificates_20250419.bb
View File

@ -14,10 +14,9 @@ DEPENDS:class-nativesdk = "openssl-native"
# Need rehash from openssl and run-parts from debianutils
PACKAGE_WRITE_DEPS += "openssl-native debianutils-native"
SRC_URI[sha256sum] = "dd8286d0a9dd35c756fea5f1df3fed1510fb891f376903891b003cd9b1ad7e03"
SRC_URI[sha256sum] = "33b44ef78653ecd3f0f2f13e5bba6be466be2e7da72182f737912b81798ba5d2"
SRC_URI = "${DEBIAN_MIRROR}/main/c/ca-certificates/${BPN}_${PV}.tar.xz \
file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \
file://0002-sbin-update-ca-certificates-add-a-sysroot-option.patch \
file://0003-update-ca-certificates-use-relative-symlinks-from-ET.patch \
file://0001-Revert-mozilla-certdata2pem.py-print-a-warning-for-e.patch \
"