diff --git a/SOURCES/README.pem b/SOURCES/README.pem index 4d6f2dd..bf22a63 100644 --- a/SOURCES/README.pem +++ b/SOURCES/README.pem @@ -5,7 +5,7 @@ based on the information found in the directories. All files are in the BEGIN/END CERTIFICATE file format, -as decribed in the x509(1) manual page. +as described in the x509(1) manual page. Distrust information cannot be represented in this file format, and distrusted certificates are missing from these files. diff --git a/SOURCES/ca-legacy b/SOURCES/ca-legacy index d63489e..cb164fb 100644 --- a/SOURCES/ca-legacy +++ b/SOURCES/ca-legacy @@ -32,10 +32,10 @@ do_install() is_disabled if [ $? -eq 0 ]; then # found, legacy is disabled - ln -sf $LDISABLE $LLINK + sln $LDISABLE $LLINK else # expression not found, legacy is set to default - ln -sf $LDEFAULT $LLINK + sln $LDEFAULT $LLINK fi } diff --git a/SOURCES/update-ca-trust.8.txt b/SOURCES/update-ca-trust.8.txt index 3a21f87..892b68f 100644 --- a/SOURCES/update-ca-trust.8.txt +++ b/SOURCES/update-ca-trust.8.txt @@ -192,7 +192,7 @@ or distrusted certificates, including the associated trust flags. The directory /etc/pki/ca-trust/extracted/pem/ contains CA certificate bundle files in the simple BEGIN/END CERTIFICATE file format, -as decribed in the x509(1) manual page. +as described in the x509(1) manual page. Distrust information cannot be represented in this file format, and distrusted certificates are missing from these files. File tls-ca-bundle.pem contains CA certificates diff --git a/SPECS/ca-certificates.spec b/SPECS/ca-certificates.spec index 1f68b5d..8b9b5b5 100644 --- a/SPECS/ca-certificates.spec +++ b/SPECS/ca-certificates.spec @@ -40,7 +40,7 @@ Version: 2015.2.6 # On RHEL 7.x, please keep the release version >= 70 # When rebasing on Y-Stream (7.y), use 71, 72, 73, ... # When rebasing on Z-Stream (7.y.z), use 70.0, 70.1, 70.2, ... -Release: 70.1%{?dist} +Release: 73%{?dist} License: Public Domain Group: System Environment/Base @@ -69,8 +69,6 @@ BuildArch: noarch Requires: p11-kit >= 0.17.3 Requires: p11-kit-trust >= 0.17.3 -Requires: coreutils -Requires(post): coreutils BuildRequires: perl BuildRequires: python BuildRequires: openssl @@ -259,18 +257,17 @@ touch $RPM_BUILD_ROOT%{catrustdir}/extracted/openssl/%{trusted_all_bundle} touch $RPM_BUILD_ROOT%{catrustdir}/extracted/%{java_bundle} # /etc/ssl/certs symlink for 3rd-party tools -ln -s ../pki/tls/certs \ - $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs +sln ../pki/tls/certs \ + $RPM_BUILD_ROOT%{_sysconfdir}/ssl/certs # legacy filenames -ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ - $RPM_BUILD_ROOT%{pkidir}/tls/cert.pem -ln -s %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ - $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{classic_tls_bundle} -ln -s %{catrustdir}/extracted/openssl/%{trusted_all_bundle} \ - $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{trusted_all_bundle} -ln -s %{catrustdir}/extracted/%{java_bundle} \ - $RPM_BUILD_ROOT%{pkidir}/%{java_bundle} - +sln %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ + $RPM_BUILD_ROOT%{pkidir}/tls/cert.pem +sln %{catrustdir}/extracted/pem/tls-ca-bundle.pem \ + $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{classic_tls_bundle} +sln %{catrustdir}/extracted/openssl/%{trusted_all_bundle} \ + $RPM_BUILD_ROOT%{pkidir}/tls/certs/%{trusted_all_bundle} +sln %{catrustdir}/extracted/%{java_bundle} \ + $RPM_BUILD_ROOT%{pkidir}/%{java_bundle} %clean rm -rf $RPM_BUILD_ROOT @@ -391,7 +388,13 @@ fi %changelog -* Wed Jan 27 2016 Kai Engert - 2015.2.6-70.1 +* Tue May 10 2016 Kai Engert - 2016.2.6-73 +- Use sln, not ln, to avoid the dependency on coreutils (rhbz#1328586) + +* Mon Apr 25 2016 Kai Engert - 2015.2.6-72 +- Fixed a typo in a manual page (rhbz#1303960) + +* Wed Jan 27 2016 Kai Engert - 2015.2.6-71 - Update to CKBI 2.6 from NSS 3.21 with legacy modifications. * Thu Apr 23 2015 Kai Engert - 2015.2.4-71