add link to 2eecd52

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

diff --git a/ca-certificates.spec b/ca-certificates.spec
index e76427d871b1bcd311176bff25be18996d9e52ca..afc96851447fc590df9743b21ef3f2b7539d7c69 100644 (file)
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -6,15 +6,18 @@
 # - make pidgin use system certs
 # - swap %{certsdir}/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt regards file vs symlink
 #
+# 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:       20141019
+Version:       20160104
 Release:       3
 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: f619282081c8bfc65ea64c37fa5285ed
+# Source0-md5: d9665a83d0d3ef8176a38e6aa20458e9
 Source1:       https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5: 21a284ebdc6e8f4178d5cc10fb9e1ef2
 Source2:       http://www.certum.pl/keys/CA.pem
@@ -73,16 +76,35 @@ Source28:   http://www.sk.ee/upload/files/ESTEID-SK%202007.PEM.cer?/ESTEID-SK_2007
 # Source28-md5:        2b1a2a77f565d68fdf5f19f6cc3a5600
 Source29:      http://www.sk.ee/upload/files/ESTEID-SK%202011.pem.cer?/ESTEID-SK_2011.pem.cer
 # Source29-md5:        cfcc1e592cb0ff305158a7e32730546c
-
+Source30:      http://www.terena.org/activities/tcs/repository/sha2/TERENA_SSL_CA_2.pem
+# Source30-md5:        96700974350cecfcfbd904d52c3a3942
+Source31:      http://www.terena.org/activities/tcs/repository/sha2/TERENA_Personal_CA_2.pem
+# Source31-md5:        d40e5c821f8559faf5bcd55eac5e1371
+Source32:      http://www.terena.org/activities/tcs/repository/sha2/TERENA_Code_Signing_CA_2.pem
+# Source32-md5:        69ff653e730adf87ff59bf373950b357
+Source33:      http://www.terena.org/activities/tcs/repository-g3/TERENA_SSL_CA_3.pem
+# Source33-md5:        b22ed904900ed6b3bc129f9a35ba5a66
+Source34:      http://www.terena.org/activities/tcs/repository-g3/TERENA_Personal_CA_3.pem
+# Source34-md5:        eb5ddefe94750c2f8d4f11cb1f3af911
+Source35:      http://www.terena.org/activities/tcs/repository-g3/TERENA_Code_Signing_CA_3.pem
+# Source35-md5:        43375a208fba0a5e73f1912faa4db86d
+Source36:      http://www.terena.org/activities/tcs/repository-g3/TERENA_SSL_High_Assurance_CA_3.pem
+# Source36-md5:        6e00d9ede4460e739eb285ea023299f0
+Source37:      https://letsencrypt.org/certs/isrgrootx1.pem.txt
+# Source37-md5:        c73c30ef692eb5be150caad88210e891
+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
 Patch3:                %{name}-c_rehash.sh.patch
 Patch5:                %{name}-DESTDIR.patch
 Patch6:                %{name}.d.patch
-URL:           http://www.cacert.org/
+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
@@ -121,7 +143,8 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q
+%setup -qc
+mv %{name}/* .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -180,6 +203,13 @@ 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>
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1204656
+install -d mozilla
+cp -pi %{SOURCE37} mozilla/$(basename %{SOURCE37} .pem.txt).crt
+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})
@@ -187,14 +217,24 @@ openssl x509 -inform DER -in %{SOURCE22} -outform PEM -out terena/$(basename %{S
 openssl x509 -inform DER -in %{SOURCE23} -outform PEM -out terena/$(basename %{SOURCE23})
 openssl x509 -inform DER -in %{SOURCE24} -outform PEM -out terena/$(basename %{SOURCE24})
 openssl x509 -inform DER -in %{SOURCE25} -outform PEM -out terena/$(basename %{SOURCE25})
+cp %{SOURCE30} terena/$(basename %{SOURCE30} .pem).crt
+cp %{SOURCE31} terena/$(basename %{SOURCE31} .pem).crt
+cp %{SOURCE32} terena/$(basename %{SOURCE32} .pem).crt
+sed 's/\r//' %{SOURCE33} > terena/$(basename %{SOURCE33} .pem).crt
+sed 's/\r//' %{SOURCE34} > terena/$(basename %{SOURCE34} .pem).crt
+sed 's/\r//' %{SOURCE35} > terena/$(basename %{SOURCE35} .pem).crt
+sed 's/\r//' %{SOURCE36} > terena/$(basename %{SOURCE36} .pem).crt
 
 %{__make}
 
 # We have those and more in specific dirs
-rm mozilla/{Thawte,thawte,Certum,IGC_A,Deutsche_Telekom_Root_CA_2,Juur-SK}*.crt
+%{__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
 
 # See TODO
-# rm mozilla/RSA_Security_1024_v3.crt
+# %{__rm} mozilla/RSA_Security_1024_v3.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -216,6 +256,23 @@ rm -rf $RPM_BUILD_ROOT%{openssldir}
 
 ln -s %{certsdir}/ca-certificates.crt $RPM_BUILD_ROOT/etc/pki/tls/certs/ca-bundle.crt
 
+%if %{with tests}
+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" }'
+for cert in *.extracted.crt; do
+       openssl x509 -in "$cert" -noout -sha1 -fingerprint > "$cert.fingerprint"
+done
+DUPLICATES=$(sort *.fingerprint | uniq -c | sort -nr | awk ' { if ($1 != 1) { print $0; } } ')
+if [ -n "$DUPLICATES" ]; then
+       echo -e "\n\nFound duplicates for certificates (count, type, fingerprint):\n\n$DUPLICATES\n\nFailing..."
+       exit 1
+fi
+cd ..
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT