From b440f242857fc4f1e94bd8a4f47e14414d857120 Mon Sep 17 00:00:00 2001
From: Stef Walter <stefw@gnome.org>
Date: Tue, 26 Mar 2013 16:36:03 +0100
Subject: [PATCH] Update to 0.17.5 upstream, and distribute a custom
 p11-kit-extract-trust

---
 p11-kit-extract-trust | 11 +++++++++++
 p11-kit.spec          | 15 ++++++++++++---
 sources               |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100755 p11-kit-extract-trust

diff --git a/p11-kit-extract-trust b/p11-kit-extract-trust
new file mode 100755
index 0000000..2529473
--- /dev/null
+++ b/p11-kit-extract-trust
@@ -0,0 +1,11 @@
+#!/usr/bin/bash
+
+set -e
+
+if test "$UID" != "0"; then
+	echo "p11-kit: the 'extract-trust' command must be run as root" >&2
+	exit 2
+fi
+
+exec /usr/bin/update-ca-trust
+
diff --git a/p11-kit.spec b/p11-kit.spec
index d237d56..c638daa 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,11 +1,12 @@
 Name:           p11-kit
-Version:        0.17.4
+Version:        0.17.5
 Release:        1%{?dist}
 Summary:        Library for loading and sharing PKCS#11 modules
 
 License:        BSD
 URL:            http://p11-glue.freedesktop.org/p11-kit.html
 Source0:        http://p11-glue.freedesktop.org/releases/p11-kit-%{version}.tar.gz
+Source1:	p11-kit-extract-trust
 BuildRequires:  libtasn1-devel >= 2.14
 
 %description
@@ -47,7 +48,6 @@ contains certificate anchors and black lists.
 %prep
 %setup -q
 
-
 %build
 # These paths are the source paths that  come from the plan here:
 # https://fedoraproject.org/wiki/Features/SharedSystemCertificates:SubTasks
@@ -60,6 +60,7 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/modules
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pkcs11/*.la
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/p11-kit/
 # Install the example conf with %%doc instead
 rm $RPM_BUILD_ROOT%{_sysconfdir}/pkcs11/pkcs11.conf.example
 
@@ -107,7 +108,15 @@ fi
 
 
 %changelog
-* Wed Mar 20 2013 Stef Walter <stefw@redhat.com> - 0.17.3-1
+* Thu Mar 28 2013 Stef Walter <stefw@redhat.com> - 0.17.5-1
+- Make 'p11-kit extract-trust' call update-ca-trust
+- Work around 32-bit oveflow of certificate dates
+- Build fixes
+
+* Tue Mar 26 2013 Stef Walter <stefw@redhat.com> - 0.17.4-2
+- Pull in patch from upstream to fix build on ppc (#927394)
+
+* Wed Mar 20 2013 Stef Walter <stefw@redhat.com> - 0.17.4-1
 - Update to upstream version 0.17.4
 
 * Mon Mar 18 2013 Stef Walter <stefw@redhat.com> - 0.17.3-1
diff --git a/sources b/sources
index 736ccd2..84a8d73 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ea2a997b1c7259816f986deca26ab528  p11-kit-0.17.4.tar.gz
+5a32570fb37070435e66cd62028aa47d  p11-kit-0.17.5.tar.gz