[p11-kit/f19] Update to 0.17.5 upstream, and distribute a custom p11-kit-extract-trust

Stef Walter stefw at fedoraproject.org
Thu Mar 28 15:32:21 UTC 2013


commit 3b13f417a0d117da8692455eb1322f2f5e31163b
Author: Stef Walter <stefw at gnome.org>
Date:   Thu Mar 28 16:10:03 2013 +0100

    Update to 0.17.5 upstream, and distribute a custom p11-kit-extract-trust

 ...sting-of-murmur-hash-on-bigendian-systems.patch |   87 --------------------
 p11-kit-extract-trust                              |   11 +++
 p11-kit.spec                                       |   13 ++-
 3 files changed, 20 insertions(+), 91 deletions(-)
---
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 40b5134..c638daa 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,12 +1,12 @@
 Name:           p11-kit
-Version:        0.17.4
-Release:        2%{?dist}
+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
-Patch0:		0001-Fix-testing-of-murmur-hash-on-bigendian-systems.patch
+Source1:	p11-kit-extract-trust
 BuildRequires:  libtasn1-devel >= 2.14
 
 %description
@@ -47,7 +47,6 @@ contains certificate anchors and black lists.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 # These paths are the source paths that  come from the plan here:
@@ -61,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
 
@@ -108,6 +108,11 @@ fi
 
 
 %changelog
+* Thu Mar 28 2013 Stef Walter <stefw at 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 at redhat.com> - 0.17.4-2
 - Pull in patch from upstream to fix build on ppc (#927394)
 


More information about the scm-commits mailing list