[med-svn] [fis-gtm] 01/01: Address Bug#884236 fis-gtm FTBFS with linux-libc-dev 4.14.2-1

[Amul Shah]

This is an automated email from the git hooks/post-receive script.

tuskentower-guest pushed a commit to branch master
in repository fis-gtm.

commit 35ac252147f18eb7f82a1385fe409ad3759417ca
Author: Amul Shah <amul.shah at fisglobal.com>
Date:   Wed Jan 3 07:07:19 2018 -0500

    Address Bug#884236 fis-gtm FTBFS with linux-libc-dev 4.14.2-1
---
 debian/changelog                                   |  5 +++
 debian/patches/series                              |  1 +
 .../upstream_fix_for_aio_header_incompatibility    | 46 ++++++++++++++++++++++
 3 files changed, 52 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 16fce8a..88b17a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 fis-gtm (6.3-002-4) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * Switch Build-Depends from libconfig8-dev to libconfig-dev
     Closes: #881368
 
+  [ Amul Shah ]
+  * Address fis-gtm FTBFS with linux-libc-dev 4.14.2-1
+    Closes: #884236
+
  -- Andreas Tille <tille at debian.org>  Mon, 20 Nov 2017 22:49:00 +0100
 
 fis-gtm (6.3-002-3) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 759acc6..f2d359e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ upstream_include_statsdb_symbols_in_libgtmshr
 upstream_gtminstall_enquote
 upstream_disable_autorelink
 upstream_donot_deploy_all_encryption_libs
+upstream_fix_for_aio_header_incompatibility
diff --git a/debian/patches/upstream_fix_for_aio_header_incompatibility b/debian/patches/upstream_fix_for_aio_header_incompatibility
new file mode 100644
index 0000000..36bb00f
--- /dev/null
+++ b/debian/patches/upstream_fix_for_aio_header_incompatibility
@@ -0,0 +1,46 @@
+From: Amul Shah <Amul.Shah at fisglobal.com>
+Forwarded: not-needed
+Summary: Fix Bug#884236: fis-gtm FTBFS with linux-libc-dev 4.14.2-1
+Applied-Upstream: V6.3-003A
+Last-Update: 2018-01-03
+
+--- a/sr_port/gtm_libaio.h
++++ b/sr_port/gtm_libaio.h
+@@ -65,11 +65,21 @@
+ 
+ /* This struct mimics the structure of struct iocb, but adds a few fields
+  * to the end for our own use. See <linux/aio_abi.h>::struct iocb.
++ * Note: that Linux v4.14 typedef'ed aio_rw_flags like so.
++ *	typedef int __bitwise __kernel_rwf_t;
+  */
+ struct aiocb {
+ 	/* kernel-internel structure, mirrors struct iocb */
+ 	__u64	aio_data;
+-	__u32	PADDED(aio_key, aio_reserved1);
++#if defined(__BYTE_ORDER) ? __BYTE_ORDER == __LITTLE_ENDIAN : defined(__LITTLE_ENDIAN)
++	__u32	aio_key;	/* the kernel sets aio_key to the req # */
++	int __bitwise aio_rw_flags;	/* RWF_* flags */
++#elif defined(__BYTE_ORDER) ? __BYTE_ORDER == __BIG_ENDIAN : defined(__BIG_ENDIAN)
++	int __bitwise aio_rw_flags;	/* RWF_* flags */
++	__u32	aio_key;	/* the kernel sets aio_key to the req # */
++#else
++#error edit for your odd byteorder.
++#endif
+ 	__u16	aio_lio_opcode;
+ 	__s16	aio_reqprio;
+ 	__u32	aio_fildes;
+@@ -92,10 +102,12 @@
+ #define IF_LIBAIO(x) x
+ #define IF_LIBAIO_ELSE(x,y) x
+ 
+-/* linux/aio_abi.h provides PADDED to define the above struct, but this collides with
+- * our personal #define which means something completely different.
++#ifdef PADDED
++/* linux/aio_abi.h provides PADDED until Linux v4.14 to define the above struct, but
++ * this collides with our personal #define which means something completely different.
+  */
+ #undef PADDED
++#endif
+ #endif	/* USE_LIBAIO */
+ 
+ #endif	/* GTM_LIBAIO_H_INCLUDED  */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fis-gtm.git