From 8036a60451f6d4e2978308a507ca6a305f4e672d Mon Sep 17 00:00:00 2001
From: Marc Andre Tanner <mat@brain-dump.org>
Date: Fri, 5 Feb 2010 19:51:11 +0100
Subject: [PATCH] strace: update to v4.5.19

Signed-off-by: Marc Andre Tanner <mat@brain-dump.org>
---
 download.sh                              |  4 ++--
 sources/patches/strace-eabi.patch        | 33 --------------------------------
 sources/patches/strace-linux-2.6.32.diff | 24 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100644 sources/patches/strace-eabi.patch
 create mode 100644 sources/patches/strace-linux-2.6.32.diff

diff --git a/download.sh b/download.sh
index d6fd84a..2176a55 100755
--- a/download.sh
+++ b/download.sh
@@ -78,8 +78,8 @@ URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2 \
 SHA1=8c1745a9b64ffae79f28e25c6fe9a8b96cac86d8 \
 download || dienow
 
-URL=http://downloads.sourceforge.net/project/strace/strace/4.5.18/strace-4.5.18.tar.bz2 \
-SHA1=50081a7201dc240299396f088abe53c07de98e4c \
+URL=http://downloads.sourceforge.net/project/strace/strace/4.5.19/strace-4.5.19.tar.bz2 \
+SHA1=5554c2fd8ffae5c1e2b289b2024aa85a0889c989 \
 download || dienow
 
 URL=http://ftp.gnu.org/gnu/gdb/gdb-7.0.tar.bz2 \
diff --git a/sources/patches/strace-eabi.patch b/sources/patches/strace-eabi.patch
deleted file mode 100644
index 018022a..0000000
--- a/sources/patches/strace-eabi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/linux/arm/syscallent.h
-+++ b/linux/arm/syscallent.h
-@@ -431,7 +431,7 @@
- 	{ 5,	0,	printargs,		"SYS_398"	}, /* 398 */
- 	{ 5,	0,	printargs,		"SYS_399"	}, /* 399 */
- 
--#if SYS_socket_subcall != 400
-+#if defined(SYS_socket_subcall) && (SYS_socket_subcall != 400)
-  #error fix me
- #endif
- 	{ 8,	0,	printargs,		"socket_subcall"}, /* 400 */
-@@ -453,7 +453,7 @@
- 	{ 5,	TN,	sys_sendmsg,		"sendmsg"	}, /* 416 */
- 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
- 
--#if SYS_ipc_subcall != 418
-+#if defined(SYS_ipc_subcall) && (SYS_ipc_subcall != 418)
-  #error fix me
- #endif
- 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 418 */
---- a/system.c
-+++ b/system.c
-@@ -70,10 +70,6 @@
- #include <linux/capability.h>
- #endif
- 
--#ifdef SYS_cacheflush
--#include <asm/cachectl.h>
--#endif
--
- #ifdef HAVE_LINUX_USTNAME_H
- #include <linux/utsname.h>
- #endif
diff --git a/sources/patches/strace-linux-2.6.32.diff b/sources/patches/strace-linux-2.6.32.diff
new file mode 100644
index 0000000..a7c9f88
--- /dev/null
+++ b/sources/patches/strace-linux-2.6.32.diff
@@ -0,0 +1,24 @@
+diff -Nurb strace-4.5.19/configure strace-4.5.19-uClibc-0.9.30.2/configure
+--- strace-4.5.19/configure	2009-10-21 19:41:11.000000000 +0200
++++ strace-4.5.19-uClibc-0.9.30.2/configure	2010-01-29 14:41:35.897738564 +0100
+@@ -5880,7 +5880,7 @@
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h>
+-#include <linux/socket.h>
++#include <sys/socket.h>
+ "
+ eval as_val=\$$as_ac_Header
+    if test "x$as_val" = x""yes; then :
+diff -Nurb strace-4.5.19/configure.ac strace-4.5.19-uClibc-0.9.30.2/configure.ac
+--- strace-4.5.19/configure.ac	2009-10-12 21:54:43.000000000 +0200
++++ strace-4.5.19-uClibc-0.9.30.2/configure.ac	2010-01-29 14:42:02.880738326 +0100
+@@ -258,7 +258,7 @@
+ ], [], [])
+ 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,
+ 		struct sigcontext],,, [#include <signal.h>])
-- 
2.11.4.GIT