4.69 is out, 4.68 is gone. Approved by agc.

8 files changed, 5 insertions, 422 deletions

diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 2cc07a9f223..afd777cae5f 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2003/10/05 07:26:11 veego Exp $
+# $NetBSD: Makefile,v 1.68 2003/11/22 23:19:47 christos Exp $
 #
 
-DISTNAME=		lsof_4.68
+DISTNAME=		lsof_4.69
 PKGNAME=		${DISTNAME:S/_/-/}
-PKGREVISION=		2
 WRKSRC=			${WRKDIR}/${DISTNAME}/${SRCBALL_NAME}
 CATEGORIES=		sysutils
 MASTER_SITES=		ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/  \
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo
index 13cc8c4d60b..4de179a0e69 100644
--- a/sysutils/lsof/distinfo
+++ b/sysutils/lsof/distinfo
@@ -1,10 +1,4 @@
-$NetBSD: distinfo,v 1.32 2003/10/04 20:22:35 atatat Exp $
+$NetBSD: distinfo,v 1.33 2003/11/22 23:19:47 christos Exp $
 
-SHA1 (lsof_4.68.tar.gz) = 71df82816e84b4218c473a7102ff31c002192803
-Size (lsof_4.68.tar.gz) = 963862 bytes
-SHA1 (patch-aa) = 7e13302b231240a5225fb02a604268539d956fe7
-SHA1 (patch-ab) = f27ce713c6a00825c96deab0eb013ea57dcfc1ae
-SHA1 (patch-ac) = 4cd8d56feb94008c7d54df7f3bbd0c64bcbcfbd8
-SHA1 (patch-ad) = f1c66f3903ac99dfdfce9163ede04dc3b84af2d4
-SHA1 (patch-ae) = ab22b7026bb59bbaa9e41349f452b8274ccdc43a
-SHA1 (patch-af) = 51d1c7ebfeeb95cb1fcefef22fc96f4cf769d115
+SHA1 (lsof_4.69.tar.gz) = 2ed1fc88e5508dfc38dc0a70559b6e8ee78a0bae
+Size (lsof_4.69.tar.gz) = 969757 bytes
diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa
deleted file mode 100644
index 10369a0e9a1..00000000000
--- a/sysutils/lsof/patches/patch-aa
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-aa,v 1.21 2003/08/13 13:24:16 atatat Exp $
-
-If LSOF_MORE_SECURE is non-zero, compile lsof with security, and
-only let unprivileged (non-root) users view their own open files.
-Set LSOF_LESS_SECURE_SOCKETS to non-zero in order to allow non-root
-users to see open sockets, even when LSOF_MORE_SECURE is set.
-
-Patch for vnode/DNLC interface change courtesy of lsof maintainer.
-
---- dialects/n+obsd/machine.h.orig	Tue Dec  3 13:23:54 2002
-+++ dialects/n+obsd/machine.h
-@@ -214,16 +214,12 @@
-  * that lsof can search.  A value of 1 directs printname() to prefix the
-  * cache value with the file system directory name; 2, avoid the prefix.
-  *
-- * HASNCAPID is defined for those dialects with a searchable kernel name
-- * cache whose cache and vnodes are linked by a capability ID.
-- *
-  * NCACHELDPFX is a set of C commands to execute before calling ncache_load().
-  *
-  * NCACHELDSFX is a set of C commands to execute after calling ncache_load().
-  */
- 
- #define	HASNCACHE	1
--#define	HASNCAPID	1
- /* #define	NCACHELDPFX	??? */
- /* #define	NCACHELDSFX	??? */
- 
-@@ -371,7 +371,9 @@
-  * (the one that its user logged on with) of the lsof process.
-  */
- 
--/* #define	HASSECURITY	1 */
-+#if LSOF_MORE_SECURE
-+#define	HASSECURITY	1
-+#endif
- 
- 
- /*
-@@ -380,7 +382,9 @@
-  * listing is selected by the "-i" option.
-  */
- 
--/* #define	HASNOSOCKSECURITY	1	*/
-+#if LSOF_LESS_SECURE_SOCKETS
-+#define	HASNOSOCKSECURITY	1
-+#endif
- 
- 
- /*
-@@ -497,7 +493,7 @@
- 
- # if	(defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020)
- #define	USE_LIB_RNMH				1	/* rnmh.c */
--# else	/* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
-+# else	/* (defined(OPENBSDV) && OPENBSDV<2010) && (defined(NETBSDV) && NETBSDV<1020) */
- #define	USE_LIB_RNAM				1	/* rnam.c */
- # endif	/* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
- 
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab
deleted file mode 100644
index b55e44fa350..00000000000
--- a/sysutils/lsof/patches/patch-ab
+++ /dev/null
@@ -1,127 +0,0 @@
-$NetBSD: patch-ab,v 1.23 2003/10/04 20:22:35 atatat Exp $
-
-Patch for vnode/DNLC interface change courtesy of lsof maintainer.
-
---- Configure.orig	2003-06-11 20:55:38.000000000 -0400
-+++ Configure
-@@ -819,10 +819,13 @@ case $LSOF_TGT in	# {
- 	LSOF_CFGF="$LSOF_CFGF -DHASFDLINK"
-       fi	# }
-     fi	# }
--    grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
--    if test $? -eq 0	# {
-+    if test -r ${LSOF_INCLUDE}/sys/namei.h
-     then
--      LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
-+      if test $? -eq 0	# {
-+      then
-+        LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      fi	# }
-     fi	# }
-     if test $LSOF_VERS -ge 40000	# {
-     then
-@@ -938,6 +941,14 @@ case $LSOF_TGT in	# {
- 	exit 1
-       fi	# }
-     fi	# }
-+    if test -r ${LSOF_INCLUDE}/sys/namei.h
-+    then
-+      grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
-+      if test $? -eq 0	# {
-+      then
-+        LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      fi	# }
-+    fi	# }
-     LSOF_DINC="$LSOF_DINC -I`pwd`/dialects/darwin/xnu/bsd"
-     LSOF_DINC="$LSOF_DINC -I/usr/include"
-     LSOF_DINC="$LSOF_DINC -I${DARWIN_SYSDIR}/System.framework/PrivateHeaders"
-@@ -1175,6 +1186,14 @@ kernel generation process.
- 
-       LSOF_CFGF="$LSOF_CFGF -DHASIPv6"
-     fi	# }
-+    if test -r ${LSOF_INCLUDE}/sys/namei.h
-+    then
-+      grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
-+      if test $? -eq 0	# {
-+      then
-+        LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      fi	# }
-+    fi	# }
-     LSOF_DIALECT_DIR=du
-     ;;
- 
-@@ -1526,10 +1545,13 @@ kernel generation process.
-       fi	# }
-       LSOF_CFGF="$LSOF_CFGF -DHAS9660FS"
-     fi	# }
--    grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
--    if test $? -eq 0	# {
-+    if test -r ${LSOF_INCLUDE}/sys/namei.h
-     then
--      LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
-+      if test $? -eq 0	# {
-+      then
-+        LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      fi	# }
-     fi	# }
-     if test $LSOF_DINC_ADD -eq 1	# {
-     then
-@@ -2217,6 +2239,11 @@ kernel generation process.
-     then
-       LSOF_CFGF="$LSOF_CFGF -DHASPROCFS"
-       LSOF_TMP1=1
-+      grep -q PFSroot ${NETBSD_SYS}/miscfs/procfs/procfs.h
-+      if test $? -eq 0	# {
-+      then
-+	LSOF_CFGF="$LSOF_CFGF -DHASPROCFS_PFSROOT"
-+      fi	# }
-     fi	# }
-     if test -d ${NETBSD_SYS}/isofs/cd9660	# {
-     then
-@@ -2235,16 +2262,24 @@ kernel generation process.
- 	then
-  	  LSOF_CFGF="$LSOF_CFGF -DHASKERNFS"
- 	  LSOF_TMP1=1
-+	  grep -q "*kfs_kt;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h
-+	  if test $? -eq 0	# {
-+	  then
-+	    LSOF_CFGF="$LSOF_CFGF -DHASKERNFS_KFS_KT"
-+	  fi	# }
-       fi	# }
-     fi	# }
-     if test $LSOF_TMP1 -eq 1	# {
-     then
-       LSOF_DINC="-I$LSOF_INCLUDE -I$NETBSD_SYS"
-     fi	# }
--    grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
--    if test $? -eq 0	# {
-+    if test -r ${LSOF_INCLUDE}/sys/namei.h
-     then
--      LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
-+      if test $? -eq 0	# {
-+      then
-+        LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      fi	# }
-     fi	# }
-     grep -q i_ffs_size ${LSOF_INCLUDE}/ufs/ufs/inode.h
-     if test $? -eq 0	# {
-@@ -2645,10 +2680,13 @@ kernel generation process.
- 	LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR"
-       fi	# }
-     fi	# }
--    grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
--    if test $? -eq 0	# {
-+    if test -r ${LSOF_INCLUDE}/sys/namei.h
-     then
--      LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      grep -q nc_vpid ${LSOF_INCLUDE}/sys/namei.h
-+      if test $? -eq 0	# {
-+      then
-+        LSOF_CFGF="$LSOF_CFGF -DHASNCVPID"
-+      fi	# }
-     fi	# }
-     if test "X$OPENBSD_UVM" = "X"	# {
-     then
diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac
deleted file mode 100644
index 70f857283d0..00000000000
--- a/sysutils/lsof/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2003/10/04 20:22:35 atatat Exp $
-
-Patch for vnode/DNLC interface change courtesy of lsof maintainer.
-
---- dialects/n+obsd/dnode.c.orig	2003-06-11 07:45:16.000000000 -0400
-+++ dialects/n+obsd/dnode.c
-@@ -68,8 +68,14 @@
- 		if (!p->P_VMSPACE
- 		||  kread((KA_T)p->P_VMSPACE, (char *)&vm, sizeof(vm)))
- 		    return;
-+# if	defined(OPENBSDV)
-+		Lf->sz = (SZOFFTYPE)((vm.vm_tsize + vm.vm_dsize
-+		       + vm.vm_ssize) * sysconf(_SC_PAGESIZE));
-+# else	/* !defined(OPENBSDV */
- 		Lf->sz = (SZOFFTYPE)ctob(vm.vm_tsize + vm.vm_dsize
- 						     + vm.vm_ssize);
-+# endif	/* defined(OPENBSDV) */
-+
- 		Lf->sz_def = 1;
- 		return;
- 	    }
-@@ -301,9 +307,9 @@
- 
- #if	defined(HASNCACHE)
- 	Lf->na = va;
--# if	defined(HASNCAPID)
-+# if	defined(HASNCVPID)
- 	Lf->id = v->v_id;
--# endif	/* defined(HASNCAPID) */
-+# endif	/* defined(HASNCVPID) */
- #endif	/* defined(HASNCACHE) */
- 
- #if	defined(HASFSTRUCT)
diff --git a/sysutils/lsof/patches/patch-ad b/sysutils/lsof/patches/patch-ad
deleted file mode 100644
index 5810d248eae..00000000000
--- a/sysutils/lsof/patches/patch-ad
+++ /dev/null
@@ -1,124 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2003/08/13 13:24:17 atatat Exp $
-
-Patch for vnode/DNLC interface change courtesy of lsof maintainer.
-
---- lib/rnam.c.orig	2000-08-02 08:53:30.000000000 -0400
-+++ lib/rnam.c
-@@ -111,7 +111,10 @@
- 					 * table */
- struct l_nch {
- 	KA_T na;			/* node address */
-+
-+# if	defined(NCACHE_NODEID)
- 	unsigned long id;		/* capability ID */
-+# endif	/* defined(NCACHE_NODEID) */
- 
- # if	defined(NCACHE_PARADDR) && defined(NCACHE_PARID)
- 	KA_T pa;			/* parent node address */
-@@ -128,13 +131,18 @@
- static struct l_nch **Nchash = (struct l_nch **)NULL;
- 					/* Ncache hash pointers */
- static int Ncfirst = 1;			/* first-call status */
--	
-+
-+# if	defined(NCACHE_NODEID)
- #define ncachehash(i,n)		Nchash+(((((int)(n)>>2)+((int)(i)))*31415)&Mch)
-+_PROTOTYPE(static struct l_nch *ncache_addr,(unsigned long i, KA_T na));
-+# else	/* !defined(NCACHE_NODEID) */
-+#define ncachehash(n)		Nchash+((((int)(n)>>2)*31415)&Mch)
-+_PROTOTYPE(static struct l_nch *ncache_addr,(KA_T na));
-+# endif	/* defined(NCACHE_NODEID) */
-+
- #define DEFNCACHESZ	1024	/* local size if X_NCSIZE kernel value < 1 */
- #define	LNCHINCRSZ	64	/* local size increment */
- 
--_PROTOTYPE(static struct l_nch *ncache_addr,(unsigned long i, KA_T na));
--
- # if	!defined(NCACHE_NO_ROOT)
- _PROTOTYPE(static int ncache_isroot,(KA_T na, char *cp));
- # endif	/* !defined(NCACHE_NO_ROOT) */
-@@ -145,14 +153,32 @@
-  */
- 
- static struct l_nch *
-+
-+# if	defined(NCACHE_NODEID)
- ncache_addr(i, na)
- 	unsigned long i;		/* node's capability ID */
-+# else	/* !defined(NCACHE_NODEID) */
-+ncache_addr(na)
-+# endif	/* defined(NCACHE_NODEID) */
-+
- 	KA_T na;			/* node's address */
- {
- 	struct l_nch **hp;
- 
--	for (hp = ncachehash(i, na); *hp; hp++) {
-+# if	defined(NCACHE_NODEID)
-+	for (hp = ncachehash(i, na); *hp; hp++)
-+# else	/* !defined(NCACHE_NODEID) */
-+	for (hp = ncachehash(na); *hp; hp++)
-+# endif	/* defined(NCACHE_NODEID) */
-+
-+	{
-+
-+# if	defined(NCACHE_NODEID)
- 	    if ((*hp)->id == i && (*hp)->na == na)
-+# else	/* !defined(NCACHE_NODEID) */
-+	    if ((*hp)->na == na)
-+# endif	/* defined(NCACHE_NODEID) */
-+
- 		return(*hp);
- 	}
- 	return((struct l_nch *)NULL);
-@@ -422,8 +448,10 @@
- 	    }
- # endif	/* defined(NCACHE_NXT) */
- 
-+#  if	defined(NCACHE_NODEID)
- 	    lc->na = (KA_T)kc->NCACHE_NODEADDR;
- 	    lc->id = kc->NCACHE_NODEID;
-+#  endif	/* defined(NCACHE_NODEID) */
- 
- #  if	defined(NCACHE_PARADDR)
- 	    lc->pa = (KA_T)kc->NCACHE_PARADDR;
-@@ -495,8 +523,21 @@
- 	    Exit(1);
- 	}
- 	for (i = 0, lc = Ncache; i < Nc; i++, lc++) {
--	    for (hp = ncachehash(lc->id, lc->na), n = 1; *hp; hp++) {
-+
-+# if	defined(NCACHE_NODEID)
-+	    for (hp = ncachehash(lc->id, lc->na), n = 1; *hp; hp++)
-+# else	/* defined(NCACHE_NODEID) */
-+	    for (hp = ncachehash(lc->na), n = 1; *hp; hp++)
-+# endif	/* defined(NCACHE_NODEID) */
-+
-+	    {
-+
-+# if	defined(NCACHE_NODEID)
- 		if ((*hp)->na == lc->na && (*hp)->id == lc->id
-+# else	/* defined(NCACHE_NODEID) */
-+		if ((*hp)->na == lc->na
-+# endif	/* defined(NCACHE_NODEID) */
-+
- 		&&  strcmp((*hp)->nm, lc->nm) == 0
- 
- # if	defined(NCACHE_PARADDR) && defined(NCACHE_PARID)
-@@ -557,7 +598,15 @@
- /*
-  * Look up the name cache entry for the node address.
-  */
--	if (Nc == 0 || !(lc = ncache_addr(Lf->id, Lf->na))) {
-+
-+# if	defined(NCACHE_NODEID)
-+	if (Nc == 0 || !(lc = ncache_addr(Lf->id, Lf->na)))
-+# else	/* defined(NCACHE_NODEID) */
-+	if (Nc == 0 || !(lc = ncache_addr(Lf->na)))
-+# endif	/* defined(NCACHE_NODEID) */
-+
-+
-+	{
- 
- 	/*
- 	 * If the node has no cache entry, see if it's the mount
diff --git a/sysutils/lsof/patches/patch-ae b/sysutils/lsof/patches/patch-ae
deleted file mode 100644
index 23d814a823c..00000000000
--- a/sysutils/lsof/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/08/13 13:24:17 atatat Exp $
-
-Patch for vnode/DNLC interface change courtesy of lsof maintainer.
-
---- lsof.h.orig	2003-06-11 07:36:32.000000000 -0400
-+++ lsof.h	2003-08-11 14:33:38.000000000 -0400
-@@ -651,9 +651,9 @@
- 	KA_T na;			/* file structure's node address */
- # endif	/* defined(HASNCACHE) && HASNCACHE<2 */
- 
--# if	defined(HASNCACHE) && defined(HASNCAPID)
-+# if	defined(HASNCACHE) && defined(HASNCVPID)
- 	unsigned long id;		/* capability ID */
--# endif	/* defined(HASNCACHE) && defined(HASNCAPID) */
-+# endif	/* defined(HASNCACHE) && defined(HASNCVPID) */
- 
- # if	defined(HASLFILEADD)
- 	HASLFILEADD
diff --git a/sysutils/lsof/patches/patch-af b/sysutils/lsof/patches/patch-af
deleted file mode 100644
index 88fbea2c6ab..00000000000
--- a/sysutils/lsof/patches/patch-af
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-af,v 1.2 2003/10/04 20:22:35 atatat Exp $
-
-Deal with recent procfs and kernfs churn on the -current branch.
-
---- dialects/n+obsd/dlsof.h.orig	2003-06-11 07:44:54.000000000 -0400
-+++ dialects/n+obsd/dlsof.h
-@@ -62,6 +62,7 @@
- #define	_KERNEL
- #  if	defined(NETBSDV)
- struct buf;	/* dummy for function prototype in <sys/buf.h> */
-+struct uio;	/* dummy for function prototype in <sys/buf.h> */
- #  endif	/* defined(NETBSDV) */
- #include <sys/ucred.h>
- # endif	/* (defined(OPENBSDV) && OPENBSDV>=3030)
-@@ -253,6 +254,9 @@ struct sockproto {
- #define	_KERNEL
- #include <miscfs/kernfs/kernfs.h>
- #undef	_KERNEL
-+#  if	defined(HASKERNFS_KFS_KT)
-+#define kf_kt kfs_kt
-+#  endif /* defined(HASKERNFS_KFS_KT) */
- # endif	/* defined(HASKERNFS) */
- 
- # if	defined(HASNULLFS)
-@@ -266,7 +270,24 @@ struct sockproto {
- # endif	/* defined(HASNULLFS) */
- 
- # if	defined(HASPROCFS)
-+#  if	defined(HASPROCFS_PFSROOT)
-+#define _KERNEL
-+#  endif /* defined(HASPROCFS_PFSROOT) */
- #include <miscfs/procfs/procfs.h>
-+#  if	defined(HASPROCFS_PFSROOT)
-+#undef _KERNEL
-+#define Proot PFSroot
-+#define Pproc PFSproc
-+#define Pcurproc PFScurproc
-+#define Pmem PFSmem
-+#define Pregs PFSregs
-+#define Pfile PFSfile
-+#define Pfpregs PFSfpregs
-+#define Pctl PFSctl
-+#define Pstatus PFSstatus
-+#define Pnote PFSnote
-+#define Pnotepg PFSnotepg
-+#  endif /* defined(HASPROCFS_PFSROOT) */
- #include <machine/reg.h>
- # endif	/* defined(HASPROCFS) */
-