patches: clean up patches for strace 4.5.18

Backport patch for linux/netlink from strace 4.5.19.
Autoreconf changes.

Signed-off-by: Kirill K. Smirnov <kirill.k.smirnov@gmail.com>
This commit is contained in:
Kirill K. Smirnov 2016-09-17 22:50:00 +03:00
parent 2811011dc6
commit d358a2e197
2 changed files with 43 additions and 2 deletions

View File

@ -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>])

View File

@ -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