X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=d8ed3a6cb15751f309b79d3d189a35dc80a82f31;hp=94a12f0ee8bf6393e3c79ce1c39e65f787f32459;hb=45a4998d3cbf6358474b87bb444016bb0341586a;hpb=823e036784e7b482a3206ae89d5a3d09747ccde1

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 94a12f0..d8ed3a6 100644
--- 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:	2
+Release:	7
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -35,20 +39,41 @@ 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
+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
 Patch3:		%{name}-c_rehash.sh.patch
+Patch4:		%{name}-endline.patch
+Patch5:		%{name}-mozilla.patch
+Patch6:		%{name}-DESTDIR.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
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		certsdir	/etc/certs
+%define		openssldir	/etc/openssl/certs
 
 %description
 Common CA Certificates PEM files.
@@ -76,6 +101,9 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %{__unzip} -qq %{SOURCE1} -d thawte
 # resolve file name clash
@@ -84,32 +112,51 @@ 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
-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
 
+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})
+
+# 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
+for a in esteid/*.PEM.cer; do
+	mv "$a" "${a%.PEM.cer}.crt"
+done
+
 %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 +165,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
+# build %{certsdir}/ca-certificates.crt
+install -d $RPM_BUILD_ROOT%{openssldir}
+./sbin/update-ca-certificates --destdir $RPM_BUILD_ROOT
+rm -rf $RPM_BUILD_ROOT%{openssldir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT