X-Git-Url: http://git.pld-linux.org/?p=packages%2Fca-certificates.git;a=blobdiff_plain;f=ca-certificates.spec;h=a2ee45b200893d83ec4736a15bc44418d7eba6a0;hp=f047310768a5e3f73a022b343acfe675d50412cb;hb=4e16aaa8f73d270583a031434344bf57b43e56d7;hpb=9af0dacaa0b30d42b936441d5ff99b40a71ea9e6

diff --git a/ca-certificates.spec b/ca-certificates.spec
index f047310..a2ee45b 100644
--- a/ca-certificates.spec
+++ b/ca-certificates.spec
@@ -1,84 +1,81 @@
 # TODO
-# - cleanup dead links from /etc/openssl/certs after -update uninstall
-#
 # - https://bugzilla.mozilla.org/show_bug.cgi?id=549701 and
 #   http://groups.google.com/group/mozilla.dev.security.policy/browse_thread/thread/b6493a285ba79998#
+# - make amsn use system certs
+# - 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:	20090814
-Release:	10
-License:	distributable
-Group:		Libraries
-Source0:	ftp://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.gz
-# Source0-md5:	307052c985bec7f9a00eb84293eef779
-Source1:	https://www.verisign.com/support/thawte-roots.zip
-# Source1-md5:	3e50e5facce6b6bfbf68271d066005fa
+%define	ver_date	20210119
+Version:	%{ver_date}
+Release:	5
+License:	GPL v2 (scripts), MPL v2 (mozilla certs), distributable (other certs)
+Group:		Base
+Source0:	http://ftp.debian.org/debian/pool/main/c/ca-certificates/%{name}_%{version}.tar.xz
+# Source0-md5:	c02582bf9ae338e558617291897615eb
 Source2:	http://www.certum.pl/keys/CA.pem
 # Source2-md5:	35610177afc9c64e70f1ce62c1885496
-Source3:	http://www.certum.pl/keys/level1.pem
-# Source3-md5:	ba2d2e234ef9cfd2e6e5f810c964862e
-Source4:	http://www.certum.pl/keys/level2.pem
-# Source4-md5:	d06578a04e8cb23071f3870430ea0cf0
-Source5:	http://www.certum.pl/keys/level3.pem
-# Source5-md5:	47b67c63a52236576fc0d1150327c962
-Source6:	http://www.certum.pl/keys/level4.pem
-# Source6-md5:	f1f8a65d177745311a1e99f029ae5d71
-Source7:	http://www.certum.pl/keys/vs.pem
-# Source7-md5:	8da19ffc48c5dcc2868b1aa55f1d5983
-Source8:	http://www.certum.pl/keys/na.pem
-# Source8-md5:	ba571cb35e7672ff7ae95132ac1bfec4
-Source9:	http://www.certum.pl/keys/tsa.pem
-# Source9-md5:	1a7b3faf8ed00f4d80297de74862e102
-Source10:	http://www.certum.pl/keys/class1.pem
-# Source10-md5:	058436b132ea2df6972821f546104a16
-Source11:	http://www.certum.pl/keys/class2.pem
-# Source11-md5:	5caf7fe99b1fc6e63c40b3d081711d1b
-Source12:	http://www.certum.pl/keys/class3.pem
-# Source12-md5:	07bc97e21da092ba53535c7379e1b58b
-Source13:	http://www.certum.pl/keys/class4.pem
-# Source13-md5:	99ef61d509539af89f1c025b67245965
-Source14:	http://crt.tcs.terena.org/TERENASSLCA.crt
-# Source14-md5:	f62cd1546a8ef14e31ba1ce8eecd234a
-Source15:	http://crt.tcs.terena.org/TERENAeScienceSSLCA.crt
-# Source15-md5:	5feea35ab01a373f115219706f1f57bd
-Source16:	http://crt.tcs.terena.org/TERENAPersonalCA.crt
-# Source16-md5:	53eaa497c8fb0b79f14fe9f69693689a
-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-md5:	805784c06c9eff3771a4b9bd631cd3f5
-Source20:	http://www.sk.ee/files/ESTEID-SK.PEM.cer
-# Source20-md5:	387beee5b8539ab7d91628f486295899
-Source21:	http://www.sk.ee/files/ESTEID-SK%202007.PEM.cer
-# Source21-md5:	2b1a2a77f565d68fdf5f19f6cc3a5600
+Source14:	http://www.certum.pl/CTNCA.pem
+# Source14-md5:	231b5b8bf05c5e93a9b2ebc4186eb6f7
+Source15:	http://repository.certum.pl/class1casha2.pem
+# Source15-md5:	b52dde6e2618a21965afbe6d6676d09f
+Source16:	http://repository.certum.pl/dvcasha2.pem
+# Source16-md5:	88ce64a84375c95ab6f7c8515dd2a117
+Source17:	http://repository.certum.pl/ovcasha2.pem
+# Source17-md5:	3149c923bd23469d6b14caa6334f8b63
+Source18:	http://repository.certum.pl/evcasha2.pem
+# Source18-md5:	ac54dc6cf3af7e243879b1c8b4aca8a3
+#Source19:	http://repository.certum.pl/dvcasha2.pem
+## Source19-md5:	88ce64a84375c95ab6f7c8515dd2a117
+Source20:	http://repository.certum.pl/gscasha2.pem
+# Source20-md5:	a29d37f95dafc08cef36015922e3b0d3
+Source23:	http://crt.tcs.terena.org/TERENAPersonalCA.crt
+# Source23-md5:	53eaa497c8fb0b79f14fe9f69693689a
+Source24:	http://crt.tcs.terena.org/TERENAeSciencePersonalCA.crt
+# Source24-md5:	e25cc655d3ebe920ca9c187e3dde9191
+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
 Patch0:		%{name}-undebianize.patch
 Patch1:		%{name}-more-certs.patch
 Patch2:		%{name}-etc-certs.patch
-Patch3:		%{name}-c_rehash.sh.patch
-Patch4:		%{name}-endline.patch
-Patch5:		%{name}-mozilla.patch
-Patch6:		%{name}-DESTDIR.patch
-URL:		http://www.cacert.org/
+
+Patch5:		%{name}-DESTDIR.patch
+Patch6:		%{name}.d.patch
+Patch7:		no-openssl-rehash.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
+BuildRequires:	tar >= 1:1.22
 BuildRequires:	unzip
+BuildRequires:	xz
 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.
@@ -93,7 +90,7 @@ Group:		Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	mktemp
 %if "%{pld_release}" == "ac"
-Requires:	openssl-tools >= 0.9.7m-2
+Requires:	openssl-tools >= 0.9.7m-6.3
 %else
 Requires:	openssl-tools >= 0.9.8i-3
 %endif
@@ -105,74 +102,61 @@ Script and data for updating CA Certificates database.
 Skrypt i dane do odświeżania bazy certyfikatów CA.
 
 %prep
-%setup -q
+%setup -qc
+cd work
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
 %patch5 -p1
 %patch6 -p1
+%patch7 -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')
-	cp "$f" "thawte/$(basename "$ff" .pem).crt"
-done
-
 install -d certum
-cp -a %{SOURCE2} certum
-cp -a %{SOURCE3} certum
-cp -a %{SOURCE4} certum
-cp -a %{SOURCE5} certum
-cp -a %{SOURCE6} certum
-cp -a %{SOURCE7} certum
-cp -a %{SOURCE8} certum
-cp -a %{SOURCE9} certum
-cp -a %{SOURCE10} certum
-cp -a %{SOURCE11} certum
-cp -a %{SOURCE12} certum
-cp -a %{SOURCE13} certum
+cp -pi %{SOURCE2} certum
+cp -pi %{SOURCE14} certum
+cp -pi %{SOURCE15} certum
+cp -pi %{SOURCE16} certum
+cp -pi %{SOURCE17} certum
+cp -pi %{SOURCE18} certum
+#cp -pi %{SOURCE19} certum
+cp -pi %{SOURCE20} certum
 for a in certum/*.pem; do
-	mv "$a" "${a%.pem}.crt"
+	mv -i "$a" "${a%.pem}.crt"
 done
 
-install -d terena
-openssl x509 -inform DER -in %{SOURCE14} -outform PEM -out terena/$(basename %{SOURCE14})
-openssl x509 -inform DER -in %{SOURCE15} -outform PEM -out terena/$(basename %{SOURCE15})
-openssl x509 -inform DER -in %{SOURCE16} -outform PEM -out terena/$(basename %{SOURCE16})
-openssl x509 -inform DER -in %{SOURCE17} -outform PEM -out terena/$(basename %{SOURCE17})
-openssl x509 -inform DER -in %{SOURCE18} -outform PEM -out terena/$(basename %{SOURCE18})
-
-# http://www.sk.ee/pages.php/0203040502#Root_certificates
-# JUUR-SK, ESTEID-SK and ESTEID-SK 2007
+# http://www.sk.ee/en/Repository/certs/rootcertificates
+# ESTEID-SK 2011
 install -d esteid
-cp -a %{SOURCE19} esteid
-cp -a %{SOURCE20} esteid
-cp -a %{SOURCE21} esteid/ESTEID-SK_2007.crt
-for a in esteid/*.PEM.cer; do
-	mv "$a" "${a%.PEM.cer}.crt"
-done
+cp -pi %{SOURCE29} esteid/ESTEID-SK_2011.crt
 
 %build
+cd work
+install -d terena
+openssl x509 -inform DER -in %{SOURCE23} -outform PEM -out terena/$(basename %{SOURCE23})
+openssl x509 -inform DER -in %{SOURCE24} -outform PEM -out terena/$(basename %{SOURCE24})
+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}*.crt
+%{__rm} mozilla/Certum*.crt
 
 # See TODO
-# rm mozilla/RSA_Security_1024_v3.crt
+# %{__rm} mozilla/RSA_Security_1024_v3.crt
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir}}
-
+cd work
+install -d $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sbindir},%{certsdir},/etc/pki/tls/certs,%{_sysconfdir}/ca-certificates.d}
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
@@ -188,18 +172,58 @@ install -d $RPM_BUILD_ROOT%{openssldir}
 ./sbin/update-ca-certificates --destdir $RPM_BUILD_ROOT
 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
+
+# The Debian path might be hard-coded in some binaries we cannot fix
+# like the Steam client
+install -d $RPM_BUILD_ROOT/etc/ssl/certs
+ln -s %{certsdir}/ca-certificates.crt $RPM_BUILD_ROOT/etc/ssl/certs
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post update
 %{_sbindir}/update-ca-certificates --fresh || :
 
+%postun update
+/usr/bin/find "%{openssldir}" -xtype l -delete || :
+
+%pretrans
+if [ -L /etc/ssl/certs ]; then
+	rm -f /etc/ssl/certs
+fi
+
 %files
 %defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) %{certsdir}/ca-certificates.crt
+%doc work/debian/{README.Debian,changelog}
+%dir /etc/pki/tls
+%dir /etc/pki/tls/certs
+%dir /etc/ssl
+%dir /etc/ssl/certs
+/etc/ssl/certs/ca-certificates.crt
+%config(noreplace) %verify(not md5 mtime size) /etc/pki/tls/certs/ca-bundle.crt
+%verify(not md5 mtime size) %{certsdir}/ca-certificates.crt
 
 %files update
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/update-ca-certificates
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ca-certificates.conf
+%dir %{_sysconfdir}/ca-certificates.d
 %{_datadir}/ca-certificates