[p11-kit/f19] Pull in patch from upstream to fix build on ppc

[Stef Walter]

commit 5fe727fd247e024dab8af291b98e4cc410d344d4
Author: Stef Walter <stefw at gnome.org>
Date:   Tue Mar 26 16:36:03 2013 +0100

    Pull in patch from upstream to fix build on ppc
    
    https://bugzilla.redhat.com/show_bug.cgi?id=927394

 ...sting-of-murmur-hash-on-bigendian-systems.patch |   87 ++++++++++++++++++++
 p11-kit.spec                                       |   10 ++-
 2 files changed, 94 insertions(+), 3 deletions(-)
---
diff --git a/0001-Fix-testing-of-murmur-hash-on-bigendian-systems.patch b/0001-Fix-testing-of-murmur-hash-on-bigendian-systems.patch
new file mode 100644
index 0000000..ee3494b
--- /dev/null
+++ b/0001-Fix-testing-of-murmur-hash-on-bigendian-systems.patch
@@ -0,0 +1,87 @@
+From b0e44f8e1e589726c95506da5121e95a54269fd7 Mon Sep 17 00:00:00 2001
+From: Stef Walter <stefw at gnome.org>
+Date: Mon, 25 Mar 2013 21:16:28 +0100
+Subject: [PATCH] Fix testing of murmur hash on bigendian systems
+
+The murmur hash produces different output depending on the architecture
+
+https://bugzilla.redhat.com/show_bug.cgi?id=927394
+---
+ common/tests/test-hash.c | 60 +++++++++++++++++++-----------------------------
+ 1 file changed, 23 insertions(+), 37 deletions(-)
+
+diff --git a/common/tests/test-hash.c b/common/tests/test-hash.c
+index c8694e1..a1cb917 100644
+--- a/common/tests/test-hash.c
++++ b/common/tests/test-hash.c
+@@ -135,44 +135,30 @@ test_md5 (CuTest *cu)
+ static void
+ test_murmur2 (CuTest *cu)
+ {
+-	struct {
+-		const char *input;
+-		const char *input2;
+-		int hash;
+-	} fixtures[] = {
+-		{ "one", NULL, 1910179066 },
+-		{ "two", NULL, 396151652 },
+-		{ "four", NULL, -2034170174 },
+-		{ "seven", NULL, -588341181 },
+-		/* Note that these are identical output */
+-		{ "eleven", NULL, -37856894 },
+-		{ "ele", "ven", -37856894 },
+-		{ NULL },
+-	};
+-
+-	uint32_t first;
+-	uint32_t second;
+-	int i;
++	uint32_t one, two, four, seven, eleven, split;
+ 
+-	assert (sizeof (first) == P11_HASH_MURMUR2_LEN);
+-	for (i = 0; fixtures[i].input != NULL; i++) {
+-		p11_hash_murmur2 ((unsigned char *)&first,
+-		                  fixtures[i].input,
+-		                  strlen (fixtures[i].input),
+-		                  fixtures[i].input2,
+-		                  fixtures[i].input2 ? strlen (fixtures[i].input2) : 0,
+-		                  NULL);
+-
+-		p11_hash_murmur2 ((unsigned char *)&second,
+-		                  fixtures[i].input,
+-		                  strlen (fixtures[i].input),
+-		                  fixtures[i].input2,
+-		                  fixtures[i].input2 ? strlen (fixtures[i].input2) : 0,
+-		                  NULL);
+-
+-		CuAssertIntEquals (cu, fixtures[i].hash, first);
+-		CuAssertIntEquals (cu, fixtures[i].hash, second);
+-	}
++	assert (sizeof (one) == P11_HASH_MURMUR2_LEN);
++
++	p11_hash_murmur2 ((unsigned char *)&one, "one", 3, NULL);
++	p11_hash_murmur2 ((unsigned char *)&two, "two", 3, NULL);
++	p11_hash_murmur2 ((unsigned char *)&four, "four", 4, NULL);
++	p11_hash_murmur2 ((unsigned char *)&seven, "seven", 5, NULL);
++	p11_hash_murmur2 ((unsigned char *)&eleven, "eleven", 6, NULL);
++	p11_hash_murmur2 ((unsigned char *)&split, "ele", 3, "ven", 3, NULL);
++
++	CuAssertTrue (cu, one != two);
++	CuAssertTrue (cu, one != four);
++	CuAssertTrue (cu, one != seven);
++	CuAssertTrue (cu, one != eleven);
++
++	CuAssertTrue (cu, two != four);
++	CuAssertTrue (cu, two != seven);
++	CuAssertTrue (cu, two != eleven);
++
++	CuAssertTrue (cu, four != seven);
++	CuAssertTrue (cu, four != eleven);
++
++	CuAssertTrue (cu, split == eleven);
+ }
+ 
+ static void
+-- 
+1.8.1.4
+
diff --git a/p11-kit.spec b/p11-kit.spec
index d237d56..40b5134 100644
--- a/p11-kit.spec
+++ b/p11-kit.spec
@@ -1,11 +1,12 @@
 Name:           p11-kit
 Version:        0.17.4
-Release:        1%{?dist}
+Release:        2%{?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
 BuildRequires:  libtasn1-devel >= 2.14
 
 %description
@@ -46,7 +47,7 @@ contains certificate anchors and black lists.
 
 %prep
 %setup -q
-
+%patch0 -p1
 
 %build
 # These paths are the source paths that  come from the plan here:
@@ -107,7 +108,10 @@ fi
 
 
 %changelog
-* Wed Mar 20 2013 Stef Walter <stefw at redhat.com> - 0.17.3-1
+* 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)
+
+* Wed Mar 20 2013 Stef Walter <stefw at redhat.com> - 0.17.4-1
 - Update to upstream version 0.17.4
 
 * Mon Mar 18 2013 Stef Walter <stefw at redhat.com> - 0.17.3-1