Skip to content
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

Jump to bottom

Updated sources paths for ca-certificates. #5121

Merged
merged 5 commits into from
Mar 20, 2023
Merged

Updated sources paths for ca-certificates. #5121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0686e56
Updating sources paths for 'ca-certificates'.
PawelWMS Mar 18, 2023
a8d978d
Updating manifests.
PawelWMS Mar 18, 2023
bfba766
Fixing signatures.
PawelWMS Mar 18, 2023
3f05e40
Simplifying changes.
PawelWMS Mar 18, 2023
af8bea4
Fixing build.
PawelWMS Mar 18, 2023
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
13 changes: 11 additions & 2 deletions 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: 10%{?dist}
Release: 11%{?dist}
PawelWMS marked this conversation as resolved.
Show resolved Hide resolved
License: MPLv2.0
Vendor: Microsoft Corporation
Distribution: Mariner
Expand Down Expand Up @@ -180,7 +180,7 @@ install -p -m 644 %{SOURCE16} %{buildroot}%{catrustdir}/extracted/pem/README
install -p -m 644 %{SOURCE17} %{buildroot}%{catrustdir}/extracted/edk2/README
install -p -m 644 %{SOURCE18} %{buildroot}%{catrustdir}/source/README

# base certs
# Base certs
%install_bundles %{SOURCE21} %{p11_format_base_bundle}

# Microsoft certs
Expand Down Expand Up @@ -224,6 +224,10 @@ ln -s %{catrustdir}/extracted/openssl/%{openssl_format_trust_bundle} \
ln -s %{catrustdir}/extracted/%{java_bundle} \
%{buildroot}%{pkidir}/%{java_bundle}

# Supporting p11-kit's directory re-name in version 0.24.0.
ln -s blacklist %{buildroot}%{_datadir}/pki/ca-trust-source/blocklist
ln -s blacklist %{buildroot}%{catrustdir}/source/blocklist

%post
%{refresh_bundles}

Expand Down Expand Up @@ -270,8 +274,10 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
%{pkidir}/%{java_bundle}

# symlink directory
%{_datadir}/pki/ca-trust-source/blocklist
%{_sysconfdir}/ssl/certs
%{_libdir}/ssl/certs
%{catrustdir}/source/blocklist

# README files
%{_datadir}/pki/ca-trust-source/README
Expand Down Expand Up @@ -318,6 +324,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
%{_bindir}/bundle2pem.sh

%changelog
* Fri Mar 17 2023 Pawel Winogrodzki <[email protected]> - 1:2.0.0-11
- Adding support for p11-kit's 0.24.0+ source certificates paths.

* Thu Feb 23 2023 Pawel Winogrodzki <[email protected]> - 2.0.0-10
- Adding Microsoft-owned root CAs to the base bundle.

Expand Down
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: 10%{?dist}
Release: 11%{?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
* Fri Mar 17 2023 Pawel Winogrodzki <[email protected]> - 1:2.0.0-11
- Making 'Release' match with 'ca-certificates'.

* Thu Feb 23 2023 Pawel Winogrodzki <[email protected]> - 1:2.0.0-10
- 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: 10%{?dist}
Release: 11%{?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
* Fri Mar 17 2023 Pawel Winogrodzki <[email protected]> - 1:2.0.0-11
- Making 'Release' match with 'ca-certificates'.

* Thu Feb 23 2023 Pawel Winogrodzki <[email protected]> - 1:2.0.0-10
- 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 @@ -228,10 +228,10 @@ libffi-devel-3.4.2-2.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-10.cm2.noarch.rpm
ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
ca-certificates-base-2.0.0-10.cm2.noarch.rpm
ca-certificates-2.0.0-10.cm2.noarch.rpm
ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
ca-certificates-base-2.0.0-11.cm2.noarch.rpm
ca-certificates-2.0.0-11.cm2.noarch.rpm
dwz-0.14-1.cm2.aarch64.rpm
unzip-6.0-20.cm2.aarch64.rpm
python3-3.9.14-6.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 @@ -228,10 +228,10 @@ libffi-devel-3.4.2-2.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-10.cm2.noarch.rpm
ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
ca-certificates-base-2.0.0-10.cm2.noarch.rpm
ca-certificates-2.0.0-10.cm2.noarch.rpm
ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
ca-certificates-base-2.0.0-11.cm2.noarch.rpm
ca-certificates-2.0.0-11.cm2.noarch.rpm
dwz-0.14-1.cm2.x86_64.rpm
unzip-6.0-20.cm2.x86_64.rpm
python3-3.9.14-6.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-10.cm2.noarch.rpm
ca-certificates-base-2.0.0-10.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-10.cm2.noarch.rpm
ca-certificates-shared-2.0.0-10.cm2.noarch.rpm
ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
ca-certificates-2.0.0-11.cm2.noarch.rpm
ca-certificates-base-2.0.0-11.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-11.cm2.noarch.rpm
ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
ccache-4.6-2.cm2.aarch64.rpm
ccache-debuginfo-4.6-2.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 @@ -18,11 +18,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-10.cm2.noarch.rpm
ca-certificates-base-2.0.0-10.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-10.cm2.noarch.rpm
ca-certificates-shared-2.0.0-10.cm2.noarch.rpm
ca-certificates-tools-2.0.0-10.cm2.noarch.rpm
ca-certificates-2.0.0-11.cm2.noarch.rpm
ca-certificates-base-2.0.0-11.cm2.noarch.rpm
ca-certificates-legacy-2.0.0-11.cm2.noarch.rpm
ca-certificates-shared-2.0.0-11.cm2.noarch.rpm
ca-certificates-tools-2.0.0-11.cm2.noarch.rpm
ccache-4.6-2.cm2.x86_64.rpm
ccache-debuginfo-4.6-2.cm2.x86_64.rpm
check-0.15.2-1.cm2.x86_64.rpm
Expand Down