- add esteid certs, www.sk.ee

Changed files:
    ca-certificates-more-certs.patch -> 1.4
    ca-certificates.spec -> 1.31

diff --git a/ca-certificates-more-certs.patch b/ca-certificates-more-certs.patch
index 0ea38fe0cdf5af2a41083530e786e4639399b14c..d281bc2a3b0a518d05bbec2db19409d6a42d6d31 100644 (file)
--- a/ca-certificates-more-certs.patch
+++ b/ca-certificates-more-certs.patch
@@ -5,7 +5,7 @@
  
  CERTSDIR = /usr/share/ca-certificates
 -SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr
-+SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr thawte certum terena
++SUBDIRS = spi-inc.org debconf.org mozilla cacert.org brasil.gov.br signet.pl telesec.de gouv.fr thawte certum terena esteid
  
  all:
        for dir in $(SUBDIRS); do \
@@ -57,3 +57,18 @@ diff -urN ca-certificates/terena/Makefile ca-certificates-more/terena/Makefile
 +      for p in *.crt; do \
 +       install -m 644 $$p $(CERTSDIR)/$$p ; \
 +      done
+--- ca-certificates/esteid/Makefile    1970-01-01 01:00:00.000000000 +0100
++++ ca-certificates-more/esteid/Makefile       2007-02-02 07:23:19.000000000 +0100
+@@ -0,0 +1,12 @@
++#
++# Makefile
++#
++
++all:
++
++clean:
++
++install:
++      for p in *.crt; do \
++       install -m 644 $$p $(CERTSDIR)/$$p ; \
++      done

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 838a4689841689bac168bd2728c0d9aebe7a8199..fc44bac83761578c332434b2c4f69d7fb070bfa7 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -49,6 +49,12 @@ 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-md5:        805784c06c9eff3771a4b9bd631cd3f5
+Source20:      http://www.sk.ee/files/ESTEID-SK.PEM.cer
+# Source20-md5:        387beee5b8539ab7d91628f486295899
+Source21:      http://www.sk.ee/files/ESTEID-SK%202007.PEM.cer
+# Source21-md5:        2b1a2a77f565d68fdf5f19f6cc3a5600
 Patch0:                %{name}-undebianize.patch
 Patch1:                %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
@@ -107,18 +113,18 @@ find thawte/ -name *.pem | while read f ; do
 done
 
 install -d certum
-install %{SOURCE2} certum
-install %{SOURCE3} certum
-install %{SOURCE4} certum
-install %{SOURCE5} certum
-install %{SOURCE6} certum
-install %{SOURCE7} certum
-install %{SOURCE8} certum
-install %{SOURCE9} certum
-install %{SOURCE10} certum
-install %{SOURCE11} certum
-install %{SOURCE12} certum
-install %{SOURCE13} 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
 for a in certum/*.pem; do
        mv "$a" "${a%.pem}.crt"
 done
@@ -130,6 +136,16 @@ 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
+install -d esteid
+cp -a %{SOURCE19} esteid
+cp -a %{SOURCE20} esteid
+cp -a %{SOURCE21} esteid
+for a in esteid/*.PEM.cer; do
+       mv "$a" "${a%.PEM.cer}.crt"
+done
+
 %build
 %{__make}