1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/lsof/lsof.patch Thu Jan 08 10:18:50 2009 +0100
1.3 @@ -0,0 +1,183 @@
1.4 +Index: Configure
1.5 +--- Configure.orig 2008-04-15 15:24:36 +0200
1.6 ++++ Configure 2008-04-16 08:19:20 +0200
1.7 +@@ -413,7 +413,7 @@
1.8 + fi # }
1.9 + fi # }
1.10 + LSOF_TGT="aix"
1.11 +- echo $LSOF_CC | grep gcc > /dev/null
1.12 ++ $LSOF_CC --version | grep GCC > /dev/null
1.13 + if test $? -eq 0 # {
1.14 + then
1.15 +
1.16 +@@ -567,7 +567,7 @@
1.17 +
1.18 + rm -f dialects/aix/aix5/j2/j2_snapshot.h
1.19 + fi # }
1.20 +- echo $LSOF_CC | grep gcc > /dev/null
1.21 ++ $LSOF_CC --version | grep GCC > /dev/null
1.22 + if test $? -eq 0 # {
1.23 + then
1.24 +
1.25 +@@ -605,7 +605,7 @@
1.26 + # This is AIX >= 5 on ia64.
1.27 +
1.28 + LSOF_TSTK64=1
1.29 +- echo $LSOF_CC | grep gcc > /dev/null
1.30 ++ $LSOF_CC --version | grep GCC > /dev/null
1.31 + if test $? -eq 0 # {
1.32 + then
1.33 +
1.34 +@@ -682,7 +682,7 @@
1.35 + fi # }
1.36 + LSOF_TSTK64=1
1.37 + LSOF_TMP1=1
1.38 +- echo $LSOF_CC | grep gcc > /dev/null
1.39 ++ $LSOF_CC --version | grep GCC > /dev/null
1.40 + if test $? -eq 0 # {
1.41 + then
1.42 + LSOF_CFGF="$LSOF_CFGF -maix64"
1.43 +@@ -729,7 +729,7 @@
1.44 + fi #}
1.45 + LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
1.46 + LSOF_DIALECT_DIR=aix
1.47 +- echo $LSOF_CC | grep gcc > /dev/null
1.48 ++ $LSOF_CC --version | grep GCC > /dev/null
1.49 + if test $? -eq 0 # {
1.50 + then
1.51 +
1.52 +@@ -1995,7 +1995,7 @@
1.53 + fi # }
1.54 + fi # }
1.55 + fi # }
1.56 +- echo $LSOF_CC | grep gcc > /dev/null
1.57 ++ $LSOF_CC --version | grep GCC > /dev/null
1.58 + if test $? -eq 0 # {
1.59 + then
1.60 + LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
1.61 +@@ -2047,7 +2047,7 @@
1.62 + then
1.63 + LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
1.64 + else
1.65 +- echo $LSOF_CC | grep -q gcc
1.66 ++ $LSOF_CC --version | grep -q GCC
1.67 + if test $? -ne 0 # {
1.68 + then
1.69 + LSOF_CFGF="$LSOF_CFGF +DD32"
1.70 +@@ -2127,7 +2127,7 @@
1.71 + echo "* NOTICE! Configuring for 64 bit HP-UX *"
1.72 + echo "* *"
1.73 + echo "*****************************************"
1.74 +- echo $LSOF_CC | grep gcc > /dev/null
1.75 ++ $LSOF_CC --version | grep GCC > /dev/null
1.76 + if test $? -eq 0 # {
1.77 + then
1.78 +
1.79 +@@ -2196,7 +2196,7 @@
1.80 + else
1.81 + LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
1.82 + LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
1.83 +- echo $LSOF_CC | grep gcc > /dev/null
1.84 ++ $LSOF_CC --version | grep GCC > /dev/null
1.85 + if test $? -ne 0 # {
1.86 + then
1.87 + LSOF_CFGF="$LSOF_CFGF +DAportable"
1.88 +@@ -3403,7 +3403,7 @@
1.89 + LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
1.90 + fi # }
1.91 + fi # }
1.92 +- echo $LSOF_CC | grep gcc > /dev/null
1.93 ++ $LSOF_CC --version | grep GCC > /dev/null
1.94 + if test $? -eq 0 # {
1.95 + then
1.96 + LSOF_CFGL="-w"
1.97 +@@ -4040,6 +4040,9 @@
1.98 + LSOF_TSTBIGF=" "
1.99 + LSOF_TSTLFLG="-lsocket -lnsl"
1.100 + LSOF_VERS="100000"
1.101 ++ if [ ".`isainfo -k`" = .amd64 ]; then
1.102 ++ LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
1.103 ++ fi
1.104 + ;;
1.105 + *)
1.106 + echo Unknown Solaris version: $LSOF_VSTR
1.107 +@@ -4118,7 +4121,7 @@
1.108 + echo "main(){" >> ${LSOF_TMPC}.c
1.109 + echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
1.110 + echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
1.111 +- echo $LSOF_CC | grep gcc > /dev/null
1.112 ++ $LSOF_CC --version | grep GCC > /dev/null
1.113 + if test $? -eq 0 # {
1.114 + then
1.115 + $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
1.116 +@@ -4143,7 +4146,7 @@
1.117 + echo "main(){" >> ${LSOF_TMPC}.c
1.118 + echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
1.119 + echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
1.120 +- echo $LSOF_CC | grep gcc > /dev/null
1.121 ++ $LSOF_CC --version | grep GCC > /dev/null
1.122 + if test $? -eq 0 # {
1.123 + then
1.124 + $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
1.125 +@@ -4173,7 +4176,7 @@
1.126 + echo $SOLARIS_KERNBITS | grep 64 > /dev/null
1.127 + if test $? -eq 0 # {
1.128 + then
1.129 +- echo $LSOF_CC | grep gcc > /dev/null
1.130 ++ $LSOF_CC --version | grep GCC > /dev/null
1.131 + if test $? -eq 0 # {
1.132 + then
1.133 +
1.134 +@@ -4377,7 +4380,7 @@
1.135 +
1.136 + # Check for Solaris 10 or higher ZFS.
1.137 +
1.138 +- if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
1.139 ++ if false # {
1.140 + then
1.141 + 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"
1.142 + LSOF_TMP2=""
1.143 +@@ -4460,7 +4463,7 @@
1.144 + echo "main(){" >> ${LSOF_TMPC}.c
1.145 + echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
1.146 + echo "Testing vnode.h for VSOCK, using $LSOF_CC"
1.147 +- echo $LSOF_CC | grep gcc > /dev/null
1.148 ++ $LSOF_CC --version | grep GCC > /dev/null
1.149 + if test $? -eq 0 # {
1.150 + then
1.151 + $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
1.152 +@@ -5139,7 +5142,7 @@
1.153 + echo "$i" >> $LSOF_TSTCFLG
1.154 + done # }
1.155 + fi # }
1.156 +-echo $LSOF_CC | grep gcc > /dev/null 2>&1
1.157 ++$LSOF_CC --version | grep GCC > /dev/null 2>&1
1.158 + if test $? -eq 0 # {
1.159 + then
1.160 + echo "-DLT_GCC" >> $LSOF_TSTCFLG
1.161 +Index: dialects/freebsd/machine.h
1.162 +--- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200
1.163 ++++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200
1.164 +@@ -436,6 +436,11 @@
1.165 + */
1.166 +
1.167 + /* #define HASSECURITY 1 */
1.168 ++#if FREEBSDV>=6000
1.169 ++#define HASSECURITY 1
1.170 ++#define HAS_SI_PRIV 1
1.171 ++#endif /* FREEBSDV>=6000 */
1.172 ++
1.173 +
1.174 +
1.175 + /*
1.176 +Index: dialects/sun/machine.h
1.177 +--- dialects/sun/machine.h.orig 2007-04-24 18:23:25 +0200
1.178 ++++ dialects/sun/machine.h 2008-04-16 08:17:46 +0200
1.179 +@@ -75,6 +75,7 @@
1.180 + #include <sys/poll.h>
1.181 +
1.182 + # if solaris>=80000
1.183 ++#include <sys/types32.h>
1.184 + #include <sys/wait.h>
1.185 + #include <sys/types32.h>
1.186 + #define _KERNEL 1
