- rel 12; fix sk.ee certs; add sk.ee ESTEID 2011

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

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 7534019e17d5f348440dca6bee41884e270915f0..5b068bc761663e449f025183f429c9c47d5ecba8 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -8,13 +8,13 @@ Summary:      Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
 Version:       20090814
-Release:       8
+Release:       12
 License:       distributable
 Group:         Libraries
-Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
-# Source0-md5: 307052c985bec7f9a00eb84293eef779
+Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}+nmu3.tar.gz
+# Source0-md5: 578be1c5a459cea3b243777c08610727
 Source1:       https://www.verisign.com/support/thawte-roots.zip
-# Source1-md5: 3e50e5facce6b6bfbf68271d066005fa
+# Source1-md5: a3709cc0279ef3fca4f86ea775066b18
 Source2:       http://www.certum.pl/keys/CA.pem
 # Source2-md5: 35610177afc9c64e70f1ce62c1885496
 Source3:       http://www.certum.pl/keys/level1.pem
@@ -49,12 +49,14 @@ 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:      http://www.sk.ee/upload/files/JUUR-SK.PEM.cer
 # Source19-md5:        805784c06c9eff3771a4b9bd631cd3f5
-Source20:      http://www.sk.ee/files/ESTEID-SK.PEM.cer
+Source20:      http://www.sk.ee/upload/files/ESTEID-SK.PEM.cer
 # Source20-md5:        387beee5b8539ab7d91628f486295899
-Source21:      http://www.sk.ee/files/ESTEID-SK%202007.PEM.cer
+Source21:      http://www.sk.ee/upload/files/ESTEID-SK%202007.PEM.cer
 # Source21-md5:        2b1a2a77f565d68fdf5f19f6cc3a5600
+Source22:      http://www.sk.ee/upload/files/ESTEID-SK%202011.pem.cer
+# Source22-md5:        cfcc1e592cb0ff305158a7e32730546c
 Patch0:                %{name}-undebianize.patch
 Patch1:                %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
@@ -63,18 +65,22 @@ Patch4:             %{name}-endline.patch
 Patch5:                %{name}-mozilla.patch
 Patch6:                %{name}-DESTDIR.patch
 URL:           http://www.cacert.org/
-BuildRequires: openssl-tools >= 1.0.0
+BuildRequires: openssl-tools
 BuildRequires: python
 BuildRequires: python-modules
+BuildRequires: rpm >= 4.4.9-56
 BuildRequires: sed >= 4.0
 BuildRequires: unzip
-Conflicts:     openssl < 1.0.0
 Obsoletes:     certificates
 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.
@@ -88,7 +94,11 @@ Summary(pl.UTF-8):   Skrypt do odświeżania bazy certyfikatów CA
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      mktemp
-Requires:      openssl-tools >= 1.0.0
+%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.
@@ -97,7 +107,7 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}+nmu3
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -106,10 +116,9 @@ Skrypt i dane do odświeżania bazy certyfikatów CA.
 %patch5 -p1
 %patch6 -p1
 
+%{__sed} -i -e 's,@openssldir@,%{openssldir},' sbin/update-ca-certificates*
+
 %{__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')
@@ -146,6 +155,7 @@ 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
 for a in esteid/*.PEM.cer; do
        mv "$a" "${a%.PEM.cer}.crt"
 done