Skip to content

Commit 622076f

Browse files
Merge branch 'main' of https://github.com/microsoft/CBL-Mariner into mbykhovtsev/aug-release
2 parents 2553e1a + f0d3b57 commit 622076f

17 files changed

+5431
-48
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.

0 commit comments

Comments
 (0)