[AUTOUPGRADE-CORE] Upgrade ca-certificates Msft cert change (#7499)

2024-01-26 16:02:47 -08:00 · 2024-01-26 16:02:47 -08:00 · 971e0e8a4d
--- a/SPECS/ca-certificates/ca-certificates.signatures.json
+++ b/SPECS/ca-certificates/ca-certificates.signatures.json
@ -1,21 +1,21 @@
 {
- "Signatures": {
-  "LICENSE": "fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85",
-  "README.edk2": "757c28eddb0634b74e6482d16324193be27eee41864c1f96c447020dae14b44f",
-  "README.etc": "6c7b9287c41c171c64b358fc7331b8a9ae969fc2d00d997d88bcbf4da0de598a",
-  "README.extr": "146ff96c60a8ee32bbcf2da59d624d6ecfbab7ef7442529d46d8d63064d8ca58",
-  "README.java": "7bb8781320fb3ff84e76c7e7e4a9c3813879c4f1943710a3b0140b31efacfd32",
-  "README.openssl": "6c812d1ec8ce5bde2216cc42be33021d6345fbea05c14f50c52191a38c175ea9",
-  "README.pem": "27362e773c8b6bb065a455a66badb05e2652720bab8ade9ab91f0404cf827dab",
-  "README.src": "86184318d451bec55d70c84e618cbfe10c8adb7dc893964ce4aaecff99d83433",
-  "README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
-  "bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
-  "certdata.base.txt": "771a6c9995ea00bb4ce50fd842a252454fe9b26acad8b0568a1055207442db57",
-  "certdata.microsoft.txt": "dc3a69f59f98b82618490335e303ed960d706910a62f7c116a7e69ce401c6293",
-  "certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
-  "pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",
-  "trust-fixes": "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b",
-  "update-ca-trust": "0c0c0600587db7f59ba5e399666152ea6de6059f37408f3946c43438d607efdd",
-  "update-ca-trust.8.txt": "2470551bd11cc393ddf4cf43cf101c29d9f308c15469ee5e78908cfcf2437579"
- }
-}
+  "Signatures": {
+    "LICENSE": "fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85",
+    "README.edk2": "757c28eddb0634b74e6482d16324193be27eee41864c1f96c447020dae14b44f",
+    "README.etc": "6c7b9287c41c171c64b358fc7331b8a9ae969fc2d00d997d88bcbf4da0de598a",
+    "README.extr": "146ff96c60a8ee32bbcf2da59d624d6ecfbab7ef7442529d46d8d63064d8ca58",
+    "README.java": "7bb8781320fb3ff84e76c7e7e4a9c3813879c4f1943710a3b0140b31efacfd32",
+    "README.openssl": "6c812d1ec8ce5bde2216cc42be33021d6345fbea05c14f50c52191a38c175ea9",
+    "README.pem": "27362e773c8b6bb065a455a66badb05e2652720bab8ade9ab91f0404cf827dab",
+    "README.src": "86184318d451bec55d70c84e618cbfe10c8adb7dc893964ce4aaecff99d83433",
+    "README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
+    "bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
+    "certdata.base.txt": "771a6c9995ea00bb4ce50fd842a252454fe9b26acad8b0568a1055207442db57",
+    "certdata.microsoft.txt": "8eea04b31e73f9e64040a2d905b02f05dc4c6f2e9964919f5921a31c1ace0d02",
+    "certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
+    "pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",
+    "trust-fixes": "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b",
+    "update-ca-trust": "0c0c0600587db7f59ba5e399666152ea6de6059f37408f3946c43438d607efdd",
+    "update-ca-trust.8.txt": "2470551bd11cc393ddf4cf43cf101c29d9f308c15469ee5e78908cfcf2437579"
+  }
+}
--- a/SPECS/ca-certificates/ca-certificates.spec
+++ b/SPECS/ca-certificates/ca-certificates.spec
@ -45,7 +45,7 @@ Name:           ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well.
 Epoch:          1
 Version:        2.0.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        MPLv2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -324,6 +324,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
 %{_bindir}/bundle2pem.sh

 %changelog
+* Fri Jan 26 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-15
+- Updating Microsoft trusted root CAs.
+
 * Tue Dec 05 2023 Pawel Winogrodzki <pawelwi@microsoft.com> - 1:2.0.0-14
 - Extending base set of certificates.

--- a/SPECS/ca-certificates/certdata.microsoft.txt
+++ b/SPECS/ca-certificates/certdata.microsoft.txt
--- a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
+++ b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates-base
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -46,6 +46,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts

 %changelog
