Use newer strace 4.5.15; various improvements in syscall parsing and

split functions into more files.

1 files changed, 29 insertions, 74 deletions

diff --git a/sysutils/strace/patches/patch-ac b/sysutils/strace/patches/patch-ac
index de90dac9a3f..af59f094a19 100644
--- a/sysutils/strace/patches/patch-ac
+++ b/sysutils/strace/patches/patch-ac
@@ -1,18 +1,7 @@
-$NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
+$NetBSD: patch-ac,v 1.3 2007/12/05 16:31:00 christos Exp $
 
---- aclocal.m4.orig	2006-01-12 06:20:05.000000000 -0500
-+++ aclocal.m4	2007-04-27 11:31:50.000000000 -0400
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-+# generated automatically by aclocal 1.9.4 -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005  Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-+# Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
+--- aclocal.m4.orig	2007-01-11 17:23:29.000000000 -0500
++++ aclocal.m4	2007-12-05 11:01:59.000000000 -0500
 @@ -11,11 +11,23 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
@@ -42,41 +31,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # AM_AUTOMAKE_VERSION(VERSION)
  # ----------------------------
-@@ -28,15 +40,26 @@
- # Call AM_AUTOMAKE_VERSION so it can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--	 [AM_AUTOMAKE_VERSION([1.9.5])])
-+	 [AM_AUTOMAKE_VERSION([1.9.4])])
- 
--# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+# AM_AUX_DIR_EXPAND
- 
--# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
--#
--# This file is free software; the Free Software Foundation
--# gives unlimited permission to copy and/or distribute it,
--# with or without modifications, as long as this notice is preserved.
-+# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-+# 02111-1307, USA.
- 
- # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
- # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -83,16 +106,26 @@
+@@ -83,16 +95,26 @@
  am_aux_dir=`cd $ac_aux_dir && pwd`
  ])
  
@@ -111,7 +66,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
  # -------------------------------------
-@@ -116,15 +149,26 @@
+@@ -116,15 +138,26 @@
  Usually this means the macro was only invoked conditionally.]])
  fi])])
  
@@ -144,7 +99,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  # written in clear, in which case automake, when reading aclocal.m4,
-@@ -133,6 +177,7 @@
+@@ -133,6 +166,7 @@
  # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
  
  
@@ -152,7 +107,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  # _AM_DEPENDENCIES(NAME)
  # ----------------------
  # See how the compiler implements dependency checking.
-@@ -272,16 +317,27 @@
+@@ -272,16 +306,27 @@
  AC_SUBST([AMDEPBACKSLASH])
  ])
  
@@ -188,7 +143,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # _AM_OUTPUT_DEPENDENCY_COMMANDS
  # ------------------------------
-@@ -340,31 +396,54 @@
+@@ -340,31 +385,54 @@
       [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
  ])
  
@@ -199,8 +154,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
 -# gives unlimited permission to copy and/or distribute it,
 -# with or without modifications, as long as this notice is preserved.
 +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
- 
--# serial 8
++
 +# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
 +
 +# This program is free software; you can redistribute it and/or modify
@@ -217,7 +171,8 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 +# 02111-1307, USA.
-+
+ 
+-# serial 8
 +# serial 7
  
  # AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
@@ -225,11 +180,11 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
 -# Do all the work for Automake.                             -*- Autoconf -*-
 +# Do all the work for Automake.                            -*- Autoconf -*-
- 
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++
 +# This macro actually does too much some checks are only needed if
 +# your package does certain things.  But this isn't really a big deal.
-+
+ 
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
  # Free Software Foundation, Inc.
 -#
@@ -242,9 +197,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2, or (at your option)
 +# any later version.
- 
--# This macro actually does too much.  Some checks are only needed if
--# your package does certain things.  But this isn't really a big deal.
++
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ -254,12 +207,14 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
 +# along with this program; if not, write to the Free Software
 +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 +# 02111-1307, USA.
-+
+ 
+-# This macro actually does too much.  Some checks are only needed if
+-# your package does certain things.  But this isn't really a big deal.
 +# serial 11
  
  # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
  # AM_INIT_AUTOMAKE([OPTIONS])
-@@ -466,27 +545,51 @@
+@@ -466,27 +534,51 @@
  done
  echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
  
@@ -323,7 +278,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # Check whether the underlying file-system supports filenames
  # with a leading dot.  For instance MS-DOS doesn't.
-@@ -501,17 +604,28 @@
+@@ -501,17 +593,28 @@
  rmdir .tst 2>/dev/null
  AC_SUBST([am__leading_dot])])
  
@@ -359,7 +314,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  AC_DEFUN([AM_MAINTAINER_MODE],
  [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-@@ -530,15 +644,26 @@
+@@ -530,15 +633,26 @@
  
  AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
  
@@ -393,7 +348,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # AM_MAKE_INCLUDE()
  # -----------------
-@@ -582,16 +707,27 @@
+@@ -582,16 +696,27 @@
  rm -f confinc confmf
  ])
  
@@ -429,7 +384,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # AM_MISSING_PROG(NAME, PROGRAM)
  # ------------------------------
-@@ -617,16 +753,27 @@
+@@ -617,16 +742,27 @@
  fi
  ])
  
@@ -464,7 +419,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  # Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
  # created by `make install' are always world readable, even if the
  # installer happens to have an overly restrictive umask (e.g. 077).
-@@ -680,15 +827,26 @@
+@@ -680,15 +816,26 @@
  fi
  AC_SUBST([mkdir_p])])
  
@@ -498,7 +453,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # _AM_MANGLE_OPTION(NAME)
  # -----------------------
-@@ -713,16 +871,28 @@
+@@ -713,16 +860,28 @@
  AC_DEFUN([_AM_IF_OPTION],
  [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
  
@@ -512,10 +467,10 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
 -# with or without modifications, as long as this notice is preserved.
 +# Check to make sure that the build environment is sane.
 +#
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
  
 -# serial 4
++# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
++
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
 +# the Free Software Foundation; either version 2, or (at your option)
@@ -535,7 +490,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # AM_SANITY_CHECK
  # ---------------
-@@ -765,14 +935,25 @@
+@@ -765,14 +924,25 @@
  fi
  AC_MSG_RESULT(yes)])
  
@@ -568,7 +523,7 @@ $NetBSD: patch-ac,v 1.2 2007/04/27 19:45:01 christos Exp $
  # One issue with vendor `install' (even GNU) is that you can't
  # specify the program used to strip binaries.  This is especially
  # annoying in cross-compiling environments, where the build's strip
-@@ -795,13 +976,25 @@
+@@ -795,13 +965,25 @@
  
  # Check how to create a tarball.                            -*- Autoconf -*-