Accepting request 180429 from Base:System

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

OBS-URL: https://build.opensuse.org/request/show/180429
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/p11-kit?expand=0&rev=16

p11-kit-0.18.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9aab2385a012b4ce9d04d0713c6d34cbc0c424dd4d12a5ec44b6b57464f090df
-size 974359

p11-kit-0.19.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:94fbed372c11d0a404762aad966e54eb4f44c1d5b871a1b79a1a3b4cf36ed256
+size 1026230

p11-kit.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Jun 19 09:24:45 UTC 2013 - lnussel@suse.de
+
+- use /etc/pki/trust and /usr/share/pki/trust as system CA
+  certificate store
+
+-------------------------------------------------------------------
+Mon May 27 14:40:57 UTC 2013 - dimstar@opensuse.org
+
+- Update to version 0.19.1:
+  + Refactor API to be able to handle managed modules.
+  + Deprecate much of old p11-kit API.
+  + Implement concept of managed modules.
+  + Make C_CloseAllSessions function work for multiple callers.
+  + New dependency on libffi.
+  + Fix possible threading problems reported by hellgrind.
+  + Add log-calls option.
+  + Mark p11_kit_message() as a stable function.
+  + Use our own unit testing framework.
+- Add pkgconfig(libffi) BuildRequires: new dependency.
+
 -------------------------------------------------------------------
 Tue May 14 18:27:52 UTC 2013 - dimstar@opensuse.org
 

p11-kit.spec

@@ -16,8 +16,13 @@
 #
 
 
+%define pkidir_cfg     %{_sysconfdir}/pki
+%define pkidir_static  %{_datadir}/pki
+%define trustdir_cfg     %{pkidir_cfg}/trust
+%define trustdir_static  %{pkidir_static}/trust
+
 Name:           p11-kit
-Version:        0.18.2
+Version:        0.19.1
 Release:        0
 Summary:        Library to work with PKCS#11 modules
 License:        BSD-3-Clause
@@ -25,8 +30,8 @@ Group:          Development/Libraries/C and C++
 Url:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        http://p11-glue.freedesktop.org/releases/%{name}-%{version}.tar.gz
 Source99:       baselibs.conf
-BuildRequires:  ca-certificates
 BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(libffi) >= 3.0.0
 BuildRequires:  pkgconfig(libtasn1) >= 2.3
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -67,11 +72,14 @@ such a way that they're discoverable.
 %setup -q
 
 %build
-%configure --with-system-anchors=/etc/ca-certificates
+%configure %--with-trust-paths=%{trustdir_static}:%{trustdir_cfg}
 make %{?_smp_mflags}
 
 %install
 %make_install
+#
+install -d m 755 %{buildroot}%{trustdir_cfg}/{anchors,blacklist}
+install -d m 755 %{buildroot}%{trustdir_static}/{anchors,blacklist}
 # Create pkcs11 config directory
 test ! -e %{buildroot}%{_sysconfdir}/pkcs11/modules
 install -d %{buildroot}%{_sysconfdir}/pkcs11/modules
@@ -80,6 +88,15 @@ install -d %{buildroot}%{_sysconfdir}/pkcs11/modules
 # the file as documentation file.
 rm %{buildroot}%{_sysconfdir}/pkcs11/pkcs11.conf.example
 find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print
+#
+install -d -m 755 %{buildroot}/etc/rpm/
+cat <<'FIN' >%{buildroot}/etc/rpm/macros.%{name}
+# Macros from %{name} package
+%%pkidir_cfg             %{pkidir_cfg}
+%%pkidir_static          %{pkidir_static}
+%%trustdir_cfg           %{trustdir_cfg}
+%%trustdir_static        %{trustdir_static}
+FIN
 
 %clean
 rm -rf %{buildroot}
@@ -93,6 +110,14 @@ rm -rf %{buildroot}
 %dir %{_libdir}/pkcs11
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/modules
+%dir %{pkidir_cfg}
+%dir %{trustdir_cfg}
+%dir %{trustdir_cfg}/anchors
+%dir %{trustdir_cfg}/blacklist
+%dir %{pkidir_static}
+%dir %{trustdir_static}
+%dir %{trustdir_static}/anchors
+%dir %{trustdir_static}/blacklist
 %{_datadir}/%{name}/modules/p11-kit-trust.module
 %{_libdir}/pkcs11/p11-kit-trust.so
 %dir %{_libdir}/%{name}
@@ -115,6 +140,7 @@ rm -rf %{buildroot}
 
 %files devel
 %defattr(-,root,root)
+%config /etc/rpm/macros.%{name}
 %{_includedir}/p11-kit-1/
 %{_libdir}/libp11-kit.so
 %{_libdir}/pkgconfig/p11-kit-1.pc