Skip to content

[AUTOUPGRADE-CORE] Upgrade ca-certificates Msft cert change #8858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PawelWMS merged 1 commit into from
Apr 22, 2024
Merged

[AUTOUPGRADE-CORE] Upgrade ca-certificates Msft cert change #8858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions SPECS/ca-certificates/ca-certificates.signatures.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
"bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
"certdata.base.txt": "771a6c9995ea00bb4ce50fd842a252454fe9b26acad8b0568a1055207442db57",
"certdata.microsoft.txt": "71599549e0fd94f5afe074ef553cb102d0b38eb94fd8ce11fe9c29c33492ed24",
"certdata.microsoft.txt": "89655788a99b61c94aa18ad060b7e032d3e63b9db1417b1496e767662126c75a",
"certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
"pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",
"trust-fixes": "01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b",
"update-ca-trust": "0c0c0600587db7f59ba5e399666152ea6de6059f37408f3946c43438d607efdd",
"update-ca-trust.8.txt": "2470551bd11cc393ddf4cf43cf101c29d9f308c15469ee5e78908cfcf2437579"
}
}
}
5 changes: 4 additions & 1 deletion SPECS/ca-certificates/ca-certificates.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 16%{?dist}
Release: 17%{?dist}
License: MPLv2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -324,6 +324,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
%{_bindir}/bundle2pem.sh

%changelog
* Mon Apr 22 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-17
- Updating Microsoft trusted root CAs.

* Fri Mar 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-16
- Updating Microsoft trusted root CAs.

Expand Down
579 changes: 578 additions & 1 deletion SPECS/ca-certificates/certdata.microsoft.txt
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 16%{?dist}
Release: 17%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -46,6 +46,9 @@ find %{buildroot} -name README -delete
%{_sysconfdir}/pki/java/cacerts

%changelog
* Mon Apr 22 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-17
- Making 'Release' match with 'ca-certificates'

* Fri Mar 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-16
- Making 'Release' match with 'ca-certificates'

Expand Down
5 changes: 4 additions & 1 deletion SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 16%{?dist}
Release: 17%{?dist}
License: MIT
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -49,6 +49,9 @@ find %{buildroot} -name README -delete
%{_sysconfdir}/pki/java/cacerts

%changelog
* Mon Apr 22 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-17
- Making 'Release' match with 'ca-certificates'

* Fri Mar 29 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.0.0-16
- Making 'Release' match with 'ca-certificates'

Expand Down
8 changes: 4 additions & 4 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-16.cm2.noarch.rpm
ca-certificates-tools-2.0.0-16.cm2.noarch.rpm
ca-certificates-base-2.0.0-16.cm2.noarch.rpm
ca-certificates-2.0.0-16.cm2.noarch.rpm
ca-certificates-shared-2.0.0-17.cm2.noarch.rpm
ca-certificates-tools-2.0.0-17.cm2.noarch.rpm
ca-certificates-base-2.0.0-17.cm2.noarch.rpm
ca-certificates-2.0.0-17.cm2.noarch.rpm
dwz-0.14-2.cm2.aarch64.rpm
unzip-6.0-20.cm2.aarch64.rpm
python3-3.9.19-1.cm2.aarch64.rpm
Expand Down
8 changes: 4 additions & 4 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-16.cm2.noarch.rpm
ca-certificates-tools-2.0.0-16.cm2.noarch.rpm
ca-certificates-base-2.0.0-16.cm2.noarch.rpm
ca-certificates-2.0.0-16.cm2.noarch.rpm
ca-certificates-shared-2.0.0-17.cm2.noarch.rpm
ca-certificates-tools-2.0.0-17.cm2.noarch.rpm
ca-certificates-base-2.0.0-17.cm2.noarch.rpm
ca-certificates-2.0.0-17.cm2.noarch.rpm
dwz-0.14-2.cm2.x86_64.rpm
unzip-6.0-20.cm2.x86_64.rpm
python3-3.9.19-1.cm2.x86_64.rpm
Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-16.cm2.noarch.rpm
ca-certificates-base-2.0.0-16.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-16.cm2.noarch.rpm
ca-certificates-shared-2.0.0-16.cm2.noarch.rpm
ca-certificates-tools-2.0.0-16.cm2.noarch.rpm
ca-certificates-2.0.0-17.cm2.noarch.rpm
ca-certificates-base-2.0.0-17.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-17.cm2.noarch.rpm
ca-certificates-shared-2.0.0-17.cm2.noarch.rpm
ca-certificates-tools-2.0.0-17.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
Expand Down
10 changes: 5 additions & 5 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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-16.cm2.noarch.rpm
ca-certificates-base-2.0.0-16.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-16.cm2.noarch.rpm
ca-certificates-shared-2.0.0-16.cm2.noarch.rpm
ca-certificates-tools-2.0.0-16.cm2.noarch.rpm
ca-certificates-2.0.0-17.cm2.noarch.rpm
ca-certificates-base-2.0.0-17.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-17.cm2.noarch.rpm
ca-certificates-shared-2.0.0-17.cm2.noarch.rpm
ca-certificates-tools-2.0.0-17.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
Expand Down