rpms/ca-certificates
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- fix ca-bundle.crt (#575111)

Browse Source
This commit is contained in:
jorton 2010-03-19 14:00:29 +00:00
parent 708646cc46
commit dc70b1f07b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ca-certificates.spec
View File

@ -7,7 +7,7 @@
Summary: The Mozilla CA root certificate bundle Summary: The Mozilla CA root certificate bundle
Name: ca-certificates Name: ca-certificates
Version: 2010 Version: 2010
Release: 3%{?dist} Release: 4%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: http://www.mozilla.org/ URL: http://www.mozilla.org/
@ -85,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT{%{pkidir}/tls/certs,%{pkidir}/java} 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.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 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.crt
touch -r %{SOURCE0} $RPM_BUILD_ROOT%{pkidir}/tls/certs/ca-bundle.trust.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 %{pkidir}/tls/cert.pem
%changelog %changelog
* Fri Mar 19 2010 Joe Orton <jorton@redhat.com> - 2010-4
- fix ca-bundle.crt (#575111)
* Thu Mar 18 2010 Joe Orton <jorton@redhat.com> - 2010-3 * Thu Mar 18 2010 Joe Orton <jorton@redhat.com> - 2010-3
- update to certdata.txt r1.58 - update to certdata.txt r1.58
- add /etc/pki/tls/certs/ca-bundle.trust.crt using 'TRUSTED CERTICATE' format - add /etc/pki/tls/certs/ca-bundle.trust.crt using 'TRUSTED CERTICATE' format

2
certdata2pem.py
View File

@ -160,7 +160,7 @@ for obj in objects:
trustbits.append(t) trustbits.append(t)
if t in openssl_trust: if t in openssl_trust:
openssl_trustflags.append(openssl_trust[t]) openssl_trustflags.append(openssl_trust[t])
f.write("# nss-trust=" + ",".join(trustbits) + "\n") f.write("# trust=" + " ".join(trustbits) + "\n")
if openssl_trustflags: if openssl_trustflags:
f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n") f.write("# openssl-trust=" + " ".join(openssl_trustflags) + "\n")
f.write("-----BEGIN CERTIFICATE-----\n") f.write("-----BEGIN CERTIFICATE-----\n")