changeset 953:8e18463c3d71

Update strace to current version.
author Rob Landley <rob@landley.net>
date Sun, 17 Jan 2010 17:26:12 -0600
parents f15bb93793e2
children 5706228c2e6a
files download.sh sources/patches/strace-arm-eabi.patch sources/patches/strace-arm-no-cachectl.patch sources/patches/strace-fixnet.patch
diffstat 4 files changed, 8 insertions(+), 63 deletions(-) [+]
line wrap: on
line diff
--- a/download.sh	Thu Jan 14 23:47:17 2010 -0600
+++ b/download.sh	Sun Jan 17 17:26:12 2010 -0600
@@ -97,8 +97,8 @@
 SHA1=30663e8ff94f13c0553fbfb928adba91814e1b3a \
 download || dienow
 
-URL=http://downloads.sf.net/sourceforge/strace/strace-4.5.18.tar.bz2 \
-SHA1=50081a7201dc240299396f088abe53c07de98e4c \
+URL=http://downloads.sf.net/sourceforge/strace/strace-4.5.19.tar.bz2 \
+SHA1=5554c2fd8ffae5c1e2b289b2024aa85a0889c989 \
 download || dienow
 
 URL=http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2 \
--- a/sources/patches/strace-arm-eabi.patch	Thu Jan 14 23:47:17 2010 -0600
+++ b/sources/patches/strace-arm-eabi.patch	Sun Jan 17 17:26:12 2010 -0600
@@ -1,20 +1,11 @@
 --- 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 */
+@@ -453,7 +453,7 @@
+ 	{ 5,	TN,	sys_recvmsg,		"recvmsg"	}, /* 417 */
+ 	{ 4,	TN,	sys_accept4,		"accept4"	}, /* 418 */
  
--#if SYS_socket_subcall != 400
-+#if defined(SYS_socket_subcall) && (SYS_socket_subcall != 400)
+-#if SYS_ipc_subcall != 419
++#if defined(SYS_ipc_subcall) && (SYS_ipc_subcall != 419)
   #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 */
+ 	{ 4,	0,	printargs,		"ipc_subcall"	}, /* 419 */
--- a/sources/patches/strace-arm-no-cachectl.patch	Thu Jan 14 23:47:17 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-ARM defines SYS_cacheflush, but doesn't have <asm/cachectl.h>
----
- system.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/system.c
-+++ b/system.c
-@@ -70,9 +70,11 @@
- #include <linux/capability.h>
- #endif
- 
-+#ifndef ARM
- #ifdef SYS_cacheflush
- #include <asm/cachectl.h>
- #endif
-+#endif
- 
- #ifdef HAVE_LINUX_USTNAME_H
- #include <linux/utsname.h>
--- a/sources/patches/strace-fixnet.patch	Thu Jan 14 23:47:17 2010 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-The linux/socket.h header was lobotomized in Linux 2.6.32 by
-Ben Hutchings in git 9c501935a3cd (for no readily apparent reason).
-
-diff -ru strace/configure strace2/configure
---- strace/configure	2008-08-28 16:36:06.000000000 -0500
-+++ strace2/configure	2010-01-12 21:26:44.000000000 -0600
-@@ -7580,7 +7580,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- #include <stddef.h>
--#include <linux/socket.h>
-+#include <sys/socket.h>
- 
- #include <$ac_header>
- _ACEOF
-diff -ru strace/configure.ac strace2/configure.ac
---- strace/configure.ac	2008-08-28 16:15:56.000000000 -0500
-+++ strace2/configure.ac	2010-01-12 21:26:28.000000000 -0600
-@@ -196,7 +196,7 @@
- AC_CHECK_HEADERS([sys/reg.h sys/filio.h sys/acl.h sys/asynch.h sys/door.h stropts.h sys/conf.h sys/stream.h sys/tihdr.h sys/tiuser.h sys/sysconfig.h ioctls.h sys/ioctl.h sys/ptrace.h termio.h linux/ptrace.h asm/reg.h sys/uio.h sys/aio.h poll.h sys/poll.h sys/vfs.h asm/sysmips.h linux/utsname.h sys/nscsys.h mqueue.h sys/epoll.h libaio.h inttypes.h], [], [])
- 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>])