Skip to content

Commit 67ad2f8

Browse files
CBL-Mariner-BotCBL-Mariner-Bot
authored
[AUTOUPGRADE-CORE] Upgrade ca-certificates Msft cert change (microsoft#14631)
1 parent e264c73 commit 67ad2f8

File tree

9 files changed

+2419
-24
lines changed

9 files changed

+2419
-24
lines changed

‎SPECS/ca-certificates/ca-certificates.signatures.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
1212
"bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
1313
"certdata.base.txt": "8896c309aef808c7769dc630abee75adbb6bfb5c8a961461b51f845a1740ea66",
14-
"certdata.distrusted.txt": "93aebf0f1e5253ed91fe269f7128fdb8b20630ef19558f629c79a8b7eb0ba30d",
14+
"certdata.distrusted.txt": "536b1235c5b0b3c82ddf303eca696ec164cdb21899cd9e5313d8b29ce9cdc268",
1515
"certdata.microsoft.txt": "9c802e9f5a0bd90ba51a4f04ec1d2304a11d1cf321e4e5bdff97459b46ba3e02",
1616
"certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
1717
"pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",

‎SPECS/ca-certificates/ca-certificates.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Name: ca-certificates
4747
# When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well.
4848
Epoch: 1
4949
Version: 2.0.0
50-
Release: 21%{?dist}
50+
Release: 22%{?dist}
5151
License: MPLv2.0
5252
Vendor: Microsoft Corporation
5353
Distribution: Mariner
@@ -340,6 +340,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
340340
%{_bindir}/bundle2pem.sh
341341

342342
%changelog
343+
* Fri Sep 05 2025 CBL-Mariner Servicing Account <[email protected]> - 1:2.0.0-22
344+
- Updating Microsoft trusted root CAs.
345+
343346
* Tue Sep 02 2025 Pawel Winogrodzki <[email protected]> - 1:2.0.0-21
344347
- Adding 2 new base CAs: 'Microsoft TLS RSA Root G2' and 'Microsoft TLS ECC Root G2'.
345348

‎SPECS/ca-certificates/certdata.distrusted.txt‎

Lines changed: 2388 additions & 2 deletions
Large diffs are not rendered by default.

‎SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Name: prebuilt-ca-certificates-base
33
# When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
44
Epoch: 1
55
Version: 2.0.0
6-
Release: 21%{?dist}
6+
Release: 22%{?dist}
77
License: MIT
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -46,6 +46,9 @@ find %{buildroot} -name README -delete
4646
%{_sysconfdir}/pki/java/cacerts
4747

4848
%changelog
49+
* Fri Sep 05 2025 CBL-Mariner Servicing Account <[email protected]> - 1:2.0.0-22
50+
- Making 'Release' match with 'ca-certificates'
51+
4952
* Tue Sep 02 2025 Pawel Winogrodzki <[email protected]> - 1:2.0.0-21
5053
- Making 'Release' match with 'ca-certificates'
5154

‎SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Name: prebuilt-ca-certificates
33
# When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
44
Epoch: 1
55
Version: 2.0.0
6-
Release: 21%{?dist}
6+
Release: 22%{?dist}
77
License: MIT
88
Vendor: Microsoft Corporation
99
Distribution: Mariner
@@ -49,6 +49,9 @@ find %{buildroot} -name README -delete
4949
%{_sysconfdir}/pki/java/cacerts
5050

5151
%changelog
52+
* Fri Sep 05 2025 CBL-Mariner Servicing Account <[email protected]> - 1:2.0.0-22
53+
- Making 'Release' match with 'ca-certificates'
54+
5255
* Tue Sep 02 2025 Pawel Winogrodzki <[email protected]> - 1:2.0.0-21
5356
- Making 'Release' match with 'ca-certificates'
5457

‎toolkit/resources/manifests/package/pkggen_core_aarch64.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ libffi-devel-3.4.2-3.cm2.aarch64.rpm
231231
libtasn1-4.19.0-2.cm2.aarch64.rpm
232232
p11-kit-0.24.1-1.cm2.aarch64.rpm
233233
p11-kit-trust-0.24.1-1.cm2.aarch64.rpm
234-
ca-certificates-shared-2.0.0-21.cm2.noarch.rpm
235-
ca-certificates-tools-2.0.0-21.cm2.noarch.rpm
236-
ca-certificates-base-2.0.0-21.cm2.noarch.rpm
237-
ca-certificates-2.0.0-21.cm2.noarch.rpm
234+
ca-certificates-shared-2.0.0-22.cm2.noarch.rpm
235+
ca-certificates-tools-2.0.0-22.cm2.noarch.rpm
236+
ca-certificates-base-2.0.0-22.cm2.noarch.rpm
237+
ca-certificates-2.0.0-22.cm2.noarch.rpm
238238
dwz-0.14-2.cm2.aarch64.rpm
239239
unzip-6.0-22.cm2.aarch64.rpm
240240
python3-3.9.19-14.cm2.aarch64.rpm

‎toolkit/resources/manifests/package/pkggen_core_x86_64.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@ libffi-devel-3.4.2-3.cm2.x86_64.rpm
231231
libtasn1-4.19.0-2.cm2.x86_64.rpm
232232
p11-kit-0.24.1-1.cm2.x86_64.rpm
233233
p11-kit-trust-0.24.1-1.cm2.x86_64.rpm
234-
ca-certificates-shared-2.0.0-21.cm2.noarch.rpm
235-
ca-certificates-tools-2.0.0-21.cm2.noarch.rpm
236-
ca-certificates-base-2.0.0-21.cm2.noarch.rpm
237-
ca-certificates-2.0.0-21.cm2.noarch.rpm
234+
ca-certificates-shared-2.0.0-22.cm2.noarch.rpm
235+
ca-certificates-tools-2.0.0-22.cm2.noarch.rpm
236+
ca-certificates-base-2.0.0-22.cm2.noarch.rpm
237+
ca-certificates-2.0.0-22.cm2.noarch.rpm
238238
dwz-0.14-2.cm2.x86_64.rpm
239239
unzip-6.0-22.cm2.x86_64.rpm
240240
python3-3.9.19-14.cm2.x86_64.rpm

‎toolkit/resources/manifests/package/toolchain_aarch64.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.aarch64.rpm
1818
bzip2-debuginfo-1.0.8-1.cm2.aarch64.rpm
1919
bzip2-devel-1.0.8-1.cm2.aarch64.rpm
2020
bzip2-libs-1.0.8-1.cm2.aarch64.rpm
21-
ca-certificates-2.0.0-21.cm2.noarch.rpm
22-
ca-certificates-base-2.0.0-21.cm2.noarch.rpm
23-
ca-certificates-legacy-2.0.0-21.cm2.noarch.rpm
24-
ca-certificates-shared-2.0.0-21.cm2.noarch.rpm
25-
ca-certificates-tools-2.0.0-21.cm2.noarch.rpm
21+
ca-certificates-2.0.0-22.cm2.noarch.rpm
22+
ca-certificates-base-2.0.0-22.cm2.noarch.rpm
23+
ca-certificates-legacy-2.0.0-22.cm2.noarch.rpm
24+
ca-certificates-shared-2.0.0-22.cm2.noarch.rpm
25+
ca-certificates-tools-2.0.0-22.cm2.noarch.rpm
2626
ccache-4.8-1.cm2.aarch64.rpm
2727
ccache-debuginfo-4.8-1.cm2.aarch64.rpm
2828
check-0.15.2-1.cm2.aarch64.rpm

‎toolkit/resources/manifests/package/toolchain_x86_64.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ bzip2-1.0.8-1.cm2.x86_64.rpm
1919
bzip2-debuginfo-1.0.8-1.cm2.x86_64.rpm
2020
bzip2-devel-1.0.8-1.cm2.x86_64.rpm
2121
bzip2-libs-1.0.8-1.cm2.x86_64.rpm
22-
ca-certificates-2.0.0-21.cm2.noarch.rpm
23-
ca-certificates-base-2.0.0-21.cm2.noarch.rpm
24-
ca-certificates-legacy-2.0.0-21.cm2.noarch.rpm
25-
ca-certificates-shared-2.0.0-21.cm2.noarch.rpm
26-
ca-certificates-tools-2.0.0-21.cm2.noarch.rpm
22+
ca-certificates-2.0.0-22.cm2.noarch.rpm
23+
ca-certificates-base-2.0.0-22.cm2.noarch.rpm
24+
ca-certificates-legacy-2.0.0-22.cm2.noarch.rpm
25+
ca-certificates-shared-2.0.0-22.cm2.noarch.rpm
26+
ca-certificates-tools-2.0.0-22.cm2.noarch.rpm
2727
ccache-4.8-1.cm2.x86_64.rpm
2828
ccache-debuginfo-4.8-1.cm2.x86_64.rpm
2929
check-0.15.2-1.cm2.x86_64.rpm

0 commit comments

Comments
 (0)