 @@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.91 2019/01/06 16:36:00 tnn Exp $
+$NetBSD: distinfo,v 1.92 2020/03/05 20:49:22 tnn Exp $
 SHA1 (lsof_4.91.tar.bz2) = da6f9883d00f200671f6e47cf838bb9b6b9c6f01
 RMD160 (lsof_4.91.tar.bz2) = 5f7be9a860f30b66e247e0405657a69dd044e245
 SHA512 (lsof_4.91.tar.bz2) = 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
 Size (lsof_4.91.tar.bz2) = 791734 bytes
 SHA1 (patch-aa) = 4469a5fed540e3c5635b6082efedc477ea96a382
 SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
 SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
 SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
-SHA1 (patch-af) = 2e5dced3772fe33412f4cf782d21fab1c4373b38
+SHA1 (patch-af) = 4106e4cdf01587d6f6a080ddb5bb0261729bcede
-SHA1 (patch-ag) = bd146026dff5a383b1a53e1bc9cf68302f742575
+SHA1 (patch-ag) = ced30f63961268a6c76bcc1d22a2eb9e1f750480
 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09

 @@ -1,106 +1,114 @@
-$NetBSD: patch-af,v 1.16 2019/01/06 16:36:00 tnn Exp $
+$NetBSD: patch-af,v 1.17 2020/03/05 20:49:22 tnn Exp $
 --- dialects/n+obsd/dlsof.h.orig	2006-03-28 21:54:15.000000000 +0000
 +++ dialects/n+obsd/dlsof.h
-@@ -95,6 +95,10 @@ struct uio;	/* dummy for function protot
+@@ -46,6 +46,7 @@
  #include <signal.h>
  #include <string.h>
  #include <unistd.h>
 +#include <sys/ptrace.h> /* pulled in by procfs.h, but needs to be pulled in before _KERNEL is defined */
  # if	defined(HASGETBOOTFILE)
  #include <util.h>
@@ -95,6 +96,10 @@ struct uio;	/* dummy for function protot
  # endif	/* (defined(OPENBSDV) && OPENBSDV<3030)
  	   || (defined(NETBSDV) && __NetBSD_Version__>=106060000) */
 +# if	defined(NETBSDV) && NETBSDV>=1003000
 +#define	sockproto	NETBSD_sockproto
 +# endif	/* defined(NETBSDV) && NETBSDV>=1003000 */
++
  #include <sys/mount.h>
  # if	(defined(OPENBSDV) && OPENBSDV>=3030) \
-@@ -106,10 +110,6 @@ struct uio;	/* dummy for function protot
+@@ -106,10 +111,6 @@ struct uio;	/* dummy for function protot
  #include <rpc/types.h>
  #include <sys/protosw.h>
 -# if	defined(NETBSDV) && NETBSDV>=1003000
 -#define	sockproto	NETBSD_sockproto
 -# endif	/* defined(NETBSDV) && NETBSDV>=1003000 */
+-
  #include <sys/socket.h>
  # if	defined(HASMSDOSFS)
-@@ -147,6 +147,9 @@ struct uio;	/* dummy for function protot
+@@ -147,6 +148,9 @@ struct uio;	/* dummy for function protot
  		   || (defined(NETBSDV) && __NetBSD_Version__<106060000) */
  #define	_KERNEL
 +#ifndef	VFS_PROTOS
 +#define	VFS_PROTOS(x)
 +#endif
  struct nameidata;	/* to satisfy a function prototype in msdosfsmount.h */
  #include <msdosfs/msdosfsmount.h>
  #undef	_KERNEL
-@@ -161,6 +164,7 @@ struct nameidata;	/* to satisfy a functi
+@@ -161,6 +165,7 @@ struct nameidata;	/* to satisfy a functi
  #include <sys/socketvar.h>
  #include <sys/un.h>
  #include <sys/unpcb.h>
 +#include <net/route.h>
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
  #include <netinet/ip.h>
-@@ -170,7 +174,6 @@ struct nameidata;	/* to satisfy a functi
+@@ -170,7 +175,6 @@ struct nameidata;	/* to satisfy a functi
  #include <netinet6/in6_pcb.h>
  # endif	/* defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6) */
 -#include <net/route.h>
  #include <netinet/in_pcb.h>
  #include <netinet/ip_var.h>
  #include <netinet/tcp.h>
