- avoid missing or duplicate .pem extension

[packages/ca-certificates.git] / ca-certificates.spec

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 7152e944a87661cd1123d625a788c1924474be99..ae29c860a240412482fee0fccd36b31e9a9ff5a1 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -3,14 +3,14 @@
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20080809
-Release:       4
+Version:       20090814
+Release:       5
 License:       distributable
 Group:         Libraries
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
-# Source0-md5: c155f5059006b94ad0aea7018161ab37
+# Source0-md5: 307052c985bec7f9a00eb84293eef779
 Source1:       https://www.verisign.com/support/thawte-roots.zip
-# Source1-md5: a3709cc0279ef3fca4f86ea775066b18
+# Source1-md5: 3e50e5facce6b6bfbf68271d066005fa
 Source2:       http://www.certum.pl/keys/CA.pem
 # Source2-md5: 35610177afc9c64e70f1ce62c1885496
 Source3:       http://www.certum.pl/keys/level1.pem
@@ -39,11 +39,12 @@ Patch0:             %{name}-undebianize.patch
 Patch1:                %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
 Patch3:                %{name}-c_rehash.sh.patch
+Patch4:                %{name}-endline.patch
 URL:           http://www.cacert.org/
-BuildRequires: ruby
+BuildRequires: python
+BuildRequires: python-modules
+BuildRequires: sed >= 4.0
 BuildRequires: unzip
-Requires:      mktemp
-Requires:      rpm-whiteout >= 1.7
 Obsoletes:     certificates
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -61,6 +62,7 @@ Summary:      Script for updating CA Certificates database
 Summary(pl.UTF-8):     Skrypt do odświeżania bazy certyfikatów CA
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
+Requires:      mktemp
 Requires:      openssl-tools >= 0.9.8i-3
 
 %description update
@@ -70,15 +72,21 @@ Script and data for updating CA Certificates database.
 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
+%patch4 -p1
 
-%{__unzip} -qq %{SOURCE1} '*_b64.txt' -d thawte
-for a in thawte/{,*/}*.txt; do
-       mv "$a" "${a%_b64.txt}.crt"
+%{__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')
+       cp "$f" "thawte/$(basename "$ff" .pem).crt"
 done
 
 install -d certum
@@ -111,21 +119,23 @@ 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
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post update
-%{_sbindir}/update-ca-certificates || :
+%{_sbindir}/update-ca-certificates --fresh || :
 
 %files
 %defattr(644,root,root,755)