+* Fri Jan 26 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-15
+- Making 'Release' match with 'ca-certificates'
+
 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1:2.0.0-14
 - Making 'Release' match with 'ca-certificates'.

--- a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
+++ b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        2.0.0
-Release:        14%{?dist}
+Release:        15%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@ -49,6 +49,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts

 %changelog
+* Fri Jan 26 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-15
+- Making 'Release' match with 'ca-certificates'
+
 * Tue Dec 05 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 1:2.0.0-14
 - Making 'Release' match with 'ca-certificates'.

--- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt
@ -231,10 +231,10 @@ libffi-devel-3.4.2-3.cm2.aarch64.rpm
 libtasn1-4.19.0-1.cm2.aarch64.rpm
 p11-kit-0.24.1-1.cm2.aarch64.rpm
 p11-kit-trust-0.24.1-1.cm2.aarch64.rpm
-ca-certificates-shared-2.0.0-14.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-14.cm2.noarch.rpm
-ca-certificates-base-2.0.0-14.cm2.noarch.rpm
-ca-certificates-2.0.0-14.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-15.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-15.cm2.noarch.rpm
+ca-certificates-base-2.0.0-15.cm2.noarch.rpm
+ca-certificates-2.0.0-15.cm2.noarch.rpm
 dwz-0.14-2.cm2.aarch64.rpm
 unzip-6.0-20.cm2.aarch64.rpm
 python3-3.9.14-8.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
+++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt
@ -231,10 +231,10 @@ libffi-devel-3.4.2-3.cm2.x86_64.rpm
 libtasn1-4.19.0-1.cm2.x86_64.rpm
 p11-kit-0.24.1-1.cm2.x86_64.rpm
 p11-kit-trust-0.24.1-1.cm2.x86_64.rpm
-ca-certificates-shared-2.0.0-14.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-14.cm2.noarch.rpm
-ca-certificates-base-2.0.0-14.cm2.noarch.rpm
-ca-certificates-2.0.0-14.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-15.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-15.cm2.noarch.rpm
+ca-certificates-base-2.0.0-15.cm2.noarch.rpm
+ca-certificates-2.0.0-15.cm2.noarch.rpm
 dwz-0.14-2.cm2.x86_64.rpm
 unzip-6.0-20.cm2.x86_64.rpm
 python3-3.9.14-8.cm2.x86_64.rpm
--- a/toolkit/resources/manifests/package/toolchain_aarch64.txt
+++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt
@ -18,11 +18,11 @@ bzip2-1.0.8-1.cm2.aarch64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.aarch64.rpm
 bzip2-devel-1.0.8-1.cm2.aarch64.rpm
 bzip2-libs-1.0.8-1.cm2.aarch64.rpm
-ca-certificates-2.0.0-14.cm2.noarch.rpm
-ca-certificates-base-2.0.0-14.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-14.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-14.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-14.cm2.noarch.rpm
+ca-certificates-2.0.0-15.cm2.noarch.rpm
+ca-certificates-base-2.0.0-15.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-15.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-15.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-15.cm2.noarch.rpm
 ccache-4.8-1.cm2.aarch64.rpm
 ccache-debuginfo-4.8-1.cm2.aarch64.rpm
 check-0.15.2-1.cm2.aarch64.rpm
--- a/toolkit/resources/manifests/package/toolchain_x86_64.txt
+++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt
@ -19,11 +19,11 @@ bzip2-1.0.8-1.cm2.x86_64.rpm
 bzip2-debuginfo-1.0.8-1.cm2.x86_64.rpm
 bzip2-devel-1.0.8-1.cm2.x86_64.rpm
 bzip2-libs-1.0.8-1.cm2.x86_64.rpm
-ca-certificates-2.0.0-14.cm2.noarch.rpm
-ca-certificates-base-2.0.0-14.cm2.noarch.rpm
-ca-certificates-legacy-2.0.0-14.cm2.noarch.rpm
-ca-certificates-shared-2.0.0-14.cm2.noarch.rpm
-ca-certificates-tools-2.0.0-14.cm2.noarch.rpm
+ca-certificates-2.0.0-15.cm2.noarch.rpm
+ca-certificates-base-2.0.0-15.cm2.noarch.rpm
+ca-certificates-legacy-2.0.0-15.cm2.noarch.rpm
+ca-certificates-shared-2.0.0-15.cm2.noarch.rpm
+ca-certificates-tools-2.0.0-15.cm2.noarch.rpm
 ccache-4.8-1.cm2.x86_64.rpm
 ccache-debuginfo-4.8-1.cm2.x86_64.rpm
 check-0.15.2-1.cm2.x86_64.rpm