- up to 20120212, see changelog for added/removed ca-s

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

diff --git a/ca-certificates.spec b/ca-certificates.spec
index b72d72aa39e6127dfeb529441becc43e59ea0e7b..4e586498f1dce7c379e36a44d1876b599b67cd38 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,20 +1,24 @@
 # TODO
 # - cleanup dead links from /etc/openssl/certs after -update uninstall
+# - deal with removed (renamed) certs on upgrade (as new config is created as
+#   .rpmnew). create some merge tool (or split /etc/ca-certificates.conf to
+#   /etc/ca-certificates.d): http://pastebin.com/04hZd2x0
 #
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#
+# - add certs noted in TODO file
 #
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20090814
-Release:       10
+Version:       20120212
+Release:       1
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
-# Source0-md5: 307052c985bec7f9a00eb84293eef779
+# Source0-md5: 391dea8d827db935ca0d0d1e6641bf23
 Source1:       https://www.verisign.com/support/thawte-roots.zip
-# Source1-md5: 3e50e5facce6b6bfbf68271d066005fa
+# Source1-md5: a3709cc0279ef3fca4f86ea775066b18
 Source2:       http://www.certum.pl/keys/CA.pem
 # Source2-md5: 35610177afc9c64e70f1ce62c1885496
 Source3:       http://www.certum.pl/keys/level1.pem
@@ -49,12 +53,14 @@ Source17:   http://crt.tcs.terena.org/TERENAeSciencePersonalCA.crt
 # Source17-md5:        e25cc655d3ebe920ca9c187e3dde9191
 Source18:      http://crt.tcs.terena.org/TERENACodeSigningCA.crt
 # Source18-md5:        74c9f511ab03a4e6b7462e310abfa89b
-Source19:      http://www.sk.ee/files/JUUR-SK.PEM.cer
+Source19:      http://www.sk.ee/upload/files/JUUR-SK.PEM.cer
 # Source19-md5:        805784c06c9eff3771a4b9bd631cd3f5
-Source20:      http://www.sk.ee/files/ESTEID-SK.PEM.cer
+Source20:      http://www.sk.ee/upload/files/ESTEID-SK.PEM.cer
 # Source20-md5:        387beee5b8539ab7d91628f486295899
-Source21:      http://www.sk.ee/files/ESTEID-SK_2007.PEM.cer
+Source21:      http://www.sk.ee/upload/files/ESTEID-SK%202007.PEM.cer#/ESTEID-SK_2007.PEM.cer
 # Source21-md5:        2b1a2a77f565d68fdf5f19f6cc3a5600
+Source22:      http://www.sk.ee/upload/files/ESTEID-SK%202011.pem.cer#/ESTEID-SK_2011.pem.cer
+# Source22-md5:        cfcc1e592cb0ff305158a7e32730546c
 Patch0:                %{name}-undebianize.patch
 Patch1:                %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
@@ -117,30 +123,34 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %{__sed} -i -e 's,@openssldir@,%{openssldir},' sbin/update-ca-certificates*
 
 %{__unzip} -qq %{SOURCE1} -d thawte
-# resolve file name clash
-mv 'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (EV)/thawte_Primary_Root_CA.pem' \
-       'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (EV)/thawte_Primary_Root_CA_CC.pem'
 
-find thawte/ -name *.pem | while read f ; do
-       ff=$(echo $f | sed -e 's|[ ,]|_|g' -e 's|[()]|=|g')
-       cp "$f" "thawte/$(basename "$ff" .pem).crt"
+find thawte/ -name *.pem -o -name *.txt| while read f ; do
+       if (file "$f" | grep -q "PEM"); then
+               ff=$(echo $f | sed -e 's|[ ,]|_|g' -e 's|[()]|=|g')
+               nname=$(basename "$ff" .pem)
+               nname=$(basename "$nname" .txt)
+               nname=$(basename "$nname" _b64)
+               cp -pi "$f" "thawte/${nname}.crt"
+       else
+               echo "Skipping $f, doesn't look like PEM CERT"
+       fi
 done
 
 install -d certum
-cp -a %{SOURCE2} certum
-cp -a %{SOURCE3} certum
-cp -a %{SOURCE4} certum
-cp -a %{SOURCE5} certum
-cp -a %{SOURCE6} certum
-cp -a %{SOURCE7} certum
-cp -a %{SOURCE8} certum
-cp -a %{SOURCE9} certum
-cp -a %{SOURCE10} certum
-cp -a %{SOURCE11} certum
-cp -a %{SOURCE12} certum
-cp -a %{SOURCE13} certum
+cp -pi %{SOURCE2} certum
+cp -pi %{SOURCE3} certum
+cp -pi %{SOURCE4} certum
+cp -pi %{SOURCE5} certum
+cp -pi %{SOURCE6} certum
+cp -pi %{SOURCE7} certum
+cp -pi %{SOURCE8} certum
+cp -pi %{SOURCE9} certum
+cp -pi %{SOURCE10} certum
+cp -pi %{SOURCE11} certum
+cp -pi %{SOURCE12} certum
+cp -pi %{SOURCE13} certum
 for a in certum/*.pem; do
-       mv "$a" "${a%.pem}.crt"
+       mv -i "$a" "${a%.pem}.crt"
 done
 
 install -d terena
@@ -150,21 +160,22 @@ openssl x509 -inform DER -in %{SOURCE16} -outform PEM -out terena/$(basename %{S
 openssl x509 -inform DER -in %{SOURCE17} -outform PEM -out terena/$(basename %{SOURCE17})
 openssl x509 -inform DER -in %{SOURCE18} -outform PEM -out terena/$(basename %{SOURCE18})
 
-# http://www.sk.ee/pages.php/0203040502#Root_certificates
-# JUUR-SK, ESTEID-SK and ESTEID-SK 2007
+# http://www.sk.ee/en/Repository/certs/rootcertificates
+# JUUR-SK, ESTEID-SK and ESTEID-SK 2007, ESTEID-SK 2011
 install -d esteid
-cp -a %{SOURCE19} esteid
-cp -a %{SOURCE20} esteid
-cp -a %{SOURCE21} esteid/ESTEID-SK_2007.crt
+cp -pi %{SOURCE19} esteid
+cp -pi %{SOURCE20} esteid
+cp -pi %{SOURCE21} esteid/ESTEID-SK_2007.crt
+cp -pi %{SOURCE22} esteid/ESTEID-SK_2011.crt
 for a in esteid/*.PEM.cer; do
-       mv "$a" "${a%.PEM.cer}.crt"
+       mv -i "$a" "${a%.PEM.cer}.crt"
 done
 
 %build
 %{__make}
 
 # We have those and more in specific dirs
-rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2}*.crt
+rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
 
 # See TODO
 # rm mozilla/RSA_Security_1024_v3.crt
@@ -196,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
+%doc debian/README.Debian debian/changelog
 %config(noreplace) %verify(not md5 mtime size) %{certsdir}/ca-certificates.crt
 
 %files update