X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=0edc38a5dcb4ba194efe1f2511f82d411cd21d82;hp=62629edad61871c7c4da2d897ec0c26958516bfa;hb=83311e47006791c8924d686e5bde68e5c7c045ae;hpb=1d6b4a6a0f29802e0f8c967b30ab4f5c80d04273

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 62629ed..0edc38a 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -7,12 +7,12 @@
 Summary:	Common CA Certificates PEM files
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
-Version:	20090814
-Release:	11
+Version:	20110421
+Release:	1
 License:	distributable
 Group:		Libraries
-Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}+nmu3.tar.gz
-# Source0-md5:	578be1c5a459cea3b243777c08610727
+Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
+# Source0-md5:	59edcd927a76cf78ec5bb43f248ea68d
 Source1:	https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5:	a3709cc0279ef3fca4f86ea775066b18
 Source2:	http://www.certum.pl/keys/CA.pem
@@ -49,12 +49,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-md5:	cf02fbe746e4e9a6e237a5b2f4b8091f
-Source21:	http://www.sk.ee/files/ESTEID-SK_2007.PEM.cer
-# Source21-md5:	cf02fbe746e4e9a6e237a5b2f4b8091f
+Source20:	http://www.sk.ee/upload/files/ESTEID-SK.PEM.cer
+# Source20-md5:	387beee5b8539ab7d91628f486295899
+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
@@ -105,7 +107,7 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q -n %{name}-%{version}+nmu3
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -118,26 +120,33 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %{__unzip} -qq %{SOURCE1} -d thawte
 
-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 -i "$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 -ai %{SOURCE2} certum
+cp -ai %{SOURCE3} certum
+cp -ai %{SOURCE4} certum
+cp -ai %{SOURCE5} certum
+cp -ai %{SOURCE6} certum
+cp -ai %{SOURCE7} certum
+cp -ai %{SOURCE8} certum
+cp -ai %{SOURCE9} certum
+cp -ai %{SOURCE10} certum
+cp -ai %{SOURCE11} certum
+cp -ai %{SOURCE12} certum
+cp -ai %{SOURCE13} certum
 for a in certum/*.pem; do
-	mv "$a" "${a%.pem}.crt"
+	mv -i "$a" "${a%.pem}.crt"
 done
 
 install -d terena
@@ -150,11 +159,12 @@ openssl x509 -inform DER -in %{SOURCE18} -outform PEM -out terena/$(basename %{S
 # 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/ESTEID-SK_2007.crt
+cp -ai %{SOURCE19} esteid
+cp -ai %{SOURCE20} esteid
+cp -ai %{SOURCE21} esteid/ESTEID-SK_2007.crt
+cp -ai %{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