Use newer strace 4.5.15; various improvements in syscall parsing and

split functions into more files.
author: christos <christos> 2007-12-05 16:30:59 +0000
committer: christos <christos> 2007-12-05 16:30:59 +0000
commit: 871af5790a8500c273b949afc3c20b6467b866c0 (patch)
tree: d8e3af3c6632f84f361a4a1ec2b509b26acdfe7b /sysutils
parent: 73039a7dbb86bcd516b0269fb119120fbf95e801 (diff)
download: pkgsrc-871af5790a8500c273b949afc3c20b6467b866c0.tar.gz
16 files changed, 378 insertions, 215 deletions
diff --git a/sysutils/strace/Makefile b/sysutils/strace/Makefile
index af293d4795a..285844c8df0 100644
--- a/sysutils/strace/Makefile
+++ b/sysutils/strace/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/04/27 19:45:01 christos Exp $
+# $NetBSD: Makefile,v 1.10 2007/12/05 16:30:59 christos Exp $
 #
 
-DISTNAME=		strace-4.5.14
-PKGREVISION=		1
+DISTNAME=		strace-4.5.15
+#PKGREVISION=		1
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=strace/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/strace/distinfo b/sysutils/strace/distinfo
index f2647072b64..6a00f01d193 100644
--- a/sysutils/strace/distinfo
+++ b/sysutils/strace/distinfo
@@ -1,33 +1,36 @@
-$NetBSD: distinfo,v 1.6 2007/04/28 03:42:30 christos Exp $
+$NetBSD: distinfo,v 1.7 2007/12/05 16:31:00 christos Exp $
 
-SHA1 (strace-4.5.14.tar.bz2) = 72c17d1dd6786d22ca0aaaa7292b8edcd70a27de
-RMD160 (strace-4.5.14.tar.bz2) = cb42cac34d1624dd24842ada0dbb9dfff67e8e93
-Size (strace-4.5.14.tar.bz2) = 445134 bytes
-SHA1 (patch-aa) = c28cb911f1c316634ccbebe675ce31dea3d27cbc
-SHA1 (patch-ab) = 3750d80d6688ac24c4a880df3f0ab85a754c217f
-SHA1 (patch-ac) = 87bd437b5daee87ae4e808bf57cf281ec8241a89
+SHA1 (strace-4.5.15.tar.bz2) = a6bd153eeb1a25a50bb5a1d92887a4911ec9ad48
+RMD160 (strace-4.5.15.tar.bz2) = 0c6aaa8820a0985d89b21a5da9578b27435c8906
+Size (strace-4.5.15.tar.bz2) = 455607 bytes
+SHA1 (patch-aa) = 16c7a70bccbebfcf24640cd4e632ff127586e6c9
+SHA1 (patch-ab) = d8adac8ba330ecdfd573e2b14f49a445de1d2452
+SHA1 (patch-ac) = 8af13f7db2812538a4d34ddf6e15f679c92b4776
 SHA1 (patch-ad) = 091b7a2b555d3e5c8d2c4f338b929c7792ea5b0b
 SHA1 (patch-ae) = 397b0c84a267d8cd3f6b45d8fb19d290b1327895
 SHA1 (patch-af) = 5e12fe5d4087275e889a49a63ce4d0e0b565b5d8
 SHA1 (patch-ag) = 02c6ce49d7bcefb97e69acc630b5bf82a8bb8a1d
-SHA1 (patch-ah) = ad11dff799e48ae9592cb2bb688602637b72f3e2
+SHA1 (patch-ah) = 72d6fd1cd92c22b5215f87fcf268fd375b3f7803
 SHA1 (patch-ai) = 01430e21dd0e6d2e19f93fab8846a3464ee5e7a0
 SHA1 (patch-aj) = b5adc80e0d3f949e8d4d1c9fcbd49839a6b4d907
-SHA1 (patch-ak) = 7b34a03fa9c8761038ef9b19f8ecbded2cc656b8
+SHA1 (patch-ak) = 1b82f68c3a21bc24ce464f64bc91081a71f36199
 SHA1 (patch-al) = ea408e93a15c5fdd8054a65b409c60536ca928eb
 SHA1 (patch-am) = edb9a6a4b76b6f0a39427562fe96a73fea3ecf4a
-SHA1 (patch-an) = 81d188240cb9afde6fdb718a43a7790b9e2ec75c
-SHA1 (patch-ao) = 786a7841a3ec6650e1ba638de226b23f15bc21d1
-SHA1 (patch-ap) = abb7ea91f00e61b91966c4a3741d867d36f02588
-SHA1 (patch-aq) = ed501801c93f1b4f9549fce5804f02a98a6d8c18
+SHA1 (patch-an) = ef091e116a7ae9f3b2736d7d7ec49147a69d3ad9
+SHA1 (patch-ao) = f85b132184318367a04652d67540428e4d73db3e
+SHA1 (patch-ap) = 8ed16f25eb9ef1c9c1499a77e7f39bf23d50e209
+SHA1 (patch-aq) = 41aa25ad9c1603e3202ec6dd381d4f6687ff5df0
 SHA1 (patch-ar) = 12b13f8b7e2054cbe57da6b502f3fe49b91de9ff
 SHA1 (patch-as) = b241a70fb33aabb8282578a124b04aca05f0d3f2
 SHA1 (patch-at) = da44d0101eb069ea231bdce7051af357e43cb3d1
