diff --git a/SPECS/ca-certificates/ca-certificates.spec b/SPECS/ca-certificates/ca-certificates.spec index b358279661e..a134d7fa513 100644 --- a/SPECS/ca-certificates/ca-certificates.spec +++ b/SPECS/ca-certificates/ca-certificates.spec @@ -74,7 +74,7 @@ Name: ca-certificates # (but these files might have not yet been released). Version: 20200720 -Release: 8%{?dist} +Release: 9%{?dist} License: MPLv2.0 URL: https://hg.mozilla.org Group: System Environment/Security @@ -198,7 +198,7 @@ cp -p %{SOURCE20} . %convert_certdata %{SOURCE0} %convert_certdata %{SOURCE21} -%convert_certdata %{SOURCE22} +%convert_certdata %{SOURCE23} #manpage cp %{SOURCE10} %{name}/update-ca-trust.8.txt @@ -250,7 +250,7 @@ install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{catrustdir}/ca-legacy.conf %install_bundles %{SOURCE21} %{p11_format_base_bundle} %{legacy_default_base_bundle} %{legacy_disable_base_bundle} # Microsoft certs -%install_bundles %{SOURCE22} %{p11_format_microsoft_bundle} %{legacy_default_microsoft_bundle} %{legacy_disable_microsoft_bundle} +%install_bundles %{SOURCE23} %{p11_format_microsoft_bundle} %{legacy_default_microsoft_bundle} %{legacy_disable_microsoft_bundle} # TODO: consider to dynamically create the update-ca-trust script from within # this .spec file, in order to have the output file+directory names at once place only. @@ -425,6 +425,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem} %{_bindir}/bundle2pem.sh %changelog +* Wed Oct 21 2020 Pawel Winogrodzki - 20200720-9 +- Switching to the correct source for the Microsoft bundle. + * Mon Sep 13 2020 Pawel Winogrodzki - 20200720-8 - Aligning 'nssckbi.h' with the used 'certdata.txt' version for the Mozilla bundle. diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 3fcdf9ba5c4..011678da3c0 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -161,6 +161,6 @@ libffi-3.2.1-12.cm1.aarch64.rpm libtasn1-4.14-2.cm1.aarch64.rpm p11-kit-0.23.16.1-2.cm1.aarch64.rpm p11-kit-trust-0.23.16.1-2.cm1.aarch64.rpm -ca-certificates-shared-20200720-8.cm1.noarch.rpm -ca-certificates-tools-20200720-8.cm1.noarch.rpm -ca-certificates-base-20200720-8.cm1.noarch.rpm +ca-certificates-shared-20200720-9.cm1.noarch.rpm +ca-certificates-tools-20200720-9.cm1.noarch.rpm +ca-certificates-base-20200720-9.cm1.noarch.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 849d7231a45..17b359b338e 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -161,6 +161,6 @@ libffi-3.2.1-12.cm1.x86_64.rpm libtasn1-4.14-2.cm1.x86_64.rpm p11-kit-0.23.16.1-2.cm1.x86_64.rpm p11-kit-trust-0.23.16.1-2.cm1.x86_64.rpm -ca-certificates-shared-20200720-8.cm1.noarch.rpm -ca-certificates-tools-20200720-8.cm1.noarch.rpm -ca-certificates-base-20200720-8.cm1.noarch.rpm +ca-certificates-shared-20200720-9.cm1.noarch.rpm +ca-certificates-tools-20200720-9.cm1.noarch.rpm +ca-certificates-base-20200720-9.cm1.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index c0c6c23b58b..7488f7ef0c3 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -17,12 +17,12 @@ bzip2-1.0.6-15.cm1.aarch64.rpm bzip2-debuginfo-1.0.6-15.cm1.aarch64.rpm bzip2-devel-1.0.6-15.cm1.aarch64.rpm bzip2-libs-1.0.6-15.cm1.aarch64.rpm -ca-certificates-20200720-8.cm1.noarch.rpm -ca-certificates-base-20200720-8.cm1.noarch.rpm -ca-certificates-legacy-20200720-8.cm1.noarch.rpm -ca-certificates-microsoft-20200720-8.cm1.noarch.rpm -ca-certificates-shared-20200720-8.cm1.noarch.rpm -ca-certificates-tools-20200720-8.cm1.noarch.rpm +ca-certificates-20200720-9.cm1.noarch.rpm +ca-certificates-base-20200720-9.cm1.noarch.rpm +ca-certificates-legacy-20200720-9.cm1.noarch.rpm +ca-certificates-microsoft-20200720-9.cm1.noarch.rpm +ca-certificates-shared-20200720-9.cm1.noarch.rpm +ca-certificates-tools-20200720-9.cm1.noarch.rpm check-0.12.0-4.cm1.aarch64.rpm check-debuginfo-0.12.0-4.cm1.aarch64.rpm cmake-3.17.3-2.cm1.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 6801469d29a..9922676ce1c 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -17,12 +17,12 @@ bzip2-1.0.6-15.cm1.x86_64.rpm bzip2-debuginfo-1.0.6-15.cm1.x86_64.rpm bzip2-devel-1.0.6-15.cm1.x86_64.rpm bzip2-libs-1.0.6-15.cm1.x86_64.rpm -ca-certificates-20200720-8.cm1.noarch.rpm -ca-certificates-base-20200720-8.cm1.noarch.rpm -ca-certificates-legacy-20200720-8.cm1.noarch.rpm -ca-certificates-microsoft-20200720-8.cm1.noarch.rpm -ca-certificates-shared-20200720-8.cm1.noarch.rpm -ca-certificates-tools-20200720-8.cm1.noarch.rpm +ca-certificates-20200720-9.cm1.noarch.rpm +ca-certificates-base-20200720-9.cm1.noarch.rpm +ca-certificates-legacy-20200720-9.cm1.noarch.rpm +ca-certificates-microsoft-20200720-9.cm1.noarch.rpm +ca-certificates-shared-20200720-9.cm1.noarch.rpm +ca-certificates-tools-20200720-9.cm1.noarch.rpm check-0.12.0-4.cm1.x86_64.rpm check-debuginfo-0.12.0-4.cm1.x86_64.rpm cmake-3.17.3-2.cm1.x86_64.rpm