fate 314991, use p11-kit for system ca-certificate handling

OBS-URL: https://build.opensuse.org/package/show/Base:System/ca-certificates-mozilla?expand=0&rev=34
This commit is contained in:
Ludwig Nussel 2013-06-21 12:48:17 +00:00 committed by Git OBS Bridge
parent 61fece5dc5
commit b9942cd5a7
2 changed files with 15 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Jun 19 09:30:00 UTC 2013 - lnussel@suse.de
- new location of CA certificate anchors is
/usr/share/ca-certificates/anchors
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 3 19:16:01 UTC 2013 - idonmez@suse.com Thu Jan 3 19:16:01 UTC 2013 - idonmez@suse.com

View File

@ -16,12 +16,17 @@
# #
%if 0%{?suse_version} < 1310
%bcond_with trustedcerts %bcond_with trustedcerts
%define trustdir_static %{_datadir}/ca-certificates/mozilla
%else
%bcond_without trustedcerts
BuildRequires: p11-kit-devel
%endif
BuildRequires: openssl BuildRequires: openssl
Name: ca-certificates-mozilla Name: ca-certificates-mozilla
%define sslusrdir %{_datadir}/ca-certificates
Version: 1.85 Version: 1.85
Release: 0 Release: 0
Summary: CA certificates for OpenSSL Summary: CA certificates for OpenSSL
@ -68,7 +73,7 @@ install -m 644 %{S:1} COPYING
perl %{SOURCE1} --trustbits < certdata.txt perl %{SOURCE1} --trustbits < certdata.txt
%install %install
mkdir -p %{buildroot}/%{sslusrdir}/mozilla mkdir -p %{buildroot}/%{trustdir_static}
set +x set +x
for i in *.pem; do for i in *.pem; do
args=() args=()
@ -90,7 +95,7 @@ for i in *.pem; do
{ {
grep '^#' "$i" grep '^#' "$i"
openssl x509 -in "$i" "${args[@]}" openssl x509 -in "$i" "${args[@]}"
} > "%{buildroot}/%{sslusrdir}/mozilla/$i" } > "%{buildroot}/%{trustdir_static}/$i"
done done
set -x set -x
@ -103,6 +108,6 @@ update-ca-certificates || true
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc COPYING %doc COPYING
%{sslusrdir}/mozilla %{trustdir_static}
%changelog %changelog