-SHA1 (patch-au) = fe4c23730ec3bb5624eb49cc981441ccb4b4a620
+SHA1 (patch-au) = 44dc141b5877866ff452211a57f2ebf6fd63a0d0
 SHA1 (patch-av) = fc31e45bf956cf5ddc09e01a7b1a02f15ece7968
 SHA1 (patch-aw) = 6d9c8243df401fb18e621c8965667778640c9d01
 SHA1 (patch-ax) = 6bb4fdfaf26f9ded736f0aa8f0209815ccbea199
 SHA1 (patch-ay) = 9a6942117fc4d26a9256a573559597560295d9c0
 SHA1 (patch-az) = af6272c48668785dffd7c5b42b8fa2c8edb562d0
 SHA1 (patch-ba) = be8e2f79bd8818b99bdce63fb73802f1a4014b2f
-SHA1 (patch-bb) = 044c9a3a1fe88d0c8d12012012dc0428fde5a5c5
+SHA1 (patch-bb) = e7e309d96ec9fa2398a968f29f7e6549ff81e37e
+SHA1 (patch-bc) = eebc8220e7cc04c44d1e99e6bafc498dca1db5ac
+SHA1 (patch-bd) = 6ad13b8b0130886cc87218d9acfe46d8f9fc82ef
+SHA1 (patch-be) = 6326b50b3d9be0524d67770d67530069866edd9e
diff --git a/sysutils/strace/patches/patch-aa b/sysutils/strace/patches/patch-aa
index a098b1184cd..de4efdb9d5f 100644
--- a/sysutils/strace/patches/patch-aa
+++ b/sysutils/strace/patches/patch-aa
@@ -1,19 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2007/04/27 19:45:01 christos Exp $
+$NetBSD: patch-aa,v 1.3 2007/12/05 16:31:00 christos Exp $
 
---- Makefile.in.orig	2006-01-12 06:20:12.000000000 -0500
-+++ Makefile.in	2007-04-27 15:34:04.000000000 -0400
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.9.5 from Makefile.am.
-+# Makefile.in generated by automake 1.9.4 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005  Free Software Foundation, Inc.
-+# 2003, 2004  Free Software Foundation, Inc.
- # This Makefile.in 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.
-@@ -100,6 +100,8 @@
+--- Makefile.in.orig	2007-01-11 17:23:32.000000000 -0500
++++ Makefile.in	2007-12-05 11:01:59.000000000 -0500
+@@ -99,6 +99,8 @@
  distuninstallcheck_listfiles = find . -type f -print
  distcleancheck_listfiles = find . -type f -print
  ACLOCAL = @ACLOCAL@
@@ -22,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2007/04/27 19:45:01 christos Exp $
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
  AMTAR = @AMTAR@
-@@ -138,6 +140,8 @@
+@@ -137,6 +139,8 @@
  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
  MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
  MAKEINFO = @MAKEINFO@
diff --git a/sysutils/strace/patches/patch-ab b/sysutils/strace/patches/patch-ab
index 4807f01c104..02e8047e0e4 100644
--- a/sysutils/strace/patches/patch-ab
+++ b/sysutils/strace/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2007/04/27 19:45:01 christos Exp $
+$NetBSD: patch-ab,v 1.3 2007/12/05 16:31:00 christos Exp $
 
 --- /dev/null	2007-04-26 23:20:40.000000000 -0400
 +++ netbsd/Makefile	2007-04-27 15:14:51.000000000 -0400
@@ -14,21 +14,21 @@ $NetBSD: patch-ab,v 1.2 2007/04/27 19:45:01 christos Exp $
 +
 +syscallent.h: syscalls.pl syscalls.print syscalls.cat /usr/src/sys/kern/syscalls.master
 +	@chmod +x syscalls.pl
-+	syscalls.pl /usr/src/sys/kern/syscalls.master syscalls.print syscalls.cat > $@
++	./syscalls.pl /usr/src/sys/kern/syscalls.master syscalls.print syscalls.cat > $@
 +
 +syscall.h: syscallent.h
 +
 +signalent.h: mksignal /usr/include/sys/signal.h
 +	@chmod +x mksignal
-+	mksignal /usr/include/sys/signal.h > $@
++	./mksignal /usr/include/sys/signal.h > $@
 +
 +errnoent.h: mkerrno /usr/include/sys/errno.h
 +	@chmod +x mkerrno
-+	mkerrno /usr/include/sys/errno.h > $@
++	./mkerrno /usr/include/sys/errno.h > $@
 +
 +ioctlent.h: ioctlent.sh
 +	@chmod +x ioctlent.sh
-+	ioctlent.sh > $@
++	./ioctlent.sh > $@
 +
 +.for i in ${DEP}
 +${arch}/${i:R}1.h:
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 -*-
  
diff --git a/sysutils/strace/patches/patch-ah b/sysutils/strace/patches/patch-ah
index 2a28225baea..714a2232234 100644
--- a/sysutils/strace/patches/patch-ah
+++ b/sysutils/strace/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
+$NetBSD: patch-ah,v 1.3 2007/12/05 16:31:00 christos Exp $
 
