packages: ca-certificates/ca-certificates.spec - rel 13; fix thawte certs; ...

[arekm]

Author: arekm                        Date: Wed Mar 30 15:40:02 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 13; fix thawte certs; force interactive mode for cp/mv (so we know if overwrittes happen)

---- Files affected:
packages/ca-certificates:
   ca-certificates.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: packages/ca-certificates/ca-certificates.spec
diff -u packages/ca-certificates/ca-certificates.spec:1.39 packages/ca-certificates/ca-certificates.spec:1.40
--- packages/ca-certificates/ca-certificates.spec:1.39	Sun Mar 27 11:44:32 2011
+++ packages/ca-certificates/ca-certificates.spec	Wed Mar 30 17:39:57 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
 Version:	20090814
-Release:	12
+Release:	13
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}+nmu3.tar.gz
@@ -121,26 +121,33 @@
 
 %{__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
@@ -153,12 +160,12 @@
 # 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 -a %{SOURCE22} esteid/ESTEID-SK_2011.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
@@ -211,6 +218,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2011/03/30 15:39:57  arekm
+- rel 13; fix thawte certs; force interactive mode for cp/mv (so we know if overwrittes happen)
+
 Revision 1.39  2011/03/27 09:44:32  arekm
 - rel 12; fix sk.ee certs; add sk.ee ESTEID 2011
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ca-certificates/ca-certificates.spec?r1=1.39&r2=1.40&f=u