CVS commit: pkgsrc/sysutils/lsof

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Apr 11 15:22:52 UTC 2020

Modified Files:
        pkgsrc/sysutils/lsof: distinfo
        pkgsrc/sysutils/lsof/patches: patch-af

Log Message:
lsof: disable loading of kernel namecache on NetBSD after 9.99.54

lsof expects to be able to walk the namecache as a linked list using
kmem grovelling. The namecache on NetBSD now uses rbtree instead of
hash buckets + linked list. While it's certainly possible to iterate an
rbtree using kmem it's also more complicated and code doesn't exist yet.
Unfortunately this means lsof for now doesn't resolve pathnames for
type VREG.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/lsof/patches/patch-af

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/lsof/distinfo
diff -u pkgsrc/sysutils/lsof/distinfo:1.92 pkgsrc/sysutils/lsof/distinfo:1.93
--- pkgsrc/sysutils/lsof/distinfo:1.92  Thu Mar  5 20:49:22 2020
+++ pkgsrc/sysutils/lsof/distinfo       Sat Apr 11 15:22:52 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.92 2020/03/05 20:49:22 tnn Exp $
+$NetBSD: distinfo,v 1.93 2020/04/11 15:22:52 tnn Exp $
 
 SHA1 (lsof_4.91.tar.bz2) = da6f9883d00f200671f6e47cf838bb9b6b9c6f01
 RMD160 (lsof_4.91.tar.bz2) = 5f7be9a860f30b66e247e0405657a69dd044e245
@@ -9,7 +9,7 @@ SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0
 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9
 SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
 SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
-SHA1 (patch-af) = 4106e4cdf01587d6f6a080ddb5bb0261729bcede
+SHA1 (patch-af) = 5e55aef8d1e65c289ce8f4c3c97ae6d2b676fd82
 SHA1 (patch-ag) = ced30f63961268a6c76bcc1d22a2eb9e1f750480
 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09

Index: pkgsrc/sysutils/lsof/patches/patch-af
diff -u pkgsrc/sysutils/lsof/patches/patch-af:1.17 pkgsrc/sysutils/lsof/patches/patch-af:1.18
--- pkgsrc/sysutils/lsof/patches/patch-af:1.17  Thu Mar  5 20:49:22 2020
+++ pkgsrc/sysutils/lsof/patches/patch-af       Sat Apr 11 15:22:52 2020
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.17 2020/03/05 20:49:22 tnn Exp $
+$NetBSD: patch-af,v 1.18 2020/04/11 15:22:52 tnn Exp $
 
 --- dialects/n+obsd/dlsof.h.orig       2006-03-28 21:54:15.000000000 +0000
 +++ dialects/n+obsd/dlsof.h
@@ -99,6 +99,15 @@ $NetBSD: patch-af,v 1.17 2020/03/05 20:4
        char *dir;                      /* mounted directory */
        char *fsname;                   /* file system name */
        struct l_vfs *next;             /* forward link */
+@@ -565,7 +579,7 @@ struct sfile {
+ #define       NCACHE_NODEADDR nc_vp           /* node address in NCACHE */
+ #define       NCACHE_PARADDR  nc_dvp          /* parent node address in NCACHE */
+ 
+-#  if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000)
++#  if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000 && __NetBSD_Version__ < 999005400)
+ #define       NCACHE_NXT      nc_hash.le_next /* link in NCACHE */
+ #  else       /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
+ #   if        defined(NetBSD1_0) && NetBSD<1994101
 @@ -581,4 +595,12 @@ struct sfile {
  #  endif      /* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */