commit 2e4da516f75863ba466cff75066660483effb16b
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Mon Feb 8 18:23:25 2016 +0100
- rel 2; rm duplicate cert and fail if we produce duplicates in our bundle
ca-certificates.spec | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
---
diff --git a/ca-certificates.spec b/ca-certificates.spec
index 8de9b29..df3443f 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -6,11 +6,12 @@
# - make pidgin use system certs
# - swap %{certsdir}/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt
regards file vs symlink
#
+%bcond_without tests
Summary: Common CA Certificates PEM files
Summary(pl.UTF-8): Pliki PEM popularnych certyfikatów CA
Name: ca-certificates
Version: 20160104
-Release: 1
+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
@@ -214,6 +215,9 @@ sed 's/\r//' %{SOURCE36} > terena/$(basename %{SOURCE36}
.pem).crt
# 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
+
# See TODO
# rm mozilla/RSA_Security_1024_v3.crt
@@ -237,6 +241,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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ca-certificates.git/commitdiff/2e4da516f75863ba466cff75066660483effb16b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
