From c32332f370091ccf67a330ce43df2177840525a18bf903bad2e5637ceea3a870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 24 Jun 2015 07:39:00 +0000
Subject: [PATCH] Accepting request 313303 from
 home:k0da:branches:devel:libraries:c_c++

- Fix gpg2 tests on BigEndian architectures: s390x ppc64
  libgcrypt-1.6.3-aliasing.patch

OBS-URL: https://build.opensuse.org/request/show/313303
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=73
---
 libgcrypt-1.6.3-aliasing.patch | 177 +++++++++++++++++++++++++++++++++
 libgcrypt.changes              |   6 ++
 libgcrypt.spec                 |   4 +-
 3 files changed, 186 insertions(+), 1 deletion(-)
 create mode 100644 libgcrypt-1.6.3-aliasing.patch

diff --git a/libgcrypt-1.6.3-aliasing.patch b/libgcrypt-1.6.3-aliasing.patch
new file mode 100644
index 0000000..a7aaed7
--- /dev/null
+++ b/libgcrypt-1.6.3-aliasing.patch
@@ -0,0 +1,177 @@
+diff -up libgcrypt-1.6.3/cipher/bufhelp.h.aliasing libgcrypt-1.6.3/cipher/bufhelp.h
+--- libgcrypt-1.6.3/cipher/bufhelp.h.aliasing	2015-02-27 10:54:03.000000000 +0100
++++ libgcrypt-1.6.3/cipher/bufhelp.h	2015-03-13 15:03:43.301749751 +0100
+@@ -80,7 +80,7 @@ do_bytes:
+   for (; len; len--)
+     *dst++ = *src++;
+ #endif /*__GNUC__ >= 4 && (__x86_64__ || __i386__)*/
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ 
+ /* Optimized function for buffer xoring */
+@@ -117,7 +117,7 @@ do_bytes:
+   /* Handle tail.  */
+   for (; len; len--)
+     *dst++ = *src1++ ^ *src2++;
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ 
+ /* Optimized function for buffer xoring with two destination buffers.  Used
+@@ -155,7 +155,7 @@ do_bytes:
+   /* Handle tail.  */
+   for (; len; len--)
+     *dst1++ = (*dst2++ ^= *src++);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ 
+ /* Optimized function for combined buffer xoring and copying.  Used by mainly
+@@ -208,7 +208,7 @@ do_bytes:
+       *dst_xor++ = *srcdst_cpy ^ *src_xor++;
+       *srcdst_cpy++ = temp;
+     }
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ 
+ /* Optimized function for combined buffer xoring and copying.  Used by mainly
+@@ -234,7 +234,7 @@ buf_eq_const(const void *_a, const void
+     diff -= !!(a[i] - b[i]);
+ 
+   return !diff;
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ 
+ #ifndef BUFHELP_FAST_UNALIGNED_ACCESS
+@@ -246,14 +246,14 @@ static inline u32 buf_get_be32(const voi
+   const byte *in = _buf;
+   return ((u32)in[0] << 24) | ((u32)in[1] << 16) | \
+          ((u32)in[2] << 8) | (u32)in[3];
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline u32 buf_get_le32(const void *_buf)
+ {
+   const byte *in = _buf;
+   return ((u32)in[3] << 24) | ((u32)in[2] << 16) | \
+          ((u32)in[1] << 8) | (u32)in[0];
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_be32(void *_buf, u32 val)
+ {
+@@ -262,7 +262,7 @@ static inline void buf_put_be32(void *_b
+   out[1] = val >> 16;
+   out[2] = val >> 8;
+   out[3] = val;
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_le32(void *_buf, u32 val)
+ {
+@@ -271,7 +271,7 @@ static inline void buf_put_le32(void *_b
+   out[2] = val >> 16;
+   out[1] = val >> 8;
+   out[0] = val;
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ #ifdef HAVE_U64_TYPEDEF
+ /* Functions for loading and storing unaligned u64 values of different
+@@ -283,7 +283,7 @@ static inline u64 buf_get_be64(const voi
+          ((u64)in[2] << 40) | ((u64)in[3] << 32) | \
+          ((u64)in[4] << 24) | ((u64)in[5] << 16) | \
+          ((u64)in[6] << 8) | (u64)in[7];
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline u64 buf_get_le64(const void *_buf)
+ {
+@@ -292,7 +292,7 @@ static inline u64 buf_get_le64(const voi
+          ((u64)in[5] << 40) | ((u64)in[4] << 32) | \
+          ((u64)in[3] << 24) | ((u64)in[2] << 16) | \
+          ((u64)in[1] << 8) | (u64)in[0];
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_be64(void *_buf, u64 val)
+ {
+@@ -305,7 +305,7 @@ static inline void buf_put_be64(void *_b
+   out[5] = val >> 16;
+   out[6] = val >> 8;
+   out[7] = val;
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_le64(void *_buf, u64 val)
+ {
+@@ -318,7 +318,7 @@ static inline void buf_put_le64(void *_b
+   out[2] = val >> 16;
+   out[1] = val >> 8;
+   out[0] = val;
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ #endif /*HAVE_U64_TYPEDEF*/
+ 
+ #else /*BUFHELP_FAST_UNALIGNED_ACCESS*/
+@@ -328,24 +328,24 @@ static inline void buf_put_le64(void *_b
+ static inline u32 buf_get_be32(const void *_buf)
+ {
+   return be_bswap32(*(const u32 *)_buf);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline u32 buf_get_le32(const void *_buf)
+ {
+   return le_bswap32(*(const u32 *)_buf);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_be32(void *_buf, u32 val)
+ {
+   u32 *out = _buf;
+   *out = be_bswap32(val);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_le32(void *_buf, u32 val)
+ {
+   u32 *out = _buf;
+   *out = le_bswap32(val);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ #ifdef HAVE_U64_TYPEDEF
+ /* Functions for loading and storing unaligned u64 values of different
+@@ -353,24 +353,24 @@ static inline void buf_put_le32(void *_b
+ static inline u64 buf_get_be64(const void *_buf)
+ {
+   return be_bswap64(*(const u64 *)_buf);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline u64 buf_get_le64(const void *_buf)
+ {
+   return le_bswap64(*(const u64 *)_buf);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_be64(void *_buf, u64 val)
+ {
+   u64 *out = _buf;
+   *out = be_bswap64(val);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ 
+ static inline void buf_put_le64(void *_buf, u64 val)
+ {
+   u64 *out = _buf;
+   *out = le_bswap64(val);
+-}
++} __attribute__ ((optimize("no-strict-aliasing")))
+ #endif /*HAVE_U64_TYPEDEF*/
+ 
+ #endif /*BUFHELP_FAST_UNALIGNED_ACCESS*/
diff --git a/libgcrypt.changes b/libgcrypt.changes
index 218425e..df924d8 100644
--- a/libgcrypt.changes
+++ b/libgcrypt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun 23 15:15:30 UTC 2015 - dvaleev@suse.com
+
+- Fix gpg2 tests on BigEndian architectures: s390x ppc64 
+  libgcrypt-1.6.3-aliasing.patch
+
 -------------------------------------------------------------------
 Sun Mar  1 21:16:26 UTC 2015 - astieger@suse.com
 
diff --git a/libgcrypt.spec b/libgcrypt.spec
index bb9c499..9dfa001 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libgcrypt
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -68,6 +68,7 @@ Patch31:        libgcrypt-fips-dsa.patch
 Patch32:        libgcrypt-fips_run_selftest_at_constructor.patch
 #PATCH-FIX-SUSE bnc#896202 make ECDSA compliant with FIPS 186-4
 Patch33:        libgcrypt-fips_ecdsa.patch
+Patch34:        libgcrypt-1.6.3-aliasing.patch
 BuildRequires:  automake >= 1.14
 BuildRequires:  libgpg-error-devel >= 1.11
 BuildRequires:  libtool
@@ -170,6 +171,7 @@ understanding of applied cryptography is required to use Libgcrypt.
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
+%patch34 -p1
 %endif
 %patch13 -p1
 %patch14 -p1