- restored pre-2.6 VM_ sysctls (requires latest gkh to compile)

[packages/strace.git] / strace-linux.patch

diff --git a/strace-linux.patch b/strace-linux.patch
index 9c811fc677a7be40aefaa9a299313469846eb92b..02dba590f51a119e51f186d774d0cc7af3fb22ed 100644 (file)
--- a/strace-linux.patch
+++ b/strace-linux.patch
@@ -1,22 +1,40 @@
-diff -ur strace-4.2.orig/system.c strace-4.2/system.c
---- strace-4.2.orig/system.c   Thu Dec 23 15:20:15 1999
-+++ strace-4.2/system.c        Sat Feb 12 19:46:51 2000
-@@ -72,6 +72,8 @@
- #include <linux/sysctl.h>
- #endif
+diff -urN strace-4.2.org/Makefile.in strace-4.2/Makefile.in
+--- strace-4.2.org/Makefile.in Sun Nov  5 17:56:54 2000
++++ strace-4.2/Makefile.in     Sun Nov  5 17:57:02 2000
+@@ -39,8 +39,9 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ 
+-bindir = $(exec_prefix)/bin
+-man1dir = $(prefix)/man/man1
++bindir = @bindir@
++mandir = @mandir@
++man1dir = $(mandir)/man1
+ man1ext = .1
  
-+#include <linux/version.h>
-+
- static struct xlat mount_flags[] = {
-       { MS_RDONLY,    "MS_RDONLY"     },
-       { MS_NOSUID,    "MS_NOSUID"     },
-@@ -1435,6 +1437,9 @@
+ SHELL = /bin/sh
+diff -urN strace-4.2.org/system.c strace-4.2/system.c
+--- strace-4.2.org/system.c    Sun Nov  5 17:56:54 2000
++++ strace-4.2/system.c        Sun Nov  5 17:57:02 2000
+@@ -1435,6 +1435,9 @@
        { KERN_PROF, "KERN_PROF" },
        { KERN_NODENAME, "KERN_NODENAME" },
        { KERN_DOMAINNAME, "KERN_DOMAINNAME" },
-+#if LINUX_VERSION_CODE >= 131595
++#ifdef KERN_CAP_BSET
 +      { KERN_CAP_BSET, "KERN_CAP_BSET" },
 +#endif
  #ifdef KERN_SECURELVL
        { KERN_SECURELVL, "KERN_SECURELVL" },
  #endif
+diff -urN strace-4.2.org/time.c strace-4.2/time.c
+--- strace-4.2.org/time.c      Sun Nov  5 17:56:54 2000
++++ strace-4.2/time.c  Sun Nov  5 17:57:15 2000
+@@ -33,7 +33,7 @@
+ 
+ #ifdef LINUX
+ #include <linux/version.h>
+-#include <linux/timex.h>
++#include <sys/timex.h>
+ #endif /* LINUX */
+ 
+ void