X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=ca-certificates.spec;h=6315b9f26e75a8f475d5fdcc4ff3b21b9f6365bf;hb=460ad8a7ea22dd9f24e57e175722e67390716171;hp=64bf18aeb806208d0ca6001a6272ad0940fbf87d;hpb=4d7c72ae9657fea9c583a90870055ee775385a7c;p=packages%2Fca-certificates.git

diff --git a/ca-certificates.spec b/ca-certificates.spec
index 64bf18a..6315b9f 100644
--- 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:	20150426
+Version:	20160104
 Release:	2
 License:	GPL v2 (scripts), MPL v2 (mozilla certs), distributable (other certs)
 Group:		Libraries
 Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.xz
-# Source0-md5:	717455f13fb31fd014a11a468ea3895d
+# Source0-md5:	d9665a83d0d3ef8176a38e6aa20458e9
 Source1:	https://www.verisign.com/support/thawte-roots.zip
 # Source1-md5:	21a284ebdc6e8f4178d5cc10fb9e1ef2
 Source2:	http://www.certum.pl/keys/CA.pem
@@ -134,7 +137,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
@@ -211,10 +215,13 @@ 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
+%{__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
@@ -236,6 +243,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