---- file.c.orig	2005-06-08 16:45:28.000000000 -0400
-+++ file.c	2007-04-27 14:57:58.000000000 -0400
+--- file.c.orig	2007-01-15 15:25:52.000000000 -0500
++++ file.c	2007-12-05 11:22:56.000000000 -0500
 @@ -1,5 +1,4 @@
  /*
 -#ifdef LINUX
@@ -31,7 +31,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  #include <sys/param.h>
  #include <sys/mount.h>
  #include <sys/stat.h>
-@@ -754,16 +760,20 @@
+@@ -831,16 +837,20 @@
  #endif /* LINUXSPARC */
  
  static const struct xlat fileflags[] = {
@@ -53,7 +53,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  #elif UNIXWARE >= 2
  #ifdef 	_S_ISMLD
  	{ _S_ISMLD, 	"_S_ISMLD"	},
-@@ -775,7 +785,7 @@
+@@ -852,7 +862,7 @@
  	{ 0,		NULL		},
  };
  
@@ -62,7 +62,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  int
  sys_chflags(tcp)
  struct tcb *tcp;
-@@ -981,7 +991,7 @@
+@@ -1058,7 +1068,7 @@
  #endif /* !HAVE_STRUCT_STAT_ST_RDEV */
  		break;
  	default:
@@ -71,7 +71,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  		break;
  	}
  	if (!abbrev(tcp)) {
-@@ -1440,6 +1450,7 @@
+@@ -1546,6 +1556,7 @@
  #endif /* LINUX */
  
  #ifndef SVR4
@@ -79,7 +79,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  static const char *
  sprintfstype(magic)
-@@ -1458,6 +1469,7 @@
+@@ -1564,6 +1575,7 @@
  	sprintf(buf, "%#x", magic);
  	return buf;
  }
@@ -87,7 +87,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  static void
  printstatfs(tcp, addr)
-@@ -1485,7 +1497,11 @@
+@@ -1591,7 +1603,11 @@
  		statbuf.f_namelen);
  #else /* !ALPHA */
  	tprintf("{f_type=%s, f_bsize=%lu, f_blocks=%lu, f_bfree=%lu, ",
@@ -99,7 +99,43 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  		(unsigned long)statbuf.f_bsize,
  		(unsigned long)statbuf.f_blocks,
  		(unsigned long)statbuf.f_bfree);
-@@ -1986,7 +2002,7 @@
+@@ -1846,7 +1862,7 @@
+ 	return 0;
+ }
+ 
+-#if defined(SUNOS4) || defined(SVR4)
++#if defined(SUNOS4) || defined(SVR4) || defined(NETBSD)
+ int
+ sys_fchroot(tcp)
+ struct tcb *tcp;
+@@ -1856,7 +1872,7 @@
+ 	}
+ 	return 0;
+ }
+-#endif /* SUNOS4 || SVR4 */
++#endif /* SUNOS4 || SVR4 || NETBSD */
+ 
+ int
+ sys_link(tcp)
+@@ -2188,7 +2204,7 @@
+ }
+ #endif
+ 
+-#ifdef FREEBSD
++#ifdef ALLBSD
+ int
+ sys_mkfifo(tcp)
+ struct tcb *tcp;
+@@ -2199,7 +2215,7 @@
+ 	}
+ 	return 0;
+ }
+-#endif /* FREEBSD */
++#endif /* ALLBSD */
+ 
+ int
+ sys_fsync(tcp)
+@@ -2254,7 +2270,7 @@
  
  #endif /* LINUX */
  
@@ -108,7 +144,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  static const struct xlat direnttypes[] = {
  	{ DT_UNKNOWN,	"DT_UNKNOWN" 	},
  	{ DT_FIFO,	"DT_FIFO" 	},
-@@ -2059,15 +2075,16 @@
+@@ -2327,15 +2343,16 @@
  				d->d_namlen, d->d_namlen, d->d_name);
  		}
  #endif /* SUNOS4 */
@@ -129,7 +165,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  		if (!d->d_reclen) {
  			tprintf("/* d_reclen == 0, problem here */");
  			break;
-@@ -2153,7 +2170,7 @@
+@@ -2421,7 +2438,7 @@
  }
  #endif
  
@@ -138,7 +174,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  int
  sys_getdirentries(tcp)
  struct tcb * tcp;
-@@ -2186,8 +2203,9 @@
+@@ -2454,8 +2471,9 @@
  	for (i = 0; i < len;) {
  		struct kernel_dirent *d = (struct kernel_dirent *) &buf[i];
  		if (!abbrev(tcp)) {
@@ -150,7 +186,7 @@ $NetBSD: patch-ah,v 1.2 2007/04/27 19:45:01 christos Exp $
  			printxval(direnttypes, d->d_type, "DT_???");
  			tprintf(", d_namlen=%u, d_name=\"%.*s\"}",
  				d->d_namlen, d->d_namlen, d->d_name);
-@@ -2225,7 +2243,7 @@
+@@ -2493,7 +2511,7 @@
  }
  #endif /* LINUX */
  
diff --git a/sysutils/strace/patches/patch-ak b/sysutils/strace/patches/patch-ak
index eecf9d914ea..54c7acf82ea 100644
--- a/sysutils/strace/patches/patch-ak
+++ b/sysutils/strace/patches/patch-ak
@@ -1,7 +1,7 @@
-$NetBSD: patch-ak,v 1.2 2007/04/27 19:45:01 christos Exp $
+$NetBSD: patch-ak,v 1.3 2007/12/05 16:31:00 christos Exp $
 
---- ipc.c.orig	2005-12-01 23:34:09.000000000 -0500
-+++ ipc.c	2007-04-27 11:31:50.000000000 -0400
+--- ipc.c.orig	2007-01-15 15:25:52.000000000 -0500
++++ ipc.c	2007-12-05 11:03:17.000000000 -0500
 @@ -32,7 +32,7 @@
  
  #include "defs.h"
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.2 2007/04/27 19:45:01 christos Exp $
  
  # ifdef HAVE_MQUEUE_H
  #  include <mqueue.h>
-@@ -411,7 +411,7 @@
+@@ -410,7 +410,7 @@
  	return 0;
  }
  
@@ -19,4 +19,4 @@ $NetBSD: patch-ak,v 1.2 2007/04/27 19:45:01 christos Exp $
 +#endif /* defined(LINUX) || defined(SUNOS4) || defined(ALLBSD) */
  
  #ifdef LINUX
- int sys_mq_open(tcp)
+ int
diff --git a/sysutils/strace/patches/patch-an b/sysutils/strace/patches/patch-an
index 3801c2e4872..b63d2ae56be 100644
--- a/sysutils/strace/patches/patch-an
+++ b/sysutils/strace/patches/patch-an
@@ -1,18 +1,16 @@
-$NetBSD: patch-an,v 1.3 2007/04/27 19:45:02 christos Exp $
+$NetBSD: patch-an,v 1.4 2007/12/05 16:31:00 christos Exp $
 
---- net.c.orig	2005-07-04 19:33:38.000000000 -0400
-+++ net.c	2007-04-27 14:58:48.000000000 -0400
-@@ -35,6 +35,9 @@
+--- net.c.orig	2006-12-13 14:57:23.000000000 -0500
++++ net.c	2007-12-05 11:19:06.000000000 -0500
+@@ -35,7 +35,6 @@
  #include <sys/stat.h>
  #include <sys/socket.h>
  #include <sys/un.h>
-+#ifdef NETBSD
-+#define ucred uucred
-+#endif
- 
+-
  #if defined(HAVE_SIN6_SCOPE_ID_LINUX)
  #define in6_addr in6_addr_libc
-@@ -43,12 +46,16 @@
+ #define ipv6_mreq ipv6_mreq_libc
+@@ -43,12 +42,19 @@
  #endif
  
  #include <netinet/in.h>
@@ -27,11 +25,14 @@ $NetBSD: patch-an,v 1.3 2007/04/27 19:45:02 christos Exp $
 +#ifdef NETBSD
 +#include <sys/param.h>
 +#include <sys/ucred.h>
++#ifdef NETBSD
++#define ucred uucred
++#endif
 +#endif
  #include <arpa/inet.h>
  #include <net/if.h>
  #if defined(LINUX)
-@@ -1099,7 +1106,7 @@
+@@ -1099,7 +1105,7 @@
  		return;
  	}
  
@@ -40,7 +41,7 @@ $NetBSD: patch-an,v 1.3 2007/04/27 19:45:02 christos Exp $
  	printxval(socketlayers, cmsg->cmsg_level, "SOL_???");
  	tprintf(", cmsg_type=");
  
-@@ -1125,12 +1132,21 @@
+@@ -1125,12 +1131,21 @@
  			free(cmsg);
  			return;
  		}
@@ -62,7 +63,7 @@ $NetBSD: patch-an,v 1.3 2007/04/27 19:45:02 christos Exp $
  			free(cmsg);
  			return;
  		}
-@@ -1470,7 +1486,7 @@
+@@ -1472,7 +1487,7 @@
  		else
  			tprintf("[%u, %u]", fds[0], fds[1]);
  	}
@@ -71,7 +72,7 @@ $NetBSD: patch-an,v 1.3 2007/04/27 19:45:02 christos Exp $
  	if (exiting(tcp))
  		tprintf("[%lu, %lu]", tcp->u_rval, getrval2(tcp));
  #endif
-@@ -1517,9 +1533,9 @@
+@@ -1519,9 +1534,9 @@
  		else
  			tprintf(", [%u, %u]", fds[0], fds[1]);
  #endif /* LINUX */
diff --git a/sysutils/strace/patches/patch-ao b/sysutils/strace/patches/patch-ao
index c23bcafb389..7a2109f78c2 100644
--- a/sysutils/strace/patches/patch-ao
+++ b/sysutils/strace/patches/patch-ao
@@ -1,7 +1,7 @@
-$NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
+$NetBSD: patch-ao,v 1.3 2007/12/05 16:31:00 christos Exp $
 
---- process.c.orig	2005-08-03 07:23:43.000000000 -0400
-+++ process.c	2007-04-27 14:39:18.000000000 -0400
+--- process.c.orig	2007-01-11 17:08:38.000000000 -0500
++++ process.c	2007-12-05 11:21:20.000000000 -0500
 @@ -40,6 +40,7 @@
  #include "defs.h"
  
@@ -19,7 +19,43 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  #include <sys/ptrace.h>
  #endif
  
-@@ -1042,7 +1043,7 @@
+@@ -305,7 +306,7 @@
+ 
+ #endif /* HAVE_PRCTL */
+ 
+-#if defined(FREEBSD) || defined(SUNOS4) || defined(SVR4)
++#if defined(ALLBSD) || defined(SUNOS4) || defined(SVR4)
+ int
+ sys_gethostid(tcp)
+ struct tcb *tcp;
+@@ -314,7 +315,7 @@
+ 		return RVAL_HEX;
+ 	return 0;
+ }
+-#endif /* FREEBSD || SUNOS4 || SVR4 */
++#endif /* ALLBSD || SUNOS4 || SVR4 */
+ 
+ int
+ sys_sethostname(tcp)
+@@ -327,7 +328,7 @@
+ 	return 0;
+ }
+ 
+-#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4) || defined(SVR4)
++#if defined(ALPHA) || defined(ALLBSD) || defined(SUNOS4) || defined(SVR4)
+ int
+ sys_gethostname(tcp)
+ struct tcb *tcp;
+@@ -341,7 +342,7 @@
+ 	}
+ 	return 0;
+ }
+-#endif /* ALPHA || FREEBSD || SUNOS4 || SVR4 */
++#endif /* ALPHA || ALLBSD || SUNOS4 || SVR4 */
+ 
+ int
+ sys_setdomainname(tcp)
+@@ -1058,7 +1059,7 @@
  
  #endif /* !USE_PROCFS */
  
@@ -28,7 +64,7 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  
  int
  sys_vfork(tcp)
-@@ -1053,7 +1054,7 @@
+@@ -1069,7 +1070,7 @@
  	return 0;
  }
  
@@ -37,7 +73,7 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  
  #ifndef LINUX
  
-@@ -2035,7 +2036,7 @@
+@@ -2051,7 +2052,7 @@
  
  #endif /* SVR4 */
  
@@ -46,7 +82,22 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  int
  sys_wait(tcp)
  struct tcb *tcp;
-@@ -2189,7 +2190,7 @@
+@@ -2070,12 +2071,14 @@
+ }
+ #endif
+ 
++#ifndef NETBSD
+ int
+ sys_waitpid(tcp)
+ struct tcb *tcp;
+ {
+ 	return printwaitn(tcp, 3, 0);
+ }
++#endif
+ 
+ int
+ sys_wait4(tcp)
+@@ -2205,7 +2208,7 @@
  #ifndef SVR4
  
  static const struct xlat ptrace_cmds[] = {
@@ -55,7 +106,7 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  	{ PTRACE_TRACEME,	"PTRACE_TRACEME"	},
  	{ PTRACE_PEEKTEXT,	"PTRACE_PEEKTEXT",	},
  	{ PTRACE_PEEKDATA,	"PTRACE_PEEKDATA",	},
-@@ -2255,7 +2256,7 @@
+@@ -2271,7 +2274,7 @@
  #endif /* !I386 */
  	{ PTRACE_GETUCODE,	"PTRACE_GETUCODE"	},
  #endif /* SUNOS4 */
@@ -64,7 +115,7 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  	{ PT_TRACE_ME,		"PT_TRACE_ME"		},
  	{ PT_READ_I,		"PT_READ_I"		},
  	{ PT_READ_D,		"PT_READ_D"		},
-@@ -2273,13 +2274,17 @@
+@@ -2289,13 +2292,17 @@
  	{ PT_SETREGS,		"PT_SETREGS"		},
  	{ PT_GETFPREGS,		"PT_GETFPREGS"		},
  	{ PT_SETFPREGS,		"PT_SETFPREGS"		},
@@ -84,7 +135,7 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  #ifndef SUNOS4_KERNEL_ARCH_KLUDGE
  static
  #endif /* !SUNOS4_KERNEL_ARCH_KLUDGE */
-@@ -2966,12 +2971,14 @@
+@@ -2982,12 +2989,14 @@
  sys_ptrace(tcp)
  struct tcb *tcp;
  {
@@ -100,7 +151,7 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  			  "PTRACE_???"
  #else
  			  "PT_???"
-@@ -2979,7 +2986,7 @@
+@@ -2995,7 +3004,7 @@
  			);
  		tprintf(", %lu, ", tcp->u_arg[1]);
  		addr = tcp->u_arg[2];
@@ -109,7 +160,7 @@ $NetBSD: patch-ao,v 1.2 2007/04/27 19:45:02 christos Exp $
  		if (tcp->u_arg[0] == PTRACE_PEEKUSER
  			|| tcp->u_arg[0] == PTRACE_POKEUSER) {
  			for (x = struct_user_offsets; x->str; x++) {
-@@ -3041,10 +3048,10 @@
+@@ -3057,10 +3066,10 @@
  		}
  	}
  #endif /* SUNOS4 */
diff --git a/sysutils/strace/patches/patch-ap b/sysutils/strace/patches/patch-ap
index b606042020d..54877742f00 100644
--- a/sysutils/strace/patches/patch-ap
+++ b/sysutils/strace/patches/patch-ap
@@ -1,17 +1,17 @@
-$NetBSD: patch-ap,v 1.2 2007/04/27 19:45:02 christos Exp $
+$NetBSD: patch-ap,v 1.3 2007/12/05 16:31:01 christos Exp $
 
---- resource.c.orig	2005-12-01 23:08:27.000000000 -0500
-+++ resource.c	2007-04-27 14:59:25.000000000 -0400
-@@ -41,7 +41,7 @@
- #ifdef SUNOS4
- #include <ufs/quota.h>
- #endif /* SUNOS4 */
+--- resource.c.orig	2006-10-15 21:17:52.000000000 -0400
++++ resource.c	2007-12-05 11:04:00.000000000 -0500
+@@ -37,7 +37,7 @@
+ #include <sys/times.h>
+ #include <linux/kernel.h>
+ #endif /* LINUX */
 -#if defined(SVR4) || defined(FREEBSD)
 +#if defined(SVR4) || defined(ALLBSD)
  #include <sys/times.h>
  #include <sys/time.h>
  #endif
-@@ -458,9 +458,11 @@
+@@ -454,9 +454,11 @@
  			tprintf("{...}");
  		else {
  			tprintf("{tms_utime=%lu, tms_stime=%lu, ",
@@ -25,30 +25,3 @@ $NetBSD: patch-ap,v 1.2 2007/04/27 19:45:02 christos Exp $
  		}
  	}
  	return 0;
-@@ -567,9 +569,9 @@
- 
- #endif /* Linux */
- 
--#if defined(SUNOS4) || defined(FREEBSD)
-+#if defined(SUNOS4) || defined(ALLBSD)
- 
--#ifdef FREEBSD
-+#ifdef ALLBSD
- #include <ufs/ufs/quota.h>
- #endif
- 
-@@ -599,7 +601,7 @@
- 		tprintf(", ");
- 		printstr(tcp, tcp->u_arg[1], -1);
- #endif
--#ifdef FREEBSD
-+#ifdef ALLBSD
- 		printpath(tcp, tcp->u_arg[0]);
- 		tprintf(", ");
- 		printxval(quotacmds, tcp->u_arg[1], "Q_???");
-@@ -609,4 +611,4 @@
- 	return 0;
- }
- 
--#endif /* SUNOS4 || FREEBSD */
-+#endif /* SUNOS4 || ALLBSD */
diff --git a/sysutils/strace/patches/patch-aq b/sysutils/strace/patches/patch-aq
index 5578f3362b2..dbe412674db 100644
--- a/sysutils/strace/patches/patch-aq
+++ b/sysutils/strace/patches/patch-aq
@@ -1,7 +1,7 @@
-$NetBSD: patch-aq,v 1.2 2007/04/27 19:45:02 christos Exp $
+$NetBSD: patch-aq,v 1.3 2007/12/05 16:31:01 christos Exp $
 
---- signal.c.orig	2006-01-12 17:34:50.000000000 -0500
-+++ signal.c	2007-04-27 11:31:51.000000000 -0400
+--- signal.c.orig	2007-01-11 17:08:38.000000000 -0500
++++ signal.c	2007-12-05 11:22:31.000000000 -0500
 @@ -36,12 +36,27 @@
  #include "defs.h"
  
@@ -31,7 +31,24 @@ $NetBSD: patch-aq,v 1.2 2007/04/27 19:45:02 christos Exp $
  
  #ifdef HAVE_SYS_REG_H
  # include <sys/reg.h>
-@@ -1474,7 +1489,7 @@
+@@ -1056,14 +1071,14 @@
+ 	return 0;
+ }
+ 
+-#if defined(SUNOS4) || defined(FREEBSD)
++#if defined(SUNOS4) || defined(ALLBSD)
+ int
+ sys_sigblock(tcp)
+ struct tcb *tcp;
+ {
+ 	return sys_sigsetmask(tcp);
+ }
+-#endif /* SUNOS4 || FREEBSD */
++#endif /* SUNOS4 || ALLBSD */
+ 
+ #endif /* !SVR4 */
+ 
+@@ -1489,7 +1504,7 @@
  
  #endif /* LINUX */
  
@@ -40,7 +57,7 @@ $NetBSD: patch-aq,v 1.2 2007/04/27 19:45:02 christos Exp $
  
  int
  sys_sigsuspend(tcp)
-@@ -1506,7 +1521,7 @@
+@@ -1521,7 +1536,7 @@
  #endif /* !FREEBSD */
  #endif /* SVR4 || FREEBSD */
  
@@ -49,7 +66,7 @@ $NetBSD: patch-aq,v 1.2 2007/04/27 19:45:02 christos Exp $
  #if defined LINUX && !defined SS_ONSTACK
  #define SS_ONSTACK      1
  #define SS_DISABLE      2
-@@ -1598,7 +1613,7 @@
+@@ -1613,7 +1628,7 @@
  
  #endif /* SVR4 */
  
@@ -58,3 +75,20 @@ $NetBSD: patch-aq,v 1.2 2007/04/27 19:45:02 christos Exp $
  
  static int
  print_stack_t(tcp, addr)
+@@ -1702,14 +1717,14 @@
+ 	return 0;
+ }
+ 
+-#if defined(FREEBSD) || defined(SUNOS4)
++#if defined(ALLBSD) || defined(SUNOS4)
+ int
+ sys_killpg(tcp)
+ struct tcb *tcp;
+ {
+ 	return sys_kill(tcp);
+ }
+-#endif /* FREEBSD || SUNOS4 */
++#endif /* ALLBSD || SUNOS4 */
+ 
+ #ifdef LINUX
+ int
diff --git a/sysutils/strace/patches/patch-au b/sysutils/strace/patches/patch-au
index 1e9defa6cb5..e632e70e50f 100644
--- a/sysutils/strace/patches/patch-au
+++ b/sysutils/strace/patches/patch-au
@@ -1,7 +1,7 @@
-$NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
+$NetBSD: patch-au,v 1.3 2007/12/05 16:31:01 christos Exp $
 
---- syscall.c.orig	2006-01-12 05:18:53.000000000 -0500
-+++ syscall.c	2007-04-27 23:32:49.000000000 -0400
+--- syscall.c.orig	2006-12-21 17:13:33.000000000 -0500
++++ syscall.c	2007-12-05 11:16:26.000000000 -0500
 @@ -38,9 +38,9 @@
  #include <signal.h>
  #include <time.h>
@@ -24,7 +24,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  #ifdef HAVE_SYS_REG_H
  #include <sys/reg.h>
  #ifndef PTRACE_PEEKUSR
-@@ -634,6 +638,7 @@
+@@ -624,6 +628,7 @@
  }
  #endif
  
@@ -32,7 +32,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  static void
  decode_subcall(tcp, subcall, nsubcalls, style)
  struct tcb *tcp;
-@@ -719,6 +724,7 @@
+@@ -709,6 +714,7 @@
  #endif /* FREEBSD */
  	}
  }
@@ -40,7 +40,23 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  #endif
  
  struct tcb *tcp_last = NULL;
-@@ -855,9 +861,9 @@
+@@ -756,9 +762,12 @@
+ 	   )
+ 		return internal_exec(tcp);
+ 
+-	if (   sys_waitpid == func
+-	    || sys_wait4 == func
+-#if defined(SVR4) || defined(FREEBSD) || defined(SUNOS4)
++	if (
++	    sys_wait4 == func
++#ifndef NETBSD
++	    || sys_waitpid == func
++#endif
++#if defined(SVR4) || defined(ALLBSD) || defined(SUNOS4)
+ 	    || sys_wait == func
+ #endif
+ #ifdef ALPHA
+@@ -811,9 +820,9 @@
         static long rax;
  #endif
  #endif /* LINUX */
@@ -53,7 +69,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  
  int
  get_scno(tcp)
-@@ -1318,9 +1324,9 @@
+@@ -1283,9 +1292,9 @@
  #ifdef HAVE_PR_SYSCALL
  	scno = tcp->status.PR_SYSCALL;
  #else /* !HAVE_PR_SYSCALL */
@@ -65,7 +81,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  	if (pread(tcp->pfd_reg, &regs, sizeof(regs), 0) < 0) {
  	        perror("pread");
                  return -1;
-@@ -1334,8 +1340,41 @@
+@@ -1299,8 +1308,41 @@
  	        scno = regs.r_eax;
  	        break;
  	}
@@ -108,7 +124,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  #endif /* USE_PROCFS */
  	if (!(tcp->flags & TCB_INSYSCALL))
  		tcp->scno = scno;
-@@ -1360,7 +1399,9 @@
+@@ -1325,7 +1367,9 @@
  struct tcb *tcp;
  {
  #ifndef USE_PROCFS
@@ -118,7 +134,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  #else /* USE_PROCFS */
  	int scno = known_scno(tcp);
  
-@@ -1733,17 +1774,36 @@
+@@ -1698,17 +1742,36 @@
  		}
  #endif /* MIPS */
  #endif /* SVR4 */
@@ -157,7 +173,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  	tcp->u_error = u_error;
  	return 1;
  }
-@@ -1926,6 +1986,32 @@
+@@ -1891,6 +1954,32 @@
                  return -1;
          }
  #endif /* FREEBSD */
@@ -190,7 +206,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  
  	/* All branches reach here on success (only).  */
  	tcp->u_error = error;
-@@ -1938,7 +2024,9 @@
+@@ -1903,7 +1992,9 @@
  struct tcb *tcp;
  {
  #ifndef USE_PROCFS
@@ -200,7 +216,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  #endif /* !USE_PROCFS */
  #ifdef LINUX
  #if defined(S390) || defined(S390X)
-@@ -2236,6 +2324,58 @@
+@@ -2201,6 +2292,58 @@
  	I DONT KNOW WHAT TO DO
  #endif /* !HAVE_PR_SYSCALL */
  #endif /* SVR4 */
@@ -259,7 +275,7 @@ $NetBSD: patch-au,v 1.2 2007/04/28 03:42:31 christos Exp $
  #ifdef FREEBSD
  	if (tcp->scno >= 0 && tcp->scno < nsyscalls &&
  	    sysent[tcp->scno].nargs > tcp->status.val)
-@@ -2648,6 +2788,19 @@
+@@ -2570,6 +2713,19 @@
  	pread(tcp->pfd_reg, &regs, sizeof(regs), 0);
  	val = regs.r_edx;
  #endif
diff --git a/sysutils/strace/patches/patch-bb b/sysutils/strace/patches/patch-bb
index 8672eabb24c..21b2c3a326b 100644
--- a/sysutils/strace/patches/patch-bb
+++ b/sysutils/strace/patches/patch-bb
@@ -1,7 +1,7 @@
-$NetBSD: patch-bb,v 1.1 2007/04/27 19:45:03 christos Exp $
+$NetBSD: patch-bb,v 1.2 2007/12/05 16:31:01 christos Exp $
 
---- io.c.orig	2005-06-01 15:22:08.000000000 -0400
-+++ io.c	2007-04-27 15:37:52.000000000 -0400
+--- io.c.orig	2006-12-13 14:57:23.000000000 -0500
++++ io.c	2007-12-05 11:17:44.000000000 -0500
 @@ -74,6 +74,47 @@
  	return 0;
  }
@@ -50,3 +50,12 @@ $NetBSD: patch-bb,v 1.1 2007/04/27 19:45:03 christos Exp $
  #if HAVE_SYS_UIO_H
  void
  tprint_iov(tcp, len, addr)
+@@ -347,7 +388,7 @@
+ 
+ #endif /* LINUX */
+ 
+-#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T
++#if _LFS64_LARGEFILE || HAVE_LONG_LONG_OFF_T && !defined(NETBSD)
+ int
+ sys_pread64(tcp)
+ struct tcb *tcp;
diff --git a/sysutils/strace/patches/patch-bc b/sysutils/strace/patches/patch-bc
new file mode 100644
index 00000000000..5db2bf5cdc1
--- /dev/null
+++ b/sysutils/strace/patches/patch-bc
@@ -0,0 +1,35 @@
+$NetBSD: patch-bc,v 1.1 2007/12/05 16:31:01 christos Exp $
+
+--- quota.c.orig	2006-10-15 20:30:53.000000000 -0400
++++ quota.c	2007-12-05 11:04:38.000000000 -0500
+@@ -687,13 +687,13 @@
+ 
+ #endif /* Linux */
+ 
+-#if defined(SUNOS4) || defined(FREEBSD)
++#if defined(SUNOS4) || defined(ALLBSD)
+ 
+ #ifdef SUNOS4
+ #include <ufs/quota.h>
+ #endif
+ 
+-#ifdef FREEBSD
++#ifdef ALLBSD
+ #include <ufs/ufs/quota.h>
+ #endif
+ 
+@@ -723,7 +723,7 @@
+ 		tprintf(", ");
+ 		printstr(tcp, tcp->u_arg[1], -1);
+ #endif
+-#ifdef FREEBSD
++#ifdef ALLBSD
+ 		printpath(tcp, tcp->u_arg[0]);
+ 		tprintf(", ");
+ 		printxval(quotacmds, tcp->u_arg[1], "Q_???");
+@@ -733,4 +733,4 @@
+ 	return 0;
+ }
+ 
+-#endif /* SUNOS4 || FREEBSD */
++#endif /* SUNOS4 || ALLBSD */
diff --git a/sysutils/strace/patches/patch-bd b/sysutils/strace/patches/patch-bd
new file mode 100644
index 00000000000..3d160eb9260
--- /dev/null
+++ b/sysutils/strace/patches/patch-bd
@@ -0,0 +1,21 @@
+$NetBSD: patch-bd,v 1.1 2007/12/05 16:31:02 christos Exp $
+
+--- desc.c.orig	2007-12-05 11:23:22.000000000 -0500
++++ desc.c	2007-12-05 11:23:34.000000000 -0500
+@@ -425,14 +425,14 @@
+ 	return 0;
+ }
+ 
+-#if defined(ALPHA) || defined(FREEBSD) || defined(SUNOS4)
++#if defined(ALPHA) || defined(ALLBSD) || defined(SUNOS4)
+ int
+ sys_getdtablesize(tcp)
+ struct tcb *tcp;
+ {
+ 	return 0;
+ }
+-#endif /* ALPHA || FREEBSD || SUNOS4 */
++#endif /* ALPHA || ALLBSD || SUNOS4 */
+ 
+ static int
+ decode_select(struct tcb *tcp, long *args, enum bitness_t bitness)
diff --git a/sysutils/strace/patches/patch-be b/sysutils/strace/patches/patch-be
new file mode 100644
index 00000000000..0fb3bf42b54
--- /dev/null
+++ b/sysutils/strace/patches/patch-be
@@ -0,0 +1,40 @@
+$NetBSD: patch-be,v 1.1 2007/12/05 16:31:02 christos Exp $
+
+--- mem.c.orig	2007-12-05 11:20:07.000000000 -0500
++++ mem.c	2007-12-05 11:20:17.000000000 -0500
+@@ -70,7 +70,7 @@
+ #endif
+ }
+ 
+-#if defined(FREEBSD) || defined(SUNOS4)
++#if defined(ALLBSD) || defined(SUNOS4)
+ int
+ sys_sbrk(tcp)
+ struct tcb *tcp;
+@@ -80,7 +80,7 @@
+ 	}
+ 	return RVAL_HEX;
+ }
+-#endif /* FREEBSD || SUNOS4 */
++#endif /* ALLBSD || SUNOS4 */
+ 
+ static const struct xlat mmap_prot[] = {
+ 	{ PROT_NONE,	"PROT_NONE",	},
+@@ -541,7 +541,7 @@
+ 	return 0;
+ }
+ 
+-#if defined(ALPHA) || defined(FREEBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4)
++#if defined(ALPHA) || defined(ALLBSD) || defined(IA64) || defined(SUNOS4) || defined(SVR4)
+ int
+ sys_getpagesize(tcp)
+ struct tcb *tcp;
+@@ -550,7 +550,7 @@
+ 		return RVAL_HEX;
+ 	return 0;
+ }
+-#endif /* ALPHA || FREEBSD || IA64 || SUNOS4 || SVR4 */
++#endif /* ALPHA || ALLBSD || IA64 || SUNOS4 || SVR4 */
+ 
+ #if defined(LINUX) && defined(__i386__)
+ void
author	christos <christos>	2007-12-05 16:30:59 +0000
committer	christos <christos>	2007-12-05 16:30:59 +0000
commit	871af5790a8500c273b949afc3c20b6467b866c0 (patch)
tree	d8e3af3c6632f84f361a4a1ec2b509b26acdfe7b /sysutils
parent	73039a7dbb86bcd516b0269fb119120fbf95e801 (diff)
download	pkgsrc-871af5790a8500c273b949afc3c20b6467b866c0.tar.gz