From e4d94b871cecdb118aacdcbc22045100c78ec454 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 14 Jul 2007 17:34:54 +0000
Subject: [PATCH] Re-diff strace patches against current version.

---
 ...conf.patch => 100-strace-autoreconf.patch} | 143 +++++++++---------
 ...-strace-dont-use-REG_SYSCALL-for-sh.patch} |   7 +-
 ...h => 200-strace-fix-arm-bad-syscall.patch} |   7 +-
 ...ace-fix-disabled-largefile-syscalls.patch} |   5 +-
 ...> 300-strace-mips-sprintsigmask-fix.patch} |   6 +-
 ....patch => 350-strace-statfs64-check.patch} |  18 +--
 ...atch => 400-strace-superh-update.ac.patch} |   8 +-
 .../4.5.15/450-strace-undef-CTL_PROC.patch    |  13 ++
 ... 500-strace-undef-PACKET_MEMBERSHIP.patch} |   5 +-
 ...l.patch => 550-strace-undef-syscall.patch} |  38 ++---
 .../strace/4.5.15/strace-undef-CTL_PROC.patch |  12 --
 11 files changed, 134 insertions(+), 128 deletions(-)
 rename patches/strace/4.5.15/{strace-autoreconf.patch => 100-strace-autoreconf.patch} (84%)
 rename patches/strace/4.5.15/{strace-dont-use-REG_SYSCALL-for-sh.patch => 150-strace-dont-use-REG_SYSCALL-for-sh.patch} (70%)
 rename patches/strace/4.5.15/{strace-fix-arm-bad-syscall.patch => 200-strace-fix-arm-bad-syscall.patch} (62%)
 rename patches/strace/4.5.15/{strace-fix-disabled-largefile-syscalls.patch => 250-strace-fix-disabled-largefile-syscalls.patch} (68%)
 rename patches/strace/4.5.15/{strace-mips-sprintsigmask-fix.patch => 300-strace-mips-sprintsigmask-fix.patch} (57%)
 rename patches/strace/4.5.15/{strace-statfs64-check.patch => 350-strace-statfs64-check.patch} (70%)
 rename patches/strace/4.5.15/{strace-superh-update.ac.patch => 400-strace-superh-update.ac.patch} (64%)
 create mode 100644 patches/strace/4.5.15/450-strace-undef-CTL_PROC.patch
 rename patches/strace/4.5.15/{strace-undef-PACKET_MEMBERSHIP.patch => 500-strace-undef-PACKET_MEMBERSHIP.patch} (67%)
 rename patches/strace/4.5.15/{strace-undef-syscall.patch => 550-strace-undef-syscall.patch} (77%)
 delete mode 100644 patches/strace/4.5.15/strace-undef-CTL_PROC.patch

diff --git a/patches/strace/4.5.15/strace-autoreconf.patch b/patches/strace/4.5.15/100-strace-autoreconf.patch
similarity index 84%
rename from patches/strace/4.5.15/strace-autoreconf.patch
rename to patches/strace/4.5.15/100-strace-autoreconf.patch
index 1b587833..5ffda828 100644
--- a/patches/strace/4.5.15/strace-autoreconf.patch
+++ b/patches/strace/4.5.15/100-strace-autoreconf.patch
@@ -1,6 +1,7 @@
---- strace-4.5.15.orig/configure	2007-01-29 17:23:38.000000000 +0100
-+++ strace-4.5.15/configure	2007-01-29 17:46:54.000000000 +0100
-@@ -956,7 +956,7 @@ esac
+diff -dur strace-4.5.15.orig/configure strace-4.5.15/configure
+--- strace-4.5.15.orig/configure	2007-01-11 23:23:33.000000000 +0100
++++ strace-4.5.15/configure	2007-07-14 19:18:43.000000000 +0200
+@@ -956,7 +956,7 @@
      else
        echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
      fi
@@ -9,7 +10,7 @@
    done
  fi
  
