From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 27 Mar 2010 08:38:27 +0000 (+0100)
Subject: strace: Update to 4.5.19.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc22686ffb4cb8a8daacf6f3c703ecd828afcdb6;p=ipfire-3.x.git

strace: Update to 4.5.19.

This fixes compiling issues with the current kernel.
---

diff --git a/pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch b/pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch
new file mode 100644
index 000000000..98cfb9535
--- /dev/null
+++ b/pkgs/core/strace/patches/strace-4.5.19-fix-kernel-headers.patch
@@ -0,0 +1,30 @@
+
+From: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560516
+
+This bug is due to linux header changes. The following patch, from
+upstream, fixes the problem:
+
+diff -Nru strace-4.5.19/configure strace-4.5.19/configure
+--- strace-4.5.19/configure	2009-10-21 19:41:11.000000000 +0200
++++ strace-4.5.19/configure	2010-01-26 08:47:33.000000000 +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 -Nru strace-4.5.19/configure.ac strace-4.5.19/configure.ac
+--- strace-4.5.19/configure.ac	2009-10-12 21:54:43.000000000 +0200
++++ strace-4.5.19/configure.ac	2010-01-26 08:47:18.000000000 +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>])
diff --git a/pkgs/core/strace/strace.nm b/pkgs/core/strace/strace.nm
index 2209a0b5f..95ee41ad3 100644
--- a/pkgs/core/strace/strace.nm
+++ b/pkgs/core/strace/strace.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = strace
-PKG_VER        = 4.5.18
+PKG_VER        = 4.5.19
 PKG_REL        = 0
 
 PKG_MAINTAINER =