X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=0474ac7f5344db908e81a109417f3da84e5867a4;hp=11d2cf5e3d4f135309d84d701ae599f042e2ecd4;hb=65bcbc858805f27ff8cbaaa6311e97bf6f1e5e61;hpb=302ace1c0e7a789f3f5819c120ed5fbdcf15760f

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 11d2cf5..0474ac7 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,14 +1,16 @@
+# TODO
+# - cleanup dead links from /etc/openssl/certs after -update uninstall
 Summary:	Common CA Certificates PEM files
 Summary(pl.UTF-8):	Pliki PEM popularnych certyfikatów CA
 Name:		ca-certificates
-Version:	20080809
-Release:	3
+Version:	20090814
+Release:	1
 License:	distributable
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
-# Source0-md5:	c155f5059006b94ad0aea7018161ab37
-Source1:	https://www.verisign.com/support/thawte-roots.zip 
-# Source1-md5:	a3709cc0279ef3fca4f86ea775066b18
+# Source0-md5:	307052c985bec7f9a00eb84293eef779
+Source1:	https://www.verisign.com/support/thawte-roots.zip
+# Source1-md5:	3e50e5facce6b6bfbf68271d066005fa
 Source2:	http://www.certum.pl/keys/CA.pem
 # Source2-md5:	35610177afc9c64e70f1ce62c1885496
 Source3:	http://www.certum.pl/keys/level1.pem
@@ -38,14 +40,16 @@ Patch1:		%{name}-more-certs.patch
 Patch2:		%{name}-etc-certs.patch
 Patch3:		%{name}-c_rehash.sh.patch
 URL:		http://www.cacert.org/
-BuildRequires:	ruby
+BuildRequires:	coreutils
+BuildRequires:	python
+BuildRequires:	python-modules
 BuildRequires:	unzip
-Requires:	mktemp
-Requires:	rpm-whiteout >= 1.7
 Obsoletes:	certificates
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		certsdir	/etc/certs
+
 %description
 Common CA Certificates PEM files.
 
@@ -56,25 +60,32 @@ Pliki PEM popularnych certyfikatów CA.
 Summary:	Script for updating CA Certificates database
 Summary(pl.UTF-8):	Skrypt do odświeżania bazy certyfikatów CA
 Group:		Libraries
-Requires:	%{name}
+Requires:	%{name} = %{version}-%{release}
+Requires:	mktemp
 Requires:	openssl-tools >= 0.9.8i-3
 
 %description update
 Script and data for updating CA Certificates database.
 
-%description -l pl.UTF-8 update
+%description update -l pl.UTF-8
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q -n %{name}
+%setup -q
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 
-unzip %{SOURCE1} '*_b64.txt' -d thawte/
-for I in thawte/{,*/}*.txt; do
-	mv "$I" "`echo $I | sed -e 's|_b64.txt|.crt|' -e 's|/.*/|/|'`"
+%{__unzip} -qq %{SOURCE1} -d thawte
+# resolve file name clash
+mv 'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (EV)/thawte_Primary_Root_CA.pem' \
+	'thawte/Thawte Roots/Thawte Extended Validation/thawte Primary Root CA - G1 (EV)/thawte_Primary_Root_CA_CC.pem'
+
+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"
 done
 
 install -d certum
@@ -90,8 +101,8 @@ install %{SOURCE10} certum
 install %{SOURCE11} certum
 install %{SOURCE12} certum
 install %{SOURCE13} certum
-for I in certum/*.pem; do
-	mv "$I" "`echo $I | sed -e 's|pem|crt|'`"
+for a in certum/*.pem; do
+	mv "$a" "${a%.pem}.crt"
 done
 
 %build
@@ -102,7 +113,7 @@ rm mozilla/{Thawte,thawte,Certum}*.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},/etc/openssl}
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -115,17 +126,17 @@ find . -name '*.crt' | sort | cut -b3-
 (
 cd $RPM_BUILD_ROOT%{_datadir}/ca-certificates
 find . -name '*.crt' -print0 | xargs -0 cat
-) > $RPM_BUILD_ROOT%{_sysconfdir}/openssl/ca-certificates.crt
+) > $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post update
-%{_sbindir}/update-ca-certificates || :
+%{_sbindir}/update-ca-certificates --fresh || :
 
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/openssl/ca-certificates.crt
+%config(noreplace) %verify(not md5 mtime size) %{certsdir}/ca-certificates.crt
 
 %files update
 %defattr(644,root,root,755)