-@@ -2660,8 +2660,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2660,8 +2660,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -19,7 +20,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2719,8 +2718,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2719,8 +2718,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -29,7 +30,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2836,8 +2834,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2836,8 +2834,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -39,7 +40,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2891,8 +2888,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2891,8 +2888,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -49,7 +50,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2937,8 +2933,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2937,8 +2933,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -59,7 +60,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2982,8 +2977,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2982,8 +2977,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -69,7 +70,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3721,8 +3715,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -3721,8 +3715,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -79,7 +80,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3786,8 +3779,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -3786,8 +3779,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -89,7 +90,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -3959,8 +3951,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -3959,8 +3951,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -99,7 +100,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4032,8 +4023,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4032,8 +4023,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -109,7 +110,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4087,8 +4077,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4087,8 +4077,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -119,7 +120,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4159,8 +4148,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4159,8 +4148,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -129,7 +130,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4214,8 +4202,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -4214,8 +4202,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -139,7 +140,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4345,8 +4332,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4345,8 +4332,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -149,7 +150,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4410,8 +4396,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4410,8 +4396,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -159,7 +160,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4454,8 +4439,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4454,8 +4439,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -169,7 +170,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4519,8 +4503,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4519,8 +4503,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -179,7 +180,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4563,8 +4546,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4563,8 +4546,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -189,7 +190,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4628,8 +4610,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4628,8 +4610,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -199,7 +200,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4672,8 +4653,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4672,8 +4653,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -209,7 +210,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4737,8 +4717,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4737,8 +4717,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -219,7 +220,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4781,8 +4760,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4781,8 +4760,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -229,7 +230,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4846,8 +4824,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4846,8 +4824,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -239,7 +240,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4890,8 +4867,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4890,8 +4867,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -249,7 +250,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4955,8 +4931,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4955,8 +4931,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -259,7 +260,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -4999,8 +4974,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4999,8 +4974,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -269,7 +270,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5064,8 +5038,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5064,8 +5038,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -279,7 +280,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5108,8 +5081,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5108,8 +5081,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -289,7 +290,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5173,8 +5145,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5173,8 +5145,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -299,7 +300,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5217,8 +5188,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5217,8 +5188,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -309,7 +310,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5286,8 +5256,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5286,8 +5256,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -319,7 +320,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5320,6 +5289,73 @@ _ACEOF
+@@ -5320,6 +5289,73 @@
  
  fi
  
@@ -393,7 +394,7 @@
  
  echo "$as_me:$LINENO: checking return type of signal handlers" >&5
  echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
-@@ -5360,8 +5396,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5360,8 +5396,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -403,7 +404,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5460,8 +5495,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5460,8 +5495,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -413,7 +414,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5610,8 +5644,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -5610,8 +5644,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -423,7 +424,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5668,8 +5701,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5668,8 +5701,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -433,7 +434,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5816,8 +5848,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5816,8 +5848,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -443,7 +444,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -5968,8 +5999,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -5968,8 +5999,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -453,7 +454,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6033,8 +6063,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6033,8 +6063,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -463,7 +464,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6100,8 +6129,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6100,8 +6129,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -473,7 +474,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6147,8 +6175,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6147,8 +6175,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -483,7 +484,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6214,8 +6241,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6214,8 +6241,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -493,7 +494,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6466,8 +6492,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6466,8 +6492,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -503,7 +504,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6532,8 +6557,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6532,8 +6557,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -513,7 +514,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6600,8 +6624,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6600,8 +6624,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -523,7 +524,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6717,8 +6740,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
+@@ -6717,8 +6740,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -533,7 +534,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6812,8 +6834,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6812,8 +6834,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -543,7 +544,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -6959,8 +6980,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -6959,8 +6980,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -553,7 +554,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7020,8 +7040,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7020,8 +7040,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -563,7 +564,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7082,8 +7101,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7082,8 +7101,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -573,7 +574,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7356,8 +7374,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7356,8 +7374,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -583,7 +584,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7401,8 +7418,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7401,8 +7418,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -593,7 +594,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7471,8 +7487,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7471,8 +7487,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -603,7 +604,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7539,8 +7554,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7539,8 +7554,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -613,7 +614,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7585,8 +7599,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7585,8 +7599,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -623,7 +624,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7652,8 +7665,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7652,8 +7665,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -633,7 +634,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7698,8 +7710,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7698,8 +7710,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -643,7 +644,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7767,8 +7778,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7767,8 +7778,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -653,7 +654,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7834,8 +7844,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7834,8 +7844,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -663,7 +664,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7899,8 +7908,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7899,8 +7908,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -673,7 +674,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -7966,8 +7974,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -7966,8 +7974,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -683,7 +684,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8032,8 +8039,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -8032,8 +8039,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -693,7 +694,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8077,8 +8083,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -8077,8 +8083,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -703,7 +704,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8145,8 +8150,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -8145,8 +8150,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -713,7 +714,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8218,8 +8222,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -8218,8 +8222,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -723,7 +724,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -8289,8 +8292,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -8289,8 +8292,7 @@
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } &&
@@ -733,7 +734,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -9293,11 +9295,6 @@ esac
+@@ -9293,11 +9295,6 @@
    *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
    esac
  
