4 files changed, 43 insertions, 34 deletions
diff --git a/patches/strace/4.5.18/120-fix-arm-bad-syscall.patch b/patches/strace/4.5.18/120-fix-arm-bad-syscall.patch
deleted file mode 100644
index d31b9da2..00000000
--- a/patches/strace/4.5.18/120-fix-arm-bad-syscall.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -dur strace-4.5.16.orig/syscall.c strace-4.5.16/syscall.c
---- strace-4.5.16.orig/syscall.c	2006-12-21 23:13:33.000000000 +0100
-+++ strace-4.5.16/syscall.c	2007-07-14 19:21:44.000000000 +0200
-@@ -1045,6 +1045,15 @@
- 		/*
- 		 * Note: we only deal with only 32-bit CPUs here.
- 		 */
-+
-+		if (!(tcp->flags & TCB_INSYSCALL) &&
-+		    (tcp->flags & TCB_WAITEXECVE)) {
-+			/* caught a fake syscall from the execve's exit */
-+			tcp->flags &= ~TCB_WAITEXECVE;
-+			return 0;
-+		}
-+
-+
- 		if (regs.ARM_cpsr & 0x20) {
- 			/*
- 			 * Get the Thumb-mode system call number
diff --git a/patches/strace/4.5.18/150-undef-CTL_PROC.patch b/patches/strace/4.5.18/150-undef-CTL_PROC.patch
deleted file mode 100644
index 9bbd78c2..00000000
--- a/patches/strace/4.5.18/150-undef-CTL_PROC.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -dur strace-4.5.16.orig/system.c strace-4.5.16/system.c
---- strace-4.5.16.orig/system.c	2007-01-17 00:22:36.000000000 +0100
-+++ strace-4.5.16/system.c	2007-07-14 19:28:41.000000000 +0200
-@@ -1612,7 +1612,9 @@
- 	{ CTL_KERN, "CTL_KERN" },
- 	{ CTL_VM, "CTL_VM" },
- 	{ CTL_NET, "CTL_NET" },
-+#ifdef CTL_PROC
- 	{ CTL_PROC, "CTL_PROC" },
-+#endif
- 	{ CTL_FS, "CTL_FS" },
- 	{ CTL_DEBUG, "CTL_DEBUG" },
- 	{ CTL_DEV, "CTL_DEV" },
diff --git a/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch b/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch
new file mode 100644
index 00000000..e12b4e49
--- /dev/null
+++ b/patches/strace/4.5.18/160-fix-check-for-linux-netlink.patch
@@ -0,0 +1,19 @@
+Dmitry V. Levin [Tue, 3 Nov 2009 16:49:49 +0000]
+
+Fix check for linux/netlink.h on Linux 2.6.32-rc5+
+
+* configure.ac (AC_CHECK_HEADERS): In check for linux/netlink.h, include 
+  sys/socket.h instead of linux/socket.h beforehand.
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,7 +197,7 @@ AC_CHECK_HEADERS([ \
+ ], [], [])
+ AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
+                  [], [], [#include <stddef.h>
+-#include <linux/socket.h>])
++#include <sys/socket.h>])
+ AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
+ AC_CHECK_TYPES([struct sigcontext_struct],,, [#include <signal.h>])
+ AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
diff --git a/patches/strace/4.5.18/100-autoreconf.patch b/patches/strace/4.5.18/900-autoreconf.patch
index 666ef434..cff775fc 100644
--- a/patches/strace/4.5.18/100-autoreconf.patch
+++ b/patches/strace/4.5.18/900-autoreconf.patch
@@ -1,7 +1,20 @@
+diff -ruN strace-4.5.19.orig/config.h.in strace-4.5.19/config.h.in
+--- strace-4.5.19.orig/config.h.in      2009-10-21 19:41:12.000000000 +0200
++++ strace-4.5.19/config.h.in   2010-01-01 10:39:36.000000000 +0100
+@@ -143,6 +143,9 @@
+ /* Define if stat64 is available in asm/stat.h. */
+ #undef HAVE_STAT64
+ 
++/* Define if statfs64 is available in sys/statfs.h or sys/vfs.h. */
++#undef HAVE_STATFS64
++
+ /* Define to 1 if stdbool.h conforms to C99. */
+ #undef HAVE_STDBOOL_H
+ 
 diff -dur strace-4.5.16.orig/configure strace-4.5.16/configure
 --- strace-4.5.16.orig/configure	2007-01-11 23:23:33.000000000 +0100
 +++ strace-4.5.16/configure	2007-07-14 19:18:43.000000000 +0200
-@@ -5808,6 +5777,73 @@
+@@ -5994,6 +5994,73 @@
 
  fi
 
@@ -72,6 +85,15 @@ diff -dur strace-4.5.16.orig/configure strace-4.5.16/configure
 +
 +fi
 +
-
+ 
  { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
  echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+@@ -7580,7 +7647,7 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <stddef.h>
+-#include <linux/socket.h>
++#include <sys/socket.h>
+ 
+ #include <$ac_header>
+ _ACEOF