head 1.16; access; symbols OPENPKG_E1_MP_HEAD:1.12 OPENPKG_E1_MP:1.12 OPENPKG_E1_MP_2_STABLE:1.10.2.1 OPENPKG_E1_FP:1.10.2.1 OPENPKG_2_STABLE_MP:1.12 OPENPKG_2_STABLE_20061018:1.10.2.1 OPENPKG_2_STABLE_20060622:1.10 OPENPKG_2_STABLE:1.10.0.2 OPENPKG_2_STABLE_BP:1.10 OPENPKG_2_5_SOLID:1.7.0.6 OPENPKG_2_5_SOLID_BP:1.7 OPENPKG_2_4_RELEASE:1.7 OPENPKG_2_4_SOLID:1.7.0.4 OPENPKG_2_4_SOLID_BP:1.7 OPENPKG_2_3_RELEASE:1.7 OPENPKG_2_3_SOLID:1.7.0.2 OPENPKG_2_3_SOLID_BP:1.7 OPENPKG_2_2_RELEASE:1.6 OPENPKG_2_2_SOLID:1.6.0.2 OPENPKG_2_2_SOLID_BP:1.6 OPENPKG_2_1_RELEASE:1.4.2.1 OPENPKG_2_1_SOLID:1.4.0.2 OPENPKG_2_1_SOLID_BP:1.4 OPENPKG_2_0_RELEASE:1.3 OPENPKG_2_0_SOLID:1.3.0.2 OPENPKG_2_0_SOLID_BP:1.3; locks; strict; comment @# @; 1.16 date 2008.04.16.06.20.45; author rse; state Exp; branches; next 1.15; commitid XHNgxHLnYMPUziZs; 1.15 date 2007.10.29.14.01.29; author rse; state Exp; branches; next 1.14; commitid 9uvXfP2h5PkLAuDs; 1.14 date 2007.07.12.07.03.18; author rse; state Exp; branches; next 1.13; commitid A6jrP4Qs8hZuMrps; 1.13 date 2007.04.25.06.36.07; author rse; state Exp; branches; next 1.12; commitid CByfqK2RGTsE8qfs; 1.12 date 2006.10.14.11.13.59; author rse; state Exp; branches; next 1.11; commitid eSOTtcEBNfKBSDQr; 1.11 date 2006.10.12.18.12.38; author rse; state Exp; branches; next 1.10; commitid kEtJONVpnnldgqQr; 1.10 date 2006.04.10.17.58.02; author rse; state Exp; branches 1.10.2.1; next 1.9; commitid MkSKnRYf34QS7Esr; 1.9 date 2006.02.22.17.45.23; author rse; state Exp; branches; next 1.8; commitid eFEYrskxQ1zdzBmr; 1.8 date 2006.02.10.18.29.38; author tho; state Exp; branches; next 1.7; commitid iQaeEjYktwzjc4lr; 1.7 date 2004.10.23.07.02.26; author rse; state dead; branches 1.7.6.1; next 1.6; 1.6 date 2004.10.02.17.05.04; author rse; state Exp; branches; next 1.5; 1.5 date 2004.07.13.17.24.05; author rse; state dead; branches; next 1.4; 1.4 date 2004.06.04.11.34.57; author thl; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2004.01.18.09.41.28; author rse; state dead; branches; next 1.2; 1.2 date 2003.11.03.17.39.26; author ms; state Exp; branches; next 1.1; 1.1 date 2003.10.31.10.50.21; author ms; state Exp; branches; next ; 1.10.2.1 date 2006.10.16.14.52.27; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; 1.7.6.1 date 2006.02.10.19.27.24; author rse; state Exp; branches; next ; commitid R4B8I0KRYMe8w4lr; 1.4.2.1 date 2004.07.14.20.19.42; author thl; state dead; branches; next ; desc @@ 1.16 log @upgrading package: lsof 4.78 -> 4.79 @ text @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 # if solaris>=80000 +#include #include #include #define _KERNEL 1 @ 1.15 log @adjustments from upstream vendor to support FreeBSD 7/8 @ text @d2 3 a4 3 --- Configure.orig 2007-04-24 21:00:22 +0200 +++ Configure 2007-07-12 09:01:14 +0200 @@@@ -395,7 +395,7 @@@@ d13 1 a13 1 @@@@ -549,7 +549,7 @@@@ d22 1 a22 1 @@@@ -587,7 +587,7 @@@@ d31 1 a31 1 @@@@ -664,7 +664,7 @@@@ d40 1 a40 1 @@@@ -711,7 +711,7 @@@@ d49 1 a49 32 @@@@ -1420,6 +1420,10 @@@@ LSOF_TSTBIGF=" " LSOF_VERS=6010 ;; + 6.2*) + LSOF_TSTBIGF=" " + LSOF_VERS=6020 + ;; 6*) LSOF_VERS=6000 echo "!!!WARNING!!! Unsupported FreeBSD version: $LSOF_VSTR" @@@@ -1434,6 +1438,10 @@@@ echo "!!!WARNING!!! Unsupported FreeBSD version: $LSOF_VSTR" echo "!!!WARNING!!! Configuring for FreeBSD 7.0" ;; + 8*) + LSOF_TSTBIGF=" " + LSOF_VERS=8000 + ;; *) echo Unknown FreeBSD release: `uname -r` echo Assuming FreeBSD 2.x @@@@ -1525,7 +1533,7 @@@@ LSOF_CFGF="$LSOF_CFGF -DHASVMLOCKH" fi # } ;; - 4000|4010|4020|4030|4040|4050|4060|4070|4080|4090|4100|4110|5000|5010|5020|5030|5040|5050|6000|6010|7000) + 4000|4010|4020|4030|4040|4050|4060|4070|4080|4090|4100|4110|5000|5010|5020|5030|5040|5050|6000|6010|6020|7000|8000) if test -r ${LSOF_INCLUDE}/sys/namei.h # { then grep -q "^struct[ ]*namecache[ ]*{" ${LSOF_INCLUDE}/sys/namei.h @@@@ -1881,7 +1881,7 @@@@ d58 1 a58 1 @@@@ -1933,7 +1933,7 @@@@ d67 1 a67 1 @@@@ -2005,7 +2005,7 @@@@ d76 1 a76 1 @@@@ -2074,7 +2074,7 @@@@ d85 1 a85 1 @@@@ -3268,7 +3268,7 @@@@ d94 1 a94 1 @@@@ -3905,6 +3905,9 @@@@ d104 1 a104 1 @@@@ -3983,7 +3986,7 @@@@ d113 1 a113 1 @@@@ -4008,7 +4011,7 @@@@ d122 1 a122 1 @@@@ -4038,7 +4041,7 @@@@ d131 1 a131 1 @@@@ -4242,7 +4245,7 @@@@ d140 1 a140 1 @@@@ -4325,7 +4328,7 @@@@ d149 1 a149 1 @@@@ -4923,7 +4926,7 @@@@ d160 1 a160 1 +++ dialects/freebsd/machine.h 2007-07-12 09:00:54 +0200 d175 1 a175 1 +++ dialects/sun/machine.h 2007-07-12 09:00:54 +0200 a183 38 --- dialects/freebsd/dlsof.h 2006-03-28 01:29:11 +0200 +++ dialects/freebsd/dlsof.h 2007-10-26 13:22:46 +0200 @@@@ -43,15 +43,15 @@@@ #include #include #include -#include #include # if FREEBSDV>=4000 # if FREEBSDV>=5000 +# if FREEBSDV<6020 # if defined(__alpha__) /* - * For Alpha, #include before #define'ing _KERNEL. Then - * #define PCPU_MD_FIELDS independently. This hack avoids a compiler + * For Alpha below 6.2, #include before #define'ing _KERNEL. + * Then #define PCPU_MD_FIELDS independently. This hack avoids a compiler * complaint about register use. */ @@@@ -63,6 +63,7 @@@@ u_int32_t pc_next_asn; /* next ASN to alloc */ \ u_int32_t pc_current_asngen /* ASN rollover check */ # endif /* defined(__alpha__) */ +# endif /* FREEBSDV<6020 */ #define _KERNEL 1 # endif /* FREEBSDV>=5000 */ #include @@@@ -361,6 +362,8 @@@@ # endif /* FREEBSDV<5000 */ # endif /* FREEBSDV>=2020 */ +#include + #define COMP_P const void #define DEVINCR 1024 /* device table malloc() increment */ @ 1.14 log @ZFS kernel structure header are part of OpenSolaris only, so don't run into trouble under regular Solaris 10 GA @ text @d49 31 d215 38 @ 1.13 log @upgrading package: lsof 4.77 -> 4.78 @ text @d3 1 a3 1 +++ Configure 2007-04-25 08:33:40 +0200 d131 9 d160 1 a160 1 +++ dialects/freebsd/machine.h 2007-04-25 08:22:25 +0200 d175 1 a175 1 +++ dialects/sun/machine.h 2007-04-25 08:22:25 +0200 @ 1.12 log @fix building under Solaris 10/amd64 with a cruel hack @ text @d2 2 a3 2 --- Configure.orig 2006-04-10 14:44:22.000000000 +0200 +++ Configure 2006-10-14 13:09:51.728206602 +0200 d13 4 a16 4 @@@@ -539,7 +539,7 @@@@ LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/aix/aix5" if test $LSOF_VERS -ge 5200 # { then d22 1 a22 1 @@@@ -577,7 +577,7 @@@@ d31 1 a31 1 @@@@ -654,7 +654,7 @@@@ d40 1 a40 1 @@@@ -701,7 +701,7 @@@@ d49 1 a49 1 @@@@ -1865,7 +1865,7 @@@@ d58 10 a67 1 @@@@ -1989,7 +1989,7 @@@@ d76 1 a76 1 @@@@ -2058,7 +2058,7 @@@@ d85 1 a85 1 @@@@ -3244,7 +3244,7 @@@@ d94 1 a94 1 @@@@ -3881,6 +3881,9 @@@@ d98 3 a100 3 + if [ ".`isainfo -k`" = .amd64 ]; then + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" + fi d104 1 a104 1 @@@@ -3959,7 +3962,7 @@@@ d113 1 a113 1 @@@@ -3984,7 +3987,7 @@@@ d122 1 a122 1 @@@@ -4014,7 +4017,7 @@@@ d131 1 a131 1 @@@@ -4240,7 +4243,7 @@@@ d140 1 a140 1 @@@@ -4838,7 +4841,7 @@@@ d150 2 a151 2 --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14.000000000 +0200 +++ dialects/freebsd/machine.h 2006-10-14 13:09:30.370471813 +0200 d165 2 a166 2 --- dialects/sun/machine.h.orig 2006-03-28 00:57:40.000000000 +0200 +++ dialects/sun/machine.h 2006-10-14 13:09:30.370780612 +0200 d173 1 a174 1 #include @ 1.11 log @first cut for Solaris 10/amd64 support @ text @d3 1 a3 1 +++ Configure 2006-10-12 20:02:32.759096443 +0200 d85 11 a95 1 @@@@ -3959,7 +3959,7 @@@@ d104 1 a104 1 @@@@ -3984,7 +3984,7 @@@@ d113 1 a113 1 @@@@ -4014,7 +4014,7 @@@@ d122 1 a122 1 @@@@ -4240,7 +4240,7 @@@@ d131 1 a131 1 @@@@ -4838,7 +4838,7 @@@@ d142 1 a142 1 +++ dialects/freebsd/machine.h 2006-10-12 19:57:28.990204140 +0200 d157 1 a157 1 +++ dialects/sun/machine.h 2006-10-12 19:57:28.990497233 +0200 @ 1.10 log @upgrading package: lsof 4.76 -> 4.77 @ text @d1 3 a3 3 Index: lsof_4.77_src/Configure --- lsof_4.77_src/Configure.orig 2006-04-10 14:44:22 +0200 +++ lsof_4.77_src/Configure 2006-04-10 19:51:46 +0200 d130 3 a132 3 Index: lsof_4.77_src/dialects/freebsd/machine.h --- lsof_4.77_src/dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200 +++ lsof_4.77_src/dialects/freebsd/machine.h 2006-04-10 19:51:46 +0200 d145 11 @ 1.10.2.1 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @d1 3 a3 3 Index: Configure --- Configure.orig 2006-04-10 14:44:22.000000000 +0200 +++ Configure 2006-10-14 13:09:51.728206602 +0200 d85 1 a85 11 @@@@ -3881,6 +3881,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 @@@@ -3959,7 +3962,7 @@@@ d94 1 a94 1 @@@@ -3984,7 +3987,7 @@@@ d103 1 a103 1 @@@@ -4014,7 +4017,7 @@@@ d112 1 a112 1 @@@@ -4240,7 +4243,7 @@@@ d121 1 a121 1 @@@@ -4838,7 +4841,7 @@@@ d130 3 a132 3 Index: dialects/freebsd/machine.h --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14.000000000 +0200 +++ dialects/freebsd/machine.h 2006-10-14 13:09:30.370471813 +0200 a144 11 Index: dialects/sun/machine.h --- dialects/sun/machine.h.orig 2006-03-28 00:57:40.000000000 +0200 +++ dialects/sun/machine.h 2006-10-14 13:09:30.370780612 +0200 @@@@ -75,6 +75,7 @@@@ #include # if solaris>=80000 +#include #include #define _KERNEL 1 #include @ 1.9 log @improve GCC detection. Submitted by: speedy at fozzie.ziew.org @ text @d1 4 a4 80 Index: lsof_4.76_src/dialects/freebsd/dlsof.h --- lsof_4.76_src/dialects/freebsd/dlsof.h.orig 2005-08-08 21:49:26 +0200 +++ lsof_4.76_src/dialects/freebsd/dlsof.h 2006-02-10 19:24:29 +0100 @@@@ -297,6 +297,10 @@@@ #define MALLOC_DECLARE(type) extern struct malloc_type type[1] /* to pacify */ #define _KERNEL +#if FREEBSDV>=6000 +#include +#include +#endif /* FREEBSDV>=6000 */ #include #undef _KERNEL # endif /* FREEBSDV>=5000 */ Index: lsof_4.76_src/dialects/freebsd/dmnt.c --- lsof_4.76_src/dialects/freebsd/dmnt.c.orig 2005-08-08 21:49:27 +0200 +++ lsof_4.76_src/dialects/freebsd/dmnt.c 2006-02-10 19:25:57 +0100 @@@@ -78,8 +78,24 @@@@ struct stat sb; static ss = 0; - if (ss) - return(c->si_inode ^ s); +# if defined(HAS_SI_PRIV) +/* + * If the cdev structure has a private sub-structure, read it. + */ + struct cdev_priv sp; + + if (!c->si_priv || kread((KA_T)c->si_priv, (char *)&sp, sizeof(sp))) + return(0); +#endif /* defined(HAS_SI_PRIV) */ + + if (ss) { +# if defined(HAS_SI_PRIV) + return(sp.cdp_inode ^ s); +# else /* !defined(HAS_SI_PRIV) */ + return(c->si_inode ^ s); +#endif /* defined(HAS_SI_PRIV) */ + } + /* * Determine the random udev seed from stat(2) operations on "/" and * its device. @@@@ -160,8 +176,14 @@@@ * If the device seed is known, return its application to the cdev structure's * inode. */ - if (ss) - return(c->si_inode ^ s); + if (ss) { +# if defined(HAS_SI_PRIV) + return(sp.cdp_inode ^ s); +# else /* !defined(HAS_SI_PRIV) */ + return(c->si_inode ^ s); +#endif /* defined(HAS_SI_PRIV) */ + } + (void) fprintf(stderr, "%s: can't determine user device random seed.\n", Pn); Exit(1); } Index: lsof_4.76_src/dialects/freebsd/machine.h --- lsof_4.76_src/dialects/freebsd/machine.h.orig 2005-08-29 12:21:48 +0200 +++ lsof_4.76_src/dialects/freebsd/machine.h 2006-02-10 19:24:29 +0100 @@@@ -427,6 +427,11 @@@@ */ /* #define HASSECURITY 1 */ +#if FREEBSDV>=6000 +#define HASSECURITY 1 +#define HAS_SI_PRIV 1 +#endif /* FREEBSDV>=6000 */ + /* Index: lsof_4.76_src/Configure --- lsof_4.76_src/Configure.orig 2005-08-29 12:17:38.000000000 +0200 +++ lsof_4.76_src/Configure 2005-12-30 18:38:58.000000000 +0100 @@@@ -396,7 +396,7 @@@@ d13 1 a13 1 @@@@ -540,7 +540,7 @@@@ d22 1 a22 1 @@@@ -578,7 +578,7 @@@@ d31 1 a31 1 @@@@ -655,7 +655,7 @@@@ d40 1 a40 1 @@@@ -702,7 +702,7 @@@@ d49 1 a49 1 @@@@ -1921,7 +1921,7 @@@@ d58 1 a58 1 @@@@ -2045,7 +2045,7 @@@@ d67 1 a67 1 @@@@ -2114,7 +2114,7 @@@@ d76 1 a76 1 @@@@ -3293,7 +3293,7 @@@@ d85 1 a85 1 @@@@ -3975,7 +3975,7 @@@@ d94 1 a94 1 @@@@ -4000,7 +4000,7 @@@@ d103 1 a103 1 @@@@ -4030,7 +4030,7 @@@@ d112 1 a112 1 @@@@ -4256,7 +4256,7 @@@@ d121 1 a121 1 @@@@ -4854,7 +4854,7 @@@@ d130 15 @ 1.8 log @modifying package: lsof-4.76 20051010 -> 20060210 @ text @d77 129 @ 1.7 log @upgrading package: lsof 4.72 -> 4.73 @ text @d1 41 a41 35 Index: dialects/freebsd/dlsof.h --- dialects/freebsd/dlsof.h 2004-07-06 21:19:00 +0200 +++ dialects/freebsd/dlsof.h 2004-08-21 18:37:11 +0200 @@@@ -261,7 +261,13 @@@@ # if defined(DTYPE_KQUEUE) #define HASKQUEUE /* has the kqueue file type */ +# if FREEBSDV>=4090 +#define _KERNEL +# endif /* FREEBSDV>=4090 */ #include +# if FREEBSDV>=4090 +#undef _KERNEL +# endif /* FREEBSDV>=4090 */ # endif /* defined(DTYPE_KQUEUE) */ # if FREEBSDV<2000 @@@@ -282,7 +288,13 @@@@ #include # if FREEBSDV>=2020 +# if FREEBSDV>=4090 +#define _KERNEL +# endif /* FREEBSDV>=4090 */ #include +# if FREEBSDV>=4090 +#undef _KERNEL +# endif /* FREEBSDV>=4090 */ # if defined(HASVMLOCKH) #include # endif /* defined(HASVMLOCKH) */ Index: dialects/freebsd/machine.h --- dialects/freebsd/machine.h 2004-07-06 21:19:09 +0200 +++ dialects/freebsd/machine.h 2004-08-21 18:37:11 +0200 @@@@ -423,10 +423,21 @@@@ d43 23 a65 7 * HASSETLOCALE is defined for those dialects that have and * setlocale(). + * + * If the dialect also has wide character support for language locales, + * HASWIDECHAR activates lsof's wide character support and WIDECHARINCL + * defines the header file (if any) that must be #include'd to use the + * mblen() and mbtowc() functions. d68 6 a73 1 #define HASSETLOCALE 1 a74 6 +# if FREEBSDV>=5200 +#define HASWIDECHAR 1 +# endif /* FREEBSDV>=5020 */ + +/* #define WIDECHARINCL */ + a76 1 * HASSNODE is defined for those dialects that have snodes. @ 1.7.6.1 log @MFC: fix building under FreeBSD 6.0 @ text @d1 35 a35 41 Index: lsof_4.76_src/dialects/freebsd/dlsof.h --- lsof_4.76_src/dialects/freebsd/dlsof.h.orig 2005-08-08 21:49:26 +0200 +++ lsof_4.76_src/dialects/freebsd/dlsof.h 2006-02-10 19:24:29 +0100 @@@@ -297,6 +297,10 @@@@ #define MALLOC_DECLARE(type) extern struct malloc_type type[1] /* to pacify */ #define _KERNEL +#if FREEBSDV>=6000 +#include +#include +#endif /* FREEBSDV>=6000 */ #include #undef _KERNEL # endif /* FREEBSDV>=5000 */ Index: lsof_4.76_src/dialects/freebsd/dmnt.c --- lsof_4.76_src/dialects/freebsd/dmnt.c.orig 2005-08-08 21:49:27 +0200 +++ lsof_4.76_src/dialects/freebsd/dmnt.c 2006-02-10 19:25:57 +0100 @@@@ -78,8 +78,24 @@@@ struct stat sb; static ss = 0; - if (ss) - return(c->si_inode ^ s); +# if defined(HAS_SI_PRIV) +/* + * If the cdev structure has a private sub-structure, read it. + */ + struct cdev_priv sp; + + if (!c->si_priv || kread((KA_T)c->si_priv, (char *)&sp, sizeof(sp))) + return(0); +#endif /* defined(HAS_SI_PRIV) */ + + if (ss) { +# if defined(HAS_SI_PRIV) + return(sp.cdp_inode ^ s); +# else /* !defined(HAS_SI_PRIV) */ + return(c->si_inode ^ s); +#endif /* defined(HAS_SI_PRIV) */ + } + d37 7 a43 5 * Determine the random udev seed from stat(2) operations on "/" and * its device. @@@@ -160,8 +176,14 @@@@ * If the device seed is known, return its application to the cdev structure's * inode. d45 6 a50 9 - if (ss) - return(c->si_inode ^ s); + if (ss) { +# if defined(HAS_SI_PRIV) + return(sp.cdp_inode ^ s); +# else /* !defined(HAS_SI_PRIV) */ + return(c->si_inode ^ s); +#endif /* defined(HAS_SI_PRIV) */ + } d52 1 a52 14 (void) fprintf(stderr, "%s: can't determine user device random seed.\n", Pn); Exit(1); } Index: lsof_4.76_src/dialects/freebsd/machine.h --- lsof_4.76_src/dialects/freebsd/machine.h.orig 2005-08-29 12:21:48 +0200 +++ lsof_4.76_src/dialects/freebsd/machine.h 2006-02-10 19:24:29 +0100 @@@@ -427,6 +427,11 @@@@ */ /* #define HASSECURITY 1 */ +#if FREEBSDV>=6000 +#define HASSECURITY 1 +#define HAS_SI_PRIV 1 +#endif /* FREEBSDV>=6000 */ a54 1 d56 1 @ 1.6 log @port to FreeBSD 5.3 by backporting forthcoming vendor changes from 4.73 @ text @@ 1.5 log @upgrading package: lsof 4.71 -> 4.72 @ text @d2 55 a56 13 --- dialects/freebsd/dlsof.h.orig 2004-06-04 13:19:33.000000000 +0200 +++ dialects/freebsd/dlsof.h 2004-06-04 13:21:23.000000000 +0200 @@@@ -64,6 +64,10 @@@@ u_int32_t pc_current_asngen /* ASN rollover check */ # endif /* defined(__alpha__) */ #define _KERNEL 1 +/* fix build on FreeBSD 5.2 by appending missing typedef from + sys/types.h which was omitted by a previous include with + _KERNEL undefined */ +typedef __cpumask_t cpumask_t; # endif /* FREEBSDV>=500 */ #include # if FREEBSDV>=500 @ 1.4 log @fix build on FreeBSD 5.2 by appending missing typedef @ text @@ 1.4.2.1 log @MFC: lsof to enhance FreeBSD 5.2 experience @ text @@ 1.3 log @upgrading package: lsof 4.69 -> 4.70 @ text @d1 14 a14 117 diff -Naur lsof_4.69.orig/lsof_4.69_src/dialects/sun/dlsof.h lsof_4.69/lsof_4.69_src/dialects/sun/dlsof.h --- lsof_4.69.orig/lsof_4.69_src/dialects/sun/dlsof.h Mon Oct 13 15:30:14 2003 +++ lsof_4.69/lsof_4.69_src/dialects/sun/dlsof.h Mon Nov 3 18:33:13 2003 @@@@ -96,7 +96,7 @@@@ #define inet_pton __inet_pton #include #undef inet_ntop -#undef inet_pto +#undef inet_pton # endif /* defined(HAS_IPCLASSIFIER_H) */ #include @@@@ -159,13 +159,21 @@@@ #include # if solaris>=100000 +#define printf lsof_printf +#define snprintf lsof_snprintf +#define sprintf lsof_sprintf #define swab lsof_swab #define vprintf lsof_vprintf +#define vsnprintf lsof_vsnprintf #define vsprintf lsof_vsprintf #include -#undef lsof_swab -#undef lsof_vprintf -#undef lsof_vsprintf +#undef printf +#undef snprintf +#undef sprintf +#undef swab +#undef vprintf +#undef vsnprintf +#undef vsprintf # endif /* solaris>=100000 */ #include diff -Naur lsof_4.69.orig/lsof_4.69_src/dialects/sun/dnode.c lsof_4.69/lsof_4.69_src/dialects/sun/dnode.c --- lsof_4.69.orig/lsof_4.69_src/dialects/sun/dnode.c Mon Oct 13 15:30:21 2003 +++ lsof_4.69/lsof_4.69_src/dialects/sun/dnode.c Mon Nov 3 18:33:13 2003 @@@@ -762,20 +762,12 @@@@ Lf->is_stream = 1; } if (Ntype < 0) { - -#if solaris<100000 (void) snpf(Namech, Namechl, "unknown file system type%s%s%s, v_op: %s", fxs ? " (" : "", fxs ? Fsinfo[fx] : "", fxs ? ")" : "", print_kptr((KA_T)v->v_op, (char *)NULL, 0)); -#else /* solaris>=100000 */ - (void) snpf(Namech, Namechl, - "unknown file system type: %s", - fxs ? Fsinfo[fx] : "(unknown)"); -#endif /* solaris<100000 */ - enter_nm(Namech); return; } @@@@ -1748,13 +1740,7 @@@@ Lf->inp_ty = 1; break; case N_HSFS: - -#if defined(HAS_HS_NODEID) Lf->inode = (unsigned long)h.hs_nodeid; -#else /* defined(HAS_HS_NODEID) */ - Lf->inode = (unsigned long)h.hs_dirent.ext_lbn; -#endif /* defined(HAS_HS_NODEID) */ - Lf->inp_ty = 1; break; @@@@ -2182,11 +2168,22 @@@@ if (vfs) { Lf->fsdir = vfs->dir; Lf->fsdev = vfs->fsname; - if (!Lf->fsdir && !Lf->fsdev && kvs && fxs) + if (!Lf->fsdir && !Lf->fsdev && kvs && fxs) { + + /* + * The file system names are unknown. + * + * Set the file system device to the file system type and clear + * the doubtful device numbers. + */ Lf->fsdev = Fsinfo[fx]; + devs = 0; + rdevs = 0; + } #if defined(HASFSINO) - Lf->fs_ino = vfs->fs_ino; + else + Lf->fs_ino = vfs->fs_ino; #endif /* defined(HASFSINO) */ } diff -Naur lsof_4.69.orig/lsof_4.69_src/dialects/sun/machine.h lsof_4.69/lsof_4.69_src/dialects/sun/machine.h --- lsof_4.69.orig/lsof_4.69_src/dialects/sun/machine.h Mon Oct 13 15:30:30 2003 +++ lsof_4.69/lsof_4.69_src/dialects/sun/machine.h Mon Nov 3 18:33:13 2003 @@@@ -42,6 +42,13 @@@@ */ #include + +/* + * Define a dummy aio_req structure for Solaris 10, because #include'ing + * with _KERNEL defined creates too many problems. + */ + +typedef struct aio_req { int dummy; } aio_req_t; # endif /* solaris>=10000 */ @ 1.2 log @Fixes for a HSFS inode bug, and to correct building on Solaris 10 SPARC @ text @@ 1.1 log @More patch code just for new features in Solaris 10 @ text @d3 1 a3 1 +++ lsof_4.69/lsof_4.69_src/dialects/sun/dlsof.h Fri Oct 31 11:44:28 2003 d38 80 @