Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/ca-certificates.git#9bd23da27ffac43abfb42ae5c982d2320d6cd8fd
This commit is contained in:
parent
cbe6d70855
commit
8eeccfe166
@ -38,7 +38,7 @@ Name: ca-certificates
|
|||||||
Version: 2020.2.41
|
Version: 2020.2.41
|
||||||
# for Rawhide, please always use release >= 2
|
# for Rawhide, please always use release >= 2
|
||||||
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
|
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
|
||||||
Release: 4%{?dist}
|
Release: 5%{?dist}
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
|
|
||||||
URL: https://fedoraproject.org/wiki/CA-Certificates
|
URL: https://fedoraproject.org/wiki/CA-Certificates
|
||||||
@ -241,9 +241,15 @@ chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/%{java_bundle}
|
|||||||
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2/cacerts.bin
|
touch $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2/cacerts.bin
|
||||||
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2/cacerts.bin
|
chmod 444 $RPM_BUILD_ROOT%{catrustdir}/extracted/edk2/cacerts.bin
|
||||||
|
|
||||||
# /etc/ssl/certs symlink for 3rd-party tools
|
# /etc/ssl symlinks for 3rd-party tools and cross-distro compatibility
|
||||||
ln -s ../pki/tls/certs \
|
ln -s /etc/pki/tls/certs \
|
||||||
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs
|
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs
|
||||||
|
ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \
|
||||||
|
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/cert.pem
|
||||||
|
ln -s /etc/pki/tls/openssl.cnf \
|
||||||
|
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/openssl.cnf
|
||||||
|
ln -s /etc/pki/tls/ct_log_list.cnf \
|
||||||
|
$RPM_BUILD_ROOT%{_sysconfdir}/ssl/ct_log_list.cnf
|
||||||
# legacy filenames
|
# legacy filenames
|
||||||
ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \
|
ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \
|
||||||
$RPM_BUILD_ROOT%{pkidir}/tls/cert.pem
|
$RPM_BUILD_ROOT%{pkidir}/tls/cert.pem
|
||||||
@ -364,8 +370,11 @@ fi
|
|||||||
%{pkidir}/tls/certs/%{classic_tls_bundle}
|
%{pkidir}/tls/certs/%{classic_tls_bundle}
|
||||||
%{pkidir}/tls/certs/%{openssl_format_trust_bundle}
|
%{pkidir}/tls/certs/%{openssl_format_trust_bundle}
|
||||||
%{pkidir}/%{java_bundle}
|
%{pkidir}/%{java_bundle}
|
||||||
# symlink directory
|
# symlinks to cross-distro compatibility files and directory
|
||||||
%{_sysconfdir}/ssl/certs
|
%{_sysconfdir}/ssl/certs
|
||||||
|
%{_sysconfdir}/ssl/cert.pem
|
||||||
|
%{_sysconfdir}/ssl/openssl.cnf
|
||||||
|
%{_sysconfdir}/ssl/ct_log_list.cnf
|
||||||
|
|
||||||
# master bundle file with trust
|
# master bundle file with trust
|
||||||
%{_datadir}/pki/ca-trust-source/%{p11_format_bundle}
|
%{_datadir}/pki/ca-trust-source/%{p11_format_bundle}
|
||||||
@ -386,6 +395,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 09 2020 Christian Heimes <cheimes@redhat.com> - 2020.2.41-5
|
||||||
|
- Add cross-distro compatibility symlinks to /etc/ssl (rhbz#1895619)
|
||||||
|
|
||||||
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.2.41-4
|
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020.2.41-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user