From f6e85769c9e29fcf18c503603624a2d05b47a151 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 9 Jun 2016 10:05:43 -0400
Subject: [PATCH] strace: Update from 4.11 to 4.12

---
 packages/strace/build.sh    |  4 +---
 packages/strace/mtd.c.patch | 16 +++++-----------
 packages/strace/ubi.c.patch | 12 ++++++++++++
 3 files changed, 18 insertions(+), 14 deletions(-)
 create mode 100644 packages/strace/ubi.c.patch

diff --git a/packages/strace/build.sh b/packages/strace/build.sh
index 94c53d05..2c8ec2f7 100755
--- a/packages/strace/build.sh
+++ b/packages/strace/build.sh
@@ -1,11 +1,9 @@
 TERMUX_PKG_HOMEPAGE=http://sourceforge.net/projects/strace/
 TERMUX_PKG_DESCRIPTION="Debugging utility to monitor the system calls used by a program and all the signals it receives"
-TERMUX_PKG_VERSION=4.11
+TERMUX_PKG_VERSION=4.12
 TERMUX_PKG_SRCURL=http://downloads.sourceforge.net/project/strace/strace/${TERMUX_PKG_VERSION}/strace-${TERMUX_PKG_VERSION}.tar.xz
 TERMUX_PKG_RM_AFTER_INSTALL=bin/strace-graph # This is a perl script
 
-CFLAGS+=" -Du64=uint64_t"
-
 if [ $TERMUX_ARCH_BITS = "64" ]; then
 	# The strace configure script only looks for struct flock64 in <linux/fcntl.h>,
 	# but we actually have it in <fcntl.h> here:
diff --git a/packages/strace/mtd.c.patch b/packages/strace/mtd.c.patch
index 065f4a6d..5ca3f8d6 100644
--- a/packages/strace/mtd.c.patch
+++ b/packages/strace/mtd.c.patch
@@ -1,18 +1,12 @@
-diff -u -r ../strace-4.9/mtd.c ./mtd.c
---- ../strace-4.9/mtd.c	2014-05-30 18:10:21.000000000 -0400
-+++ ./mtd.c	2014-12-21 14:52:21.111659855 -0500
-@@ -30,12 +30,12 @@
+diff -u -r ../strace-4.12/mtd.c ./mtd.c
+--- ../strace-4.12/mtd.c	2016-05-28 15:16:32.000000000 -0400
++++ ./mtd.c	2016-06-09 09:49:02.054555983 -0400
+@@ -32,7 +32,7 @@
  
  /* The mtd api changes quickly, so we have to keep a local copy */
  #include <linux/version.h>
 -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)) || defined __ANDROID__
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) || defined __ANDROID__
  # include "mtd-abi.h"
  #else
  # include <mtd/mtd-abi.h>
- #endif
--#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)) || defined __ANDROID__
- # include "ubi-user.h"
- #else
- # include <mtd/ubi-user.h>
diff --git a/packages/strace/ubi.c.patch b/packages/strace/ubi.c.patch
new file mode 100644
index 00000000..83f7cab5
--- /dev/null
+++ b/packages/strace/ubi.c.patch
@@ -0,0 +1,12 @@
+diff -u -r ../strace-4.12/ubi.c ./ubi.c
+--- ../strace-4.12/ubi.c	2016-05-28 06:29:30.000000000 -0400
++++ ./ubi.c	2016-06-09 09:56:41.495280471 -0400
+@@ -30,7 +30,7 @@
+ 
+ /* The UBI api changes, so we have to keep a local copy */
+ #include <linux/version.h>
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 7, 0) || defined __ANDROID__
+ # include "ubi-user.h"
+ #else
+ # include <mtd/ubi-user.h>
-- 
2.11.0