X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=ca-certificates.spec;h=f047310768a5e3f73a022b343acfe675d50412cb;hb=9af0dacaa0b30d42b936441d5ff99b40a71ea9e6;hp=f49eb879234c66801ab200a45d6dff59eb839ef1;hpb=835b958027d8c0828b802fb3f540c8cda17fca3f;p=packages%2Fca-certificates.git

diff --git a/ca-certificates.spec b/ca-certificates.spec
index f49eb87..f047310 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:	6
+Release:	10
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
@@ -45,16 +49,24 @@ 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:	openssl-tools
 BuildRequires:	python
 BuildRequires:	python-modules
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	sed >= 4.0
 BuildRequires:	unzip
 Obsoletes:	certificates
@@ -62,6 +74,11 @@ BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		certsdir	/etc/certs
+%if "%{pld_release}" == "th"
+%define		openssldir	/etc/openssl/certs
+%else
+%define		openssldir	/var/lib/openssl/certs
+%endif
 
 %description
 Common CA Certificates PEM files.
@@ -75,7 +92,11 @@ Summary(pl.UTF-8):	Skrypt do odświeżania bazy certyfikatów CA
 Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	mktemp
+%if "%{pld_release}" == "ac"
+Requires:	openssl-tools >= 0.9.7m-2
+%else
 Requires:	openssl-tools >= 0.9.8i-3
+%endif
 
 %description update
 Script and data for updating CA Certificates database.
@@ -91,6 +112,9 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+
+%{__sed} -i -e 's,@openssldir@,%{openssldir},' sbin/update-ca-certificates*
 
 %{__unzip} -qq %{SOURCE1} -d thawte
 # resolve file name clash
@@ -103,18 +127,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
@@ -126,12 +150,25 @@ 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/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,IGC_A,Deutsche_Telekom_Root_CA_2}*.crt
 
+# See TODO
+# rm mozilla/RSA_Security_1024_v3.crt
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
@@ -146,10 +183,10 @@ cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
 find . -name '*.crt' | sort | cut -b3-
 ) > $RPM_BUILD_ROOT%{_sysconfdir}/ca-certificates.conf
 
-find $RPM_BUILD_ROOT%{_datadir}/ca-certificates -name '*.crt' | while read cert ; do
-	cat "$cert" >> $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
-	echo >>$RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
-done
+# 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