-@@ -264,6 +267,9 @@ struct sockproto {
+@@ -264,6 +268,9 @@ struct sockproto {
  #undef KERNEL
  #include <ufs/mfs/mfsnode.h>
 +# if	defined(HASTMPFS)
 +#include <fs/tmpfs/tmpfs.h>
 +# endif	/* defined(HASTMPFS) */
  # if	defined(HASNFSPROTO)
  #include <nfs/rpcv2.h>
-@@ -370,7 +376,6 @@ struct sockproto {
+@@ -370,7 +377,6 @@ struct sockproto {
  #define	Pregs		PFSregs
  #define	Pfile		PFSfile
  #define	Pfpregs		PFSfpregs
 -#define	Pctl		PFSctl
  #define	Pstatus		PFSstatus
  #define	Pnote		PFSnote
  #define	Pnotepg		PFSnotepg
-@@ -382,6 +387,9 @@ struct sockproto {
+@@ -382,6 +388,9 @@ struct sockproto {
  #define	Pmap		PFSmap
  #define	Pmaps		PFSmaps
  #    endif	/* NETBSDV>=1006000 */
 +#    if	NETBSDV<8099000
 +#define	Pctl		PFSctl
 +#    endif	/* NETBSDV<8099000 */
  #   endif	/* defined(NetBSDV) */
  #  endif	/* defined(HASPROCFS_PFSROOT) */
  #include <machine/reg.h>
-@@ -489,7 +497,12 @@ extern KA_T Kpa;
+@@ -489,7 +498,12 @@ extern KA_T Kpa;
  struct l_vfs {
  	KA_T addr;			/* kernel address */
  	fsid_t	fsid;			/* file system ID */
 +#if defined(NETBSDV) && __NetBSD_Version__ >= 499002500
 +	/* MFSNAMELEN was removed from the kernel source after 4.99.24 */
 +	char type[sizeof(((struct statvfs *)NULL)->f_fstypename)];	/* type of file system */
 +#else
  	char type[MFSNAMELEN];		/* type of file system */
 +#endif
  	char *dir;			/* mounted directory */
  	char *fsname;			/* file system name */
  	struct l_vfs *next;		/* forward link */
-@@ -581,4 +594,12 @@ struct sfile {
+@@ -581,4 +595,12 @@ struct sfile {
  #  endif	/* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */
 +#if     defined(VV_ROOT)		/* NetBSD >= 4.99.33 */
 +#define VNODE_VFLAG     v_vflag
 +#define NCACHE_VROOT    VV_ROOT
 +#else
 +#define VNODE_VFLAG     v_flag
 +#define NCACHE_VROOT    VROOT
 +#endif  /* VV_ROOT */
++
  #endif	/* NETBSD_LSOF_H */

 @@ -1,18 +1,18 @@
-$NetBSD: patch-ag,v 1.9 2017/06/22 20:48:04 tnn Exp $
+$NetBSD: patch-ag,v 1.10 2020/03/05 20:49:22 tnn Exp $
---- Configure.orig	2015-07-07 20:17:04.000000000 +0000
+--- Configure.orig	2018-02-14 14:18:55.000000000 +0000
 +++ Configure
-@@ -3013,32 +3013,66 @@ return(0); }
+@@ -3077,32 +3077,66 @@ return(0); }
  	echo "!!!WARNING!!!  Unsupported NetBSD version: $LSOF_VSTR"
  	echo "!!!WARNING!!!  Configuring for NetBSD 3.0"
  	;;
 +      4.0*)
 +	LSOF_TSTBIGF=" "
 +	LSOF_VERS="4000000"
 +	;;
 +      4.99.*)
 +	LSOF_TSTBIGF=" "
 +	LSOF_VERS="4099000"
 +	;;
 +      4*)
 +	LSOF_VERS="4000000"
 @@ -77,62 +77,72 @@ $NetBSD: patch-ag,v 1.9 2017/06/22 20:48
 -      exit 1
 -      ;;
 -    esac	# }
      LSOF_CFGF="$LSOF_CFGF -DNETBSDV=$LSOF_VERS"
      LSOF_TMP1="-DN_UNIXV=/netbsd"
 -    if test -r ${LSOF_INCLUDE}/util.h	# {
 +    if test -r /dev/ksyms              # {
 +    then
 +      LSOF_TMP1="-DN_UNIXV=/dev/ksyms"
 +    elif test -r ${LSOF_INCLUDE}/util.h        # {
      then
        grep -q getbootfile ${LSOF_INCLUDE}/util.h
        if test $? -eq 0	# {
-@@ -3437,6 +3471,7 @@ return(0); }
+@@ -3501,6 +3535,7 @@ return(0); }
      fi	# }
      LSOF_TMP2="sys/vnode.h"
      LSOF_NBSD_PTYFS=0
 +    LSOF_NBSD_TMPFS=0
      if test -r ${LSOF_INCLUDE}/$LSOF_TMP2	# {
      then
        LSOF_TMP3="${LSOF_INCLUDE}/$LSOF_TMP2"
-@@ -3514,7 +3549,25 @@ return(0); }
+@@ -3578,16 +3613,29 @@ return(0); }
  	  fi	# }
  	fi	# }
        fi	# }
 -      if test "X$NETBSD_UVM" = "X"	# {
 +      grep -q VT_TMPFS $LSOF_TMP3
 +      if test $? -eq 0   # {
 +      then
 +       LSOF_TMP2="fs/tmpfs/tmpfs.h"
 +       if test -r ${LSOF_INCLUDE}/$LSOF_TMP2   # {
 +       then
 +         LSOF_CFGF="$LSOF_CFGF -DHASTMPFS"
 +       else
 +         if test -r ${NETBSD_SYS}/$LSOF_TMP2   # {
 +         then
 +           if test $NETBSD_SYS != $LSOF_INCLUDE        # {
 +           then
 +             LSOF_CFGF="$LSOF_CFGF -DHASTMPFS"
 +             LSOF_NBSD_TMPFS=1
 +           fi  # }
 +         fi    # }
 +       fi      # }
 +      fi       # }
-+     if test "X$NETBSD_UVM" = "X"	# {
+       if test "X$NETBSD_UVM" = "X"	# {
        then
- 	grep -q UVM $LSOF_TMP3
+-	grep -q UVM $LSOF_TMP3
- 	if test $? -ne 0	# {
+-	if test $? -ne 0	# {
-@@ -3799,6 +3852,28 @@ return(0); }
++	if test -r ${LSOF_INCLUDE}/uvm	# {
  	then
 -	  egrep -q "v_uvm;|v_uobj;" $LSOF_TMP3
 -	  if test $? -eq 0	# {
 -	  then
 -	    NETBSD_UVM="Y"
 -	  fi	# }
 +	  NETBSD_UVM="Y"
  	fi	# }
        fi	# }
      fi	# }
@@ -3863,6 +3911,28 @@ return(0); }
  	LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include"
        fi	# }
      fi	# }
 +    if test $LSOF_NBSD_TMPFS -eq 1     # {
 +    then
++
 +    # Make a local copy of $NETBSD_SYS/sys/fs/tmpfs/tmpfs.h.
++
 +      if test ! -d dialects/n+obsd/include     # {
 +      then
 +       mkdir dialects/n+obsd/include
 +      fi       # }
 +      if test ! -d dialects/n+obsd/include/fs  # {
 @@ -141,22 +151,22 @@ $NetBSD: patch-ag,v 1.9 2017/06/22 20:48
 +      fi       # }
 +      rm -rf dialects/n+obsd/include/fs/tmpfs
 +      mkdir dialects/n+obsd/include/fs/tmpfs
 +      cp $NETBSD_SYS/fs/tmpfs/tmpfs.h dialects/n+obsd/include/fs/tmpfs
 +      echo $LSOF_CFGF | grep /dialects/n+obsd/include > /dev/null 2>&1
 +      if test $? -ne 0 # {
 +      then
 +       LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/n+obsd/include"
 +      fi       # }
 +    fi # }
      LSOF_CFGL="$LSOF_CFGL -lkvm"
      LSOF_DIALECT_DIR=n+obsd
      ;;
-@@ -5535,7 +5610,7 @@ fi	# }
+@@ -5607,7 +5677,7 @@ fi	# }
  echo "" >> $LSOF_MKFC
  if test "X$LSOF_DEBUG" = "X"	# {
  then
 -  LSOF_DEBUG="-O"
 +  LSOF_DEBUG=""
  else
    if test "X$LSOF_DEBUG" = "XNo-O"	# {
    then