From 893699bf687fdb0e6a4c70d9a74aa5dde4f45c14 Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 14 Nov 2006 14:45:20 +0000
Subject: [PATCH] Upgrade strace to 4.5.14 (latest), differentiate sigcontext
 when we have 2.4 or 2.6 kernel (#959), should also fix #668

SVN-Revision: 5531
---
 utils/strace/Makefile                          |  4 ++--
 utils/strace/patches/01-linux_sigcontext.patch | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 utils/strace/patches/01-linux_sigcontext.patch

diff --git a/utils/strace/Makefile b/utils/strace/Makefile
index 62cc4ca152..b3a9d90e78 100644
--- a/utils/strace/Makefile
+++ b/utils/strace/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=strace
-PKG_VERSION:=4.5.11
+PKG_VERSION:=4.5.14
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/strace
-PKG_MD5SUM:=28335e15c83456a3db055a0a0efcb4fe
+PKG_MD5SUM:=09bcd5d00ece28f8154dec11cadfce3c
 PKG_CAT:=bzcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
diff --git a/utils/strace/patches/01-linux_sigcontext.patch b/utils/strace/patches/01-linux_sigcontext.patch
new file mode 100644
index 0000000000..5e98c44dc7
--- /dev/null
+++ b/utils/strace/patches/01-linux_sigcontext.patch
@@ -0,0 +1,14 @@
+--- strace-4.5.11/signal.c	2005-02-02 05:16:54.000000000 +0100
++++ strace-4.5.11.new/signal.c	2006-11-14 15:33:54.000000000 +0100
+@@ -1422,7 +1422,11 @@
+ 		if (umove(tcp, sp, &sc) < 0)
+ 		  	return 0;
+ 		tcp->u_arg[0] = 1;
++#ifdef LINUX_2_4
+ 		tcp->u_arg[1] = sc.sc_sigset;
++#else
++		tcp->u_arg[1] = sc.sc_hi2;
++#endif
+ 	} else {
+ 	  	tcp->u_rval = tcp->u_error = 0;
+ 		if(tcp->u_arg[0] == 0)
-- 
2.30.2