diff --git a/ca-certificates.spec b/ca-certificates.spec index f66a99d..9dbb8ca 100644 --- a/ca-certificates.spec +++ b/ca-certificates.spec @@ -7,7 +7,7 @@ Summary: The Mozilla CA root certificate bundle Name: ca-certificates Version: 2010 -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: System Environment/Base URL: http://www.mozilla.org/ @@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT{%{pkidir}/tls/certs,%{pkidir}/java} install -p -m 644 %{name}/ca-bundle.crt $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.crt -install -p -m 644 %{name}/ca-bundle.trust.crt $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.crt +install -p -m 644 %{name}/ca-bundle.trust.crt $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.trust.crt ln -s certs/ca-bundle.crt $RPM_BUILD_ROOT%{pkidir}/tls/cert.pem touch -r %{SOURCE0} $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.crt touch -r %{SOURCE0} $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.trust.crt @@ -107,6 +107,9 @@ rm -rf $RPM_BUILD_ROOT %{pkidir}/tls/cert.pem %changelog +* Fri Mar 19 2010 Joe Orton - 2010-4 +- fix ca-bundle.crt (#575111) + * Thu Mar 18 2010 Joe Orton - 2010-3 - update to certdata.txt r1.58 - add /etc/pki/tls/certs/ca-bundle.trust.crt using 'TRUSTED CERTICATE' format diff --git a/certdata2pem.py b/certdata2pem.py index 3a0b8ce..a5c7bdb 100644 --- a/certdata2pem.py +++ b/certdata2pem.py @@ -160,7 +160,7 @@ for obj in objects: trustbits.append(t) if t in openssl_trust: openssl_trustflags.append(openssl_trust[t]) - f.write("# nss-trust=" + ",".join(trustbits) + "\n") + f.write("# trust=" + " ".join(trustbits) + "\n") if openssl_trustflags: f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n") f.write("-----BEGIN CERTIFICATE-----\n")