CVS commit: pkgsrc/sysutils/lsof

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Tue Jun 17 02:38:49 UTC 2025

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

Log Message:
lsof: simplify a NetBSD build fix patch

Five years ago, r. 1.19 introduced a build fix for "NetBSD 9.0", without
any further explanation. It appears this was intended for i386,
specifically, though the commit didn't say, since other ports should
have built without it. i386 builds have since been fixed differently,
this being relevant for 10.x as well, where the older approach would not
work. (It's also confusing to see separate places with NetBSD version
conditionals pulling in sys/ptrace.h.)

Change compile-tested on NetBSD 9.4_STABLE/amd64, 9.4_STABLE/i386,
9.99.14/amd64, 9.99.14/i386. (I see nothing in the state of 9.0 headers
that differs relevantly.)

Slightly related to PR port-i386/59402.


To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.24 -r1.25 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.109 pkgsrc/sysutils/lsof/distinfo:1.110
--- pkgsrc/sysutils/lsof/distinfo:1.109 Mon Jun  9 19:43:19 2025
+++ pkgsrc/sysutils/lsof/distinfo       Tue Jun 17 02:38:48 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.109 2025/06/09 19:43:19 gutteridge Exp $
+$NetBSD: distinfo,v 1.110 2025/06/17 02:38:48 gutteridge Exp $
 
 BLAKE2s (lsof_4.91.tar.bz2) = 77109e036c36f7d1483e69f2aae2314830dc4d2bdc3bf88a4031832f17e6afef
 SHA512 (lsof_4.91.tar.bz2) = 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0
 SHA1 (patch-ac) = ab1dc4540452f413493c58b729c7c6de83abfb6a
 SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
 SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
-SHA1 (patch-af) = 3d9e166e9a7d6adeff286b769e89cef7f2c9e9c1
+SHA1 (patch-af) = 96228c315f850341e4e361810acb0a34ded488bb
 SHA1 (patch-ag) = d973ccfced801b57c9dbefd97ee624d4fa2e002c
 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.24 pkgsrc/sysutils/lsof/patches/patch-af:1.25
--- pkgsrc/sysutils/lsof/patches/patch-af:1.24  Tue May  6 23:46:45 2025
+++ pkgsrc/sysutils/lsof/patches/patch-af       Tue Jun 17 02:38:49 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.24 2025/05/06 23:46:45 gutteridge Exp $
+$NetBSD: patch-af,v 1.25 2025/06/17 02:38:49 gutteridge Exp $
 
 Various build fixes for NetBSD.
 
@@ -72,14 +72,11 @@ Various build fixes for NetBSD.
  
  # if  defined(HASNFSPROTO)
  #include <nfs/rpcv2.h>
-@@ -360,6 +369,28 @@ struct sockproto {
+@@ -360,6 +369,25 @@ struct sockproto {
  #  if defined(HASPROCFS_PFSROOT)
  #define       _KERNEL
  #  endif      /* defined(HASPROCFS_PFSROOT) */
 +#  if defined(NETBSDV)
-+#    if __NetBSD_Version__>=900000000
-+#include <sys/ptrace.h>
-+#    endif
 +/* 
 + * Needed for definition of curlwp, which isn't used by this code base,
 + * but is exposed in procfs.h in an inline function declaration.
@@ -101,7 +98,7 @@ Various build fixes for NetBSD.
  #include <miscfs/procfs/procfs.h>
  #  if defined(HASPROCFS_PFSROOT)
  #undef        _KERNEL
-@@ -370,7 +401,6 @@ struct sockproto {
+@@ -370,7 +398,6 @@ struct sockproto {
  #define       Pregs           PFSregs
  #define       Pfile           PFSfile
  #define       Pfpregs         PFSfpregs
@@ -109,7 +106,7 @@ Various build fixes for NetBSD.
  #define       Pstatus         PFSstatus
  #define       Pnote           PFSnote
  #define       Pnotepg         PFSnotepg
-@@ -382,6 +412,9 @@ struct sockproto {
+@@ -382,6 +409,9 @@ struct sockproto {
  #define       Pmap            PFSmap
  #define       Pmaps           PFSmaps
  #    endif    /* NETBSDV>=1006000 */
@@ -119,7 +116,7 @@ Various build fixes for NetBSD.
  #   endif     /* defined(NetBSDV) */
  #  endif      /* defined(HASPROCFS_PFSROOT) */
  #include <machine/reg.h>
-@@ -489,7 +522,12 @@ extern KA_T Kpa;
+@@ -489,7 +519,12 @@ extern KA_T Kpa;
  struct l_vfs {
        KA_T addr;                      /* kernel address */
        fsid_t  fsid;                   /* file system ID */
@@ -132,7 +129,7 @@ Various build fixes for NetBSD.
        char *dir;                      /* mounted directory */
        char *fsname;                   /* file system name */
        struct l_vfs *next;             /* forward link */
-@@ -565,7 +603,7 @@ struct sfile {
+@@ -565,7 +600,7 @@ struct sfile {
  #define       NCACHE_NODEADDR nc_vp           /* node address in NCACHE */
  #define       NCACHE_PARADDR  nc_dvp          /* parent node address in NCACHE */
  
@@ -141,7 +138,7 @@ Various build fixes for NetBSD.
  #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 +619,12 @@ struct sfile {
+@@ -581,4 +616,12 @@ struct sfile {
  #  endif      /* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */