- added TODO about RSA Security 1024 V3 root CA

[packages/ca-certificates.git] / ca-certificates.spec

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 0474ac7f5344db908e81a109417f3da84e5867a4..838a4689841689bac168bd2728c0d9aebe7a8199 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,10 +1,14 @@
 # TODO
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
+#
+# - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
+#   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#
+#
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
 Version:       20090814
-Release:       1
+Release:       6
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -35,14 +39,27 @@ Source12:   http://www.certum.pl/keys/class3.pem
 # Source12-md5:        07bc97e21da092ba53535c7379e1b58b
 Source13:      http://www.certum.pl/keys/class4.pem
 # Source13-md5:        99ef61d509539af89f1c025b67245965
+Source14:      http://crt.tcs.terena.org/TERENASSLCA.crt
+# Source14-md5:        f62cd1546a8ef14e31ba1ce8eecd234a
+Source15:      http://crt.tcs.terena.org/TERENAeScienceSSLCA.crt
+# Source15-md5:        5feea35ab01a373f115219706f1f57bd
+Source16:      http://crt.tcs.terena.org/TERENAPersonalCA.crt
+# Source16-md5:        53eaa497c8fb0b79f14fe9f69693689a
+Source17:      http://crt.tcs.terena.org/TERENAeSciencePersonalCA.crt
+# Source17-md5:        e25cc655d3ebe920ca9c187e3dde9191
+Source18:      http://crt.tcs.terena.org/TERENACodeSigningCA.crt
+# Source18-md5:        74c9f511ab03a4e6b7462e310abfa89b
 Patch0:                %{name}-undebianize.patch
 Patch1:                %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
 Patch3:                %{name}-c_rehash.sh.patch
+Patch4:                %{name}-endline.patch
+Patch5:                %{name}-mozilla.patch
 URL:           http://www.cacert.org/
-BuildRequires: coreutils
+BuildRequires: openssl-tools
 BuildRequires: python
 BuildRequires: python-modules
+BuildRequires: sed >= 4.0
 BuildRequires: unzip
 Obsoletes:     certificates
 BuildArch:     noarch
@@ -76,6 +93,8 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %{__unzip} -qq %{SOURCE1} -d thawte
 # resolve file name clash
@@ -84,8 +103,7 @@ mv 'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (
 
 find thawte/ -name *.pem | while read f ; do
        ff=$(echo $f | sed -e 's|[ ,]|_|g' -e 's|[()]|=|g')
-       fff="thawte/$(basename "$ff" .pem).crt"
-       tr -d '\r' < "$f" > "$fff"
+       cp "$f" "thawte/$(basename "$ff" .pem).crt"
 done
 
 install -d certum
@@ -105,11 +123,21 @@ for a in certum/*.pem; do
        mv "$a" "${a%.pem}.crt"
 done
 
+install -d terena
+openssl x509 -inform DER -in %{SOURCE14} -outform PEM -out terena/$(basename %{SOURCE14})
+openssl x509 -inform DER -in %{SOURCE15} -outform PEM -out terena/$(basename %{SOURCE15})
+openssl x509 -inform DER -in %{SOURCE16} -outform PEM -out terena/$(basename %{SOURCE16})
+openssl x509 -inform DER -in %{SOURCE17} -outform PEM -out terena/$(basename %{SOURCE17})
+openssl x509 -inform DER -in %{SOURCE18} -outform PEM -out terena/$(basename %{SOURCE18})
+
 %build
 %{__make}
 
 # We have those and more in specific dirs
-rm mozilla/{Thawte,thawte,Certum}*.crt
+rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2}*.crt
+
+# See TODO
+# rm mozilla/RSA_Security_1024_v3.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -118,15 +146,17 @@ install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+find $RPM_BUILD_ROOT%{_datadir}/ca-certificates -name '*.crt' -exec sed -i -e 's/\r$//' {} \;
+
 (
 cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
 find . -name '*.crt' | sort | cut -b3-
 ) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
 
-(
-cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
-find . -name '*.crt' -print0 | xargs -0 cat
-) > $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
+find $RPM_BUILD_ROOT%{_datadir}/ca-certificates -name '*.crt' | while read cert ; do
+       cat "$cert" >> $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
+       echo >>$RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT