diff -r fa4856f209c2 -r 673ed164f8e5 lsof/lsof.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lsof/lsof.patch	Thu Jan 08 10:18:50 2009 +0100
@@ -0,0 +1,183 @@
+Index: Configure
+--- Configure.orig	2008-04-15 15:24:36 +0200
++++ Configure	2008-04-16 08:19:20 +0200
+@@ -413,7 +413,7 @@
+       fi	# }
+     fi	# }
+     LSOF_TGT="aix"
+-    echo $LSOF_CC | grep gcc > /dev/null
++    $LSOF_CC --version | grep GCC > /dev/null
+     if test $? -eq 0	# {
+     then
+ 
+@@ -567,7 +567,7 @@
+ 
+ 	    rm -f dialects/aix/aix5/j2/j2_snapshot.h
+ 	  fi	# }
+-	  echo $LSOF_CC | grep gcc > /dev/null
++	  $LSOF_CC --version | grep GCC > /dev/null
+ 	  if test $? -eq 0	# {
+ 	  then
+ 
+@@ -605,7 +605,7 @@
+       # This is AIX >= 5 on ia64.
+ 
+ 	LSOF_TSTK64=1
+-	echo $LSOF_CC | grep gcc > /dev/null
++	$LSOF_CC --version | grep GCC > /dev/null
+ 	if test $? -eq 0	# {
+ 	then
+ 
+@@ -682,7 +682,7 @@
+ 	  fi	# }
+ 	  LSOF_TSTK64=1
+ 	  LSOF_TMP1=1
+-	  echo $LSOF_CC | grep gcc > /dev/null
++	  $LSOF_CC --version | grep GCC > /dev/null
+ 	  if test $? -eq 0	# {
+ 	  then
+ 	    LSOF_CFGF="$LSOF_CFGF -maix64"
+@@ -729,7 +729,7 @@
+     fi	#}
+     LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
+     LSOF_DIALECT_DIR=aix
+-    echo $LSOF_CC | grep gcc > /dev/null
++    $LSOF_CC --version | grep GCC > /dev/null
+     if test $? -eq 0 	# {
+     then
+ 
+@@ -1995,7 +1995,7 @@
+ 	fi	# }
+       fi	# }
+     fi	# }
+-    echo $LSOF_CC | grep gcc > /dev/null
++    $LSOF_CC --version | grep GCC > /dev/null
+     if test $? -eq 0	# {
+     then
+       LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+@@ -2047,7 +2047,7 @@
+       then
+ 	LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
+       else
+-	echo $LSOF_CC | grep -q gcc
++	$LSOF_CC --version | grep -q GCC
+ 	if test $? -ne 0	# {
+ 	then
+ 	  LSOF_CFGF="$LSOF_CFGF +DD32"
+@@ -2127,7 +2127,7 @@
+ 	    echo "* NOTICE!  Configuring for 64 bit HP-UX *"
+ 	    echo "*                                       *"
+ 	    echo "*****************************************"
+-	    echo $LSOF_CC | grep gcc > /dev/null
++	    $LSOF_CC --version | grep GCC > /dev/null
+ 	    if test $? -eq 0	# {
+ 	    then
+ 
+@@ -2196,7 +2196,7 @@
+ 	  else
+ 	    LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
+ 	    LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
+-	    echo $LSOF_CC | grep gcc > /dev/null
++	    $LSOF_CC --version | grep GCC > /dev/null
+ 	    if test $? -ne 0	# {
+ 	    then
+ 	      LSOF_CFGF="$LSOF_CFGF +DAportable"
+@@ -3403,7 +3403,7 @@
+ 	LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
+       fi	# }
+     fi	# }
+-    echo $LSOF_CC | grep gcc > /dev/null
++    $LSOF_CC --version | grep GCC > /dev/null
+     if test $? -eq 0	# {
+     then
+       LSOF_CFGL="-w"
+@@ -4040,6 +4040,9 @@
+ 	LSOF_TSTBIGF=" "
+ 	LSOF_TSTLFLG="-lsocket -lnsl"
+ 	LSOF_VERS="100000"
++ 	if [ ".`isainfo -k`" = .amd64 ]; then
++ 	    LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
++ 	fi
+ 	;;
+       *)
+ 	echo Unknown Solaris version: $LSOF_VSTR
+@@ -4118,7 +4121,7 @@
+ 	echo "main(){" >> ${LSOF_TMPC}.c
+ 	echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
+ 	echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
+-	echo $LSOF_CC | grep gcc > /dev/null
++	$LSOF_CC --version | grep GCC > /dev/null
+ 	if test $? -eq 0	# {
+ 	then
+ 	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x  > /dev/null 2>&1
+@@ -4143,7 +4146,7 @@
+ 	echo "main(){" >> ${LSOF_TMPC}.c
+ 	echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
+ 	echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
+-	echo $LSOF_CC | grep gcc > /dev/null
++	$LSOF_CC --version | grep GCC > /dev/null
+ 	if test $? -eq 0	# {
+ 	then
+ 	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
+@@ -4173,7 +4176,7 @@
+ 	echo $SOLARIS_KERNBITS | grep 64 > /dev/null
+ 	if test $? -eq 0	# {
+ 	then
+-	  echo $LSOF_CC | grep gcc > /dev/null
++	  $LSOF_CC --version | grep GCC > /dev/null
+ 	  if test $? -eq 0	# {
+ 	  then
+ 
+@@ -4377,7 +4380,7 @@
+ 
+       # Check for Solaris 10 or higher ZFS.
+ 
+-      if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h	# {
++      if false	# {
+       then
+ 	LSOF_TMP1="dmu.h zfs_acl.h zfs_debug.h zfs_rlock.h zil.h spa.h zfs_context.h zfs_dir.h zfs_vfsops.h zio.h txg.h zfs_ctldir.h zfs_ioctl.h zfs_znode.h zio_impl.h"
+ 	LSOF_TMP2=""
+@@ -4460,7 +4463,7 @@
+       echo "main(){" >> ${LSOF_TMPC}.c
+       echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
+       echo "Testing vnode.h for VSOCK, using $LSOF_CC"
+-      echo $LSOF_CC | grep gcc > /dev/null
++      $LSOF_CC --version | grep GCC > /dev/null
+       if test $? -eq 0	# {
+       then
+ 	$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
+@@ -5139,7 +5142,7 @@
+     echo "$i" >> $LSOF_TSTCFLG
+   done	# }
+ fi	# }
+-echo $LSOF_CC | grep gcc > /dev/null 2>&1
++$LSOF_CC --version | grep GCC > /dev/null 2>&1
+ if test $? -eq 0	# {
+ then
+   echo "-DLT_GCC" >> $LSOF_TSTCFLG
+Index: dialects/freebsd/machine.h
+--- dialects/freebsd/machine.h.orig	2006-03-28 01:29:14 +0200
++++ dialects/freebsd/machine.h	2008-04-16 08:17:46 +0200
+@@ -436,6 +436,11 @@
+  */
+ 
+ /* #define	HASSECURITY	1 */
++#if    FREEBSDV>=6000
++#define        HASSECURITY     1
++#define        HAS_SI_PRIV     1
++#endif /* FREEBSDV>=6000 */
++
+ 
+ 
+ /*
+Index: dialects/sun/machine.h
+--- dialects/sun/machine.h.orig	2007-04-24 18:23:25 +0200
++++ dialects/sun/machine.h	2008-04-16 08:17:46 +0200
+@@ -75,6 +75,7 @@
+ #include <sys/poll.h>
+ 
+ # if	solaris>=80000
++#include <sys/types32.h>
+ #include <sys/wait.h>
+ #include <sys/types32.h>
+ #define	_KERNEL	1