@@ -745,7 +746,7 @@
    # Let's still pretend it is `configure' which instantiates (i.e., don't
    # use $as_me), people would be surprised to read:
    #    /* config.h.  Generated by config.status.  */
-@@ -9336,6 +9333,12 @@ echo "$as_me: error: cannot find input f
+@@ -9336,6 +9333,12 @@
  	 fi;;
        esac
      done` || { (exit 1); exit 1; }
diff --git a/patches/strace/4.5.15/strace-dont-use-REG_SYSCALL-for-sh.patch b/patches/strace/4.5.15/150-strace-dont-use-REG_SYSCALL-for-sh.patch
similarity index 70%
rename from patches/strace/4.5.15/strace-dont-use-REG_SYSCALL-for-sh.patch
rename to patches/strace/4.5.15/150-strace-dont-use-REG_SYSCALL-for-sh.patch
index 9030ecc3..8add4459 100644
--- a/patches/strace/4.5.15/strace-dont-use-REG_SYSCALL-for-sh.patch
+++ b/patches/strace/4.5.15/150-strace-dont-use-REG_SYSCALL-for-sh.patch
@@ -1,6 +1,7 @@
---- strace/process.c
-+++ strace/process.c
-@@ -2663,7 +2663,6 @@ const struct xlat struct_user_offsets[] 
+diff -dur strace-4.5.15.orig/process.c strace-4.5.15/process.c
+--- strace-4.5.15.orig/process.c	2007-01-11 23:08:38.000000000 +0100
++++ strace-4.5.15/process.c	2007-07-14 19:19:58.000000000 +0200
+@@ -2679,7 +2679,6 @@
         { 4*REG_GBR,            "4*REG_GBR"                             },
         { 4*REG_MACH,           "4*REG_MACH"                            },
         { 4*REG_MACL,           "4*REG_MACL"                            },
diff --git a/patches/strace/4.5.15/strace-fix-arm-bad-syscall.patch b/patches/strace/4.5.15/200-strace-fix-arm-bad-syscall.patch
similarity index 62%
rename from patches/strace/4.5.15/strace-fix-arm-bad-syscall.patch
rename to patches/strace/4.5.15/200-strace-fix-arm-bad-syscall.patch
index d7d7426b..aa4c5c42 100644
--- a/patches/strace/4.5.15/strace-fix-arm-bad-syscall.patch
+++ b/patches/strace/4.5.15/200-strace-fix-arm-bad-syscall.patch
@@ -1,6 +1,7 @@
---- strace-4.5.12-orig/syscall.c	2005-06-08 21:45:28.000000000 +0100
-+++ strace-4.5.12/syscall.c	2005-10-25 19:26:39.000000000 +0100
-@@ -1013,6 +1013,15 @@ struct tcb *tcp;
+diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
+--- strace-4.5.15.orig/syscall.c	2006-12-21 23:13:33.000000000 +0100
++++ strace-4.5.15/syscall.c	2007-07-14 19:21:44.000000000 +0200
+@@ -1045,6 +1045,15 @@
  		/*
  		 * Note: we only deal with only 32-bit CPUs here.
  		 */
diff --git a/patches/strace/4.5.15/strace-fix-disabled-largefile-syscalls.patch b/patches/strace/4.5.15/250-strace-fix-disabled-largefile-syscalls.patch
similarity index 68%
rename from patches/strace/4.5.15/strace-fix-disabled-largefile-syscalls.patch
rename to patches/strace/4.5.15/250-strace-fix-disabled-largefile-syscalls.patch
index bd331f98..22903cdb 100644
--- a/patches/strace/4.5.15/strace-fix-disabled-largefile-syscalls.patch
+++ b/patches/strace/4.5.15/250-strace-fix-disabled-largefile-syscalls.patch
@@ -1,5 +1,6 @@
---- strace-4.5.15.orig/syscall.c	2007-01-29 17:23:38.000000000 +0100
-+++ strace-4.5.15/syscall.c	2007-01-29 18:02:17.000000000 +0100
+diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
+--- strace-4.5.15.orig/syscall.c	2007-07-14 19:21:44.000000000 +0200
++++ strace-4.5.15/syscall.c	2007-07-14 19:22:49.000000000 +0200
 @@ -125,6 +125,18 @@
  #define TP TRACE_PROCESS
  #define TS TRACE_SIGNAL
diff --git a/patches/strace/4.5.15/strace-mips-sprintsigmask-fix.patch b/patches/strace/4.5.15/300-strace-mips-sprintsigmask-fix.patch
similarity index 57%
rename from patches/strace/4.5.15/strace-mips-sprintsigmask-fix.patch
rename to patches/strace/4.5.15/300-strace-mips-sprintsigmask-fix.patch
index ad0ad1ff..e2aaa408 100644
--- a/patches/strace/4.5.15/strace-mips-sprintsigmask-fix.patch
+++ b/patches/strace/4.5.15/300-strace-mips-sprintsigmask-fix.patch
@@ -1,6 +1,6 @@
-diff -ur strace-4.5.15/signal.c strace-4.5.15-patched/signal.c
---- strace-4.5.15/signal.c	2007-01-11 16:08:38.000000000 -0600
-+++ strace-4.5.15-patched/signal.c	2007-02-06 20:49:34.714320249 -0600
+diff -dur strace-4.5.15.orig/signal.c strace-4.5.15/signal.c
+--- strace-4.5.15.orig/signal.c	2007-01-11 23:08:38.000000000 +0100
++++ strace-4.5.15/signal.c	2007-07-14 19:24:43.000000000 +0200
 @@ -1440,7 +1440,7 @@
  	  	tcp->u_rval = tcp->u_error = 0;
  		if(tcp->u_arg[0] == 0)
diff --git a/patches/strace/4.5.15/strace-statfs64-check.patch b/patches/strace/4.5.15/350-strace-statfs64-check.patch
similarity index 70%
rename from patches/strace/4.5.15/strace-statfs64-check.patch
rename to patches/strace/4.5.15/350-strace-statfs64-check.patch
index 833c9794..a1d8e5fb 100644
--- a/patches/strace/4.5.15/strace-statfs64-check.patch
+++ b/patches/strace/4.5.15/350-strace-statfs64-check.patch
@@ -1,7 +1,7 @@
-diff -dup strace-4.5.15.orig/acinclude.m4 strace-4.5.15/acinclude.m4
+diff -dur strace-4.5.15.orig/acinclude.m4 strace-4.5.15/acinclude.m4
 --- strace-4.5.15.orig/acinclude.m4	2004-04-14 04:21:01.000000000 +0200
-+++ strace-4.5.15/acinclude.m4	2007-01-29 17:31:37.000000000 +0100
-@@ -210,6 +210,26 @@ then
++++ strace-4.5.15/acinclude.m4	2007-07-14 19:25:25.000000000 +0200
+@@ -210,6 +210,26 @@
  fi
  ])
  
@@ -28,10 +28,10 @@ diff -dup strace-4.5.15.orig/acinclude.m4 strace-4.5.15/acinclude.m4
  dnl ### A macro to determine if off_t is a long long
  AC_DEFUN([AC_OFF_T_IS_LONG_LONG],
  [AC_MSG_CHECKING(for long long off_t)
-diff -dup strace-4.5.15.orig/configure.ac strace-4.5.15/configure.ac
+diff -dur strace-4.5.15.orig/configure.ac strace-4.5.15/configure.ac
 --- strace-4.5.15.orig/configure.ac	2007-01-11 12:37:55.000000000 +0100
-+++ strace-4.5.15/configure.ac	2007-01-29 17:32:02.000000000 +0100
-@@ -169,6 +169,7 @@ AC_CHECK_MEMBERS([struct stat.st_blksize
++++ strace-4.5.15/configure.ac	2007-07-14 19:25:25.000000000 +0200
+@@ -169,6 +169,7 @@
  		  struct stat.st_level,
  		  struct stat.st_rdev])
  AC_STAT64
@@ -39,10 +39,10 @@ diff -dup strace-4.5.15.orig/configure.ac strace-4.5.15/configure.ac
  
  AC_TYPE_SIGNAL
  AC_TYPE_UID_T
-diff -dup strace-4.5.15.orig/file.c strace-4.5.15/file.c
+diff -dur strace-4.5.15.orig/file.c strace-4.5.15/file.c
 --- strace-4.5.15.orig/file.c	2007-01-15 21:25:52.000000000 +0100
-+++ strace-4.5.15/file.c	2007-01-29 17:33:15.000000000 +0100
-@@ -1635,7 +1635,7 @@ struct tcb *tcp;
++++ strace-4.5.15/file.c	2007-07-14 19:25:25.000000000 +0200
+@@ -1635,7 +1635,7 @@
  	return 0;
  }
  
diff --git a/patches/strace/4.5.15/strace-superh-update.ac.patch b/patches/strace/4.5.15/400-strace-superh-update.ac.patch
similarity index 64%
rename from patches/strace/4.5.15/strace-superh-update.ac.patch
rename to patches/strace/4.5.15/400-strace-superh-update.ac.patch
index 9841917f..75e2cd4a 100644
--- a/patches/strace/4.5.15/strace-superh-update.ac.patch
+++ b/patches/strace/4.5.15/400-strace-superh-update.ac.patch
@@ -1,6 +1,7 @@
---- strace-4.5.15.orig/configure.ac	2007-01-11 12:37:55.000000000 +0100
-+++ strace-4.5.15/configure.ac	2007-01-29 17:38:26.000000000 +0100
-@@ -91,14 +91,14 @@ hppa*|parisc*)
+diff -dur strace-4.5.15.orig/configure.ac strace-4.5.15/configure.ac
+--- strace-4.5.15.orig/configure.ac	2007-07-14 19:25:25.000000000 +0200
++++ strace-4.5.15/configure.ac	2007-07-14 19:27:35.000000000 +0200
+@@ -91,14 +91,14 @@
  	arch=hppa
  	AC_DEFINE([HPPA], 1, [Define for the HPPA architecture.])
  	;;
@@ -19,4 +20,3 @@
  x86?64*)
  	arch=x86_64
  	AC_DEFINE([X86_64], 1, [Define for the AMD x86-64 architecture.])
-
diff --git a/patches/strace/4.5.15/450-strace-undef-CTL_PROC.patch b/patches/strace/4.5.15/450-strace-undef-CTL_PROC.patch
new file mode 100644
index 00000000..cfb8752c
--- /dev/null
+++ b/patches/strace/4.5.15/450-strace-undef-CTL_PROC.patch
@@ -0,0 +1,13 @@
+diff -dur strace-4.5.15.orig/system.c strace-4.5.15/system.c
+--- strace-4.5.15.orig/system.c	2007-01-17 00:22:36.000000000 +0100
++++ strace-4.5.15/system.c	2007-07-14 19:28:41.000000000 +0200
+@@ -1612,7 +1612,9 @@
+ 	{ CTL_KERN, "CTL_KERN" },
+ 	{ CTL_VM, "CTL_VM" },
+ 	{ CTL_NET, "CTL_NET" },
++#ifdef CTL_PROC
+ 	{ CTL_PROC, "CTL_PROC" },
++#endif
+ 	{ CTL_FS, "CTL_FS" },
+ 	{ CTL_DEBUG, "CTL_DEBUG" },
+ 	{ CTL_DEV, "CTL_DEV" },
diff --git a/patches/strace/4.5.15/strace-undef-PACKET_MEMBERSHIP.patch b/patches/strace/4.5.15/500-strace-undef-PACKET_MEMBERSHIP.patch
similarity index 67%
rename from patches/strace/4.5.15/strace-undef-PACKET_MEMBERSHIP.patch
rename to patches/strace/4.5.15/500-strace-undef-PACKET_MEMBERSHIP.patch
index cdc9e640..d7a100ea 100644
--- a/patches/strace/4.5.15/strace-undef-PACKET_MEMBERSHIP.patch
+++ b/patches/strace/4.5.15/500-strace-undef-PACKET_MEMBERSHIP.patch
@@ -1,5 +1,6 @@
---- strace-4.5.14/net.c.oorig	2005-07-05 01:33:38.000000000 +0200
-+++ strace-4.5.14/net.c	2006-10-09 16:35:02.000000000 +0200
+diff -dur strace-4.5.15.orig/net.c strace-4.5.15/net.c
+--- strace-4.5.15.orig/net.c	2006-12-13 20:57:23.000000000 +0100
++++ strace-4.5.15/net.c	2007-07-14 19:29:36.000000000 +0200
 @@ -800,8 +800,12 @@
  
  #ifdef SOL_PACKET
diff --git a/patches/strace/4.5.15/strace-undef-syscall.patch b/patches/strace/4.5.15/550-strace-undef-syscall.patch
similarity index 77%
rename from patches/strace/4.5.15/strace-undef-syscall.patch
rename to patches/strace/4.5.15/550-strace-undef-syscall.patch
index ffb8acf7..351d0e7e 100644
--- a/patches/strace/4.5.15/strace-undef-syscall.patch
+++ b/patches/strace/4.5.15/550-strace-undef-syscall.patch
@@ -1,20 +1,6 @@
---- strace-4.5.12/linux/syscallent.h.orig	2005-08-09 01:48:54.000000000 -0600
-+++ strace-4.5.12/linux/syscallent.h	2005-08-09 01:50:23.000000000 -0600
-@@ -298,7 +298,11 @@
- 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
- 	{ 5,	TF,	sys_fadvise64,		"fadvise64"	}, /* 250 */
- 	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
--	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
-+	{ 1,	TP,	sys_exit,		"exit_group"
-+#ifdef __NR_exit_group
-+	    , __NR_exit_group
-+#endif
-+								}, /* 252 */
- 	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
- 	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
- 	{ 4,	0,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
---- strace-4.5.15.orig/linux/syscallent.h	2007-02-04 19:03:48.000000000 +0100
-+++ strace-4.5.15/linux/syscallent.h	2007-02-04 19:11:04.000000000 +0100
+diff -dur strace-4.5.15.orig/linux/syscallent.h strace-4.5.15/linux/syscallent.h
+--- strace-4.5.15.orig/linux/syscallent.h	2006-10-16 03:17:52.000000000 +0200
++++ strace-4.5.15/linux/syscallent.h	2007-07-14 19:30:16.000000000 +0200
 @@ -130,7 +130,10 @@
  	{ 2,	TF,	sys_statfs,		"statfs"	}, /* 99 */
  	{ 2,	TD,	sys_fstatfs,		"fstatfs"	}, /* 100 */
@@ -39,8 +25,22 @@
  	{ 1,	TD,	sys_fsync,		"fsync"		}, /* 118 */
  	{ 1,	TS,	sys_sigreturn,		"sigreturn"	}, /* 119 */
  	{ 5,	TP,	sys_clone,		"clone", SYS_clone }, /* 120 */
---- strace-4.5.15.orig/syscall.c	2007-02-04 19:03:48.000000000 +0100
-+++ strace-4.5.15/syscall.c	2007-02-04 19:07:26.000000000 +0100
+@@ -282,7 +288,11 @@
+ 	{ 3,	0,	sys_io_cancel,		"io_cancel"	}, /* 249 */
+ 	{ 5,	0,	sys_fadvise64,		"fadvise64"	}, /* 250 */
+ 	{ 5,	0,	printargs,		"SYS_251"	}, /* 251 */
+-	{ 1,	TP,	sys_exit,		"exit_group", __NR_exit_group }, /* 252 */
++	{ 1,	TP,	sys_exit,		"exit_group"
++#ifdef __NR_exit_group
++	    , __NR_exit_group
++#endif
++								}, /* 252 */
+ 	{ 4,	0,	printargs,		"lookup_dcookie"}, /* 253 */
+ 	{ 1,	0,	sys_epoll_create,	"epoll_create"	}, /* 254 */
+ 	{ 4,	TD,	sys_epoll_ctl,		"epoll_ctl"	}, /* 255 */
+diff -dur strace-4.5.15.orig/syscall.c strace-4.5.15/syscall.c
+--- strace-4.5.15.orig/syscall.c	2007-07-14 19:22:49.000000000 +0200
++++ strace-4.5.15/syscall.c	2007-07-14 19:30:16.000000000 +0200
 @@ -2404,14 +2404,18 @@
  	switch (known_scno(tcp)) {
  #ifdef LINUX
diff --git a/patches/strace/4.5.15/strace-undef-CTL_PROC.patch b/patches/strace/4.5.15/strace-undef-CTL_PROC.patch
deleted file mode 100644
index c3eccb7d..00000000
--- a/patches/strace/4.5.15/strace-undef-CTL_PROC.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- strace-4.5.12/system.c.oorig	2005-06-01 21:22:06.000000000 +0200
-+++ strace-4.5.12/system.c	2006-09-28 18:18:31.000000000 +0200
-@@ -1572,7 +1572,9 @@
- 	{ CTL_KERN, "CTL_KERN" },
- 	{ CTL_VM, "CTL_VM" },
- 	{ CTL_NET, "CTL_NET" },
-+#ifdef CTL_PROC
- 	{ CTL_PROC, "CTL_PROC" },
-+#endif
- 	{ CTL_FS, "CTL_FS" },
- 	{ CTL_DEBUG, "CTL_DEBUG" },
- 	{ CTL_DEV, "CTL_DEV" },