- release 2 (by relup.sh)

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

diff --git a/ca-certificates.spec b/ca-certificates.spec
index df3443ff381d36bce9c9dc5d2ad3f657f9e939e8..2948efd98c9849add3e329acf23c3e945b252a3e 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -6,18 +6,19 @@
 # - make pidgin use system certs
 # - swap %{certsdir}/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt regards file vs symlink
 #
-%bcond_without tests
+# Conditional build:
+%bcond_without tests   # skip duplicates check
+
 Summary:       Common CA Certificates PEM files
 Summary(pl.UTF-8):     Pliki PEM popularnych certyfikatów CA
 Name:          ca-certificates
-Version:       20160104
+%define        ver_date        20161130
+Version:       %{ver_date}+nmu1
 Release:       2
 License:       GPL v2 (scripts), MPL v2 (mozilla certs), distributable (other certs)
-Group:         Libraries
+Group:         Base
 Source0:       ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.xz
-# Source0-md5: d9665a83d0d3ef8176a38e6aa20458e9
-Source1:       https://www.verisign.com/support/thawte-roots.zip
-# Source1-md5: 21a284ebdc6e8f4178d5cc10fb9e1ef2
+# Source0-md5: a09e8b63126188fd0ed77f6fbaf5d35f
 Source2:       http://www.certum.pl/keys/CA.pem
 # Source2-md5: 35610177afc9c64e70f1ce62c1885496
 Source3:       http://www.certum.pl/keys/level1.pem
@@ -88,6 +89,10 @@ Source35:    http://www.terena.org/activities/tcs/repository-g3/TERENA_Code_Signing
 # Source35-md5:        43375a208fba0a5e73f1912faa4db86d
 Source36:      http://www.terena.org/activities/tcs/repository-g3/TERENA_SSL_High_Assurance_CA_3.pem
 # Source36-md5:        6e00d9ede4460e739eb285ea023299f0
+Source38:      https://letsencrypt.org/certs/letsencryptauthorityx1.pem.txt
+# Source38-md5:        7a4c9a537127f609035ad7f4019defdb
+Source39:      https://letsencrypt.org/certs/letsencryptauthorityx2.pem.txt
+# Source39-md5:        27b0b8f7ef14356d8f717bc083c43ef1
 Patch0:                %{name}-undebianize.patch
 Patch1:                %{name}-more-certs.patch
 Patch2:                %{name}-etc-certs.patch
@@ -96,7 +101,7 @@ Patch5:              %{name}-DESTDIR.patch
 Patch6:                %{name}.d.patch
 URL:           https://packages.debian.org/sid/ca-certificates
 BuildRequires: openssl-tools
-BuildRequires: python
+BuildRequires: python >= 1:2.6
 BuildRequires: python-modules
 BuildRequires: rpm >= 4.4.9-56
 BuildRequires: sed >= 4.0
@@ -135,8 +140,7 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -qc
-mv %{name}/* .
+%setup -q -n %{name}-%{ver_date}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -146,20 +150,6 @@ mv %{name}/* .
 
 %{__sed} -i -e 's,@openssldir@,%{openssldir},' sbin/update-ca-certificates*
 
-%{__unzip} -qq %{SOURCE1} -d thawte
-
-find thawte/ -name *.pem -o -name *.txt| while read f ; do
-       if (file "$f" | grep -q "PEM"); then
-               ff=$(echo $f | sed -e 's|[ ,]|_|g' -e 's|[()]|=|g')
-               nname=$(basename "$ff" .pem)
-               nname=$(basename "$nname" .txt)
-               nname=$(basename "$nname" _b64)
-               cp -pi "$f" "thawte/${nname}.crt"
-       else
-               echo "Skipping $f, doesn't look like PEM CERT"
-       fi
-done
-
 install -d certum
 cp -pi %{SOURCE2} certum
 cp -pi %{SOURCE3} certum
@@ -195,6 +185,11 @@ for a in esteid/*.PEM.cer; do
        mv -i "$a" "${a%.PEM.cer}.crt"
 done
 
+# 2eecd52 - add letsencrypt certificates (approved by mozilla) <Arkadiusz Miśkiewicz>
+install -d mozilla
+cp -pi %{SOURCE38} mozilla/$(basename %{SOURCE38} .pem.txt).crt
+cp -pi %{SOURCE39} mozilla/$(basename %{SOURCE39} .pem.txt).crt
+
 %build
 install -d terena
 openssl x509 -inform DER -in %{SOURCE21} -outform PEM -out terena/$(basename %{SOURCE21})
@@ -213,13 +208,10 @@ sed 's/\r//' %{SOURCE36} > terena/$(basename %{SOURCE36} .pem).crt
 %{__make}
 
 # We have those and more in specific dirs
-rm mozilla/{thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
-
-# Duplicate with Verisign_Class_3_Public_Primary_Certification_Authority_2.crt
-rm thawte/Class_3_Public_Primary_Certification_Authority.crt
+%{__rm} mozilla/{Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
 
 # See TODO
-# rm mozilla/RSA_Security_1024_v3.crt
+# %{__rm} mozilla/RSA_Security_1024_v3.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -246,7 +238,7 @@ install -d pld-tests
 cd pld-tests
 
 # check for duplicates (to avoid X509_STORE_add_cert "cert already in hash table" problem)
-cat $RPM_BUILD_ROOT/%{certsdir}/ca-certificates.crt | awk '/BEGIN/ { i++; } /BEGIN/, /END/ { print > i ".extracted.crt" }'
+cat $RPM_BUILD_ROOT%{certsdir}/ca-certificates.crt | awk '/BEGIN/ { i++; } /BEGIN/, /END/ { print > i ".extracted.crt" }'
 for cert in *.extracted.crt; do
        openssl x509 -in "$cert" -noout -sha1 -fingerprint > "$cert.fingerprint"
 done