CVS commit: pkgsrc/sysutils/lsof

["Emmanuel Dreyfus" <manu%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Apr 16 12:28:36 UTC 2020

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

Log Message:
Use fix for NetBSD 9.0 only on NetBSD 9.0, avoid changing other things.

Thanks to wiz@


To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.19 -r1.20 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.94 pkgsrc/sysutils/lsof/distinfo:1.95
--- pkgsrc/sysutils/lsof/distinfo:1.94  Thu Apr 16 09:47:26 2020
+++ pkgsrc/sysutils/lsof/distinfo       Thu Apr 16 12:28:36 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.94 2020/04/16 09:47:26 manu Exp $
+$NetBSD: distinfo,v 1.95 2020/04/16 12:28:36 manu 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) = 0d0246e0e6634cf0b3311bbc376cadb0665d5e70
+SHA1 (patch-af) = 5407ed91bb6459637054a6f84720f7ab3c19c8e8
 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.19 pkgsrc/sysutils/lsof/patches/patch-af:1.20
--- pkgsrc/sysutils/lsof/patches/patch-af:1.19  Thu Apr 16 09:47:26 2020
+++ pkgsrc/sysutils/lsof/patches/patch-af       Thu Apr 16 12:28:36 2020
@@ -1,9 +1,20 @@
-$NetBSD: patch-af,v 1.19 2020/04/16 09:47:26 manu Exp $
-
+$NetBSD: patch-af,v 1.20 2020/04/16 12:28:36 manu Exp $
 
 --- dialects/n+obsd/dlsof.h.orig       2006-03-28 23:54:15.000000000 +0200
-+++ dialects/n+obsd/dlsof.h    2020-04-10 16:35:54.222640631 +0200
-@@ -94,8 +94,12 @@
++++ dialects/n+obsd/dlsof.h    2020-04-16 14:25:29.349520955 +0200
+@@ -45,8 +45,11 @@
+ #include <setjmp.h>
+ #include <signal.h>
+ #include <string.h>
+ #include <unistd.h>
++#if (!defined(NETBSDV) || __NetBSD_Version__<900000000)
++#include <sys/ptrace.h> /* pulled in by procfs.h, but needs to be pulled in before _KERNEL is defined */
++#endif
+ 
+ # if  defined(HASGETBOOTFILE)
+ #include <util.h>
+ # endif       /* defined(HASGETBOOTFILE) */
+@@ -94,8 +97,12 @@
  #define       _KERNEL
  # endif       /* (defined(OPENBSDV) && OPENBSDV<3030)
           || (defined(NETBSDV) && __NetBSD_Version__>=106060000) */
@@ -16,7 +27,7 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  
  # if  (defined(OPENBSDV) && OPENBSDV>=3030) \
    ||  (defined(NETBSDV) && __NetBSD_Version__>=106060000)
-@@ -105,12 +109,8 @@
+@@ -105,12 +112,8 @@
  
  #include <rpc/types.h>
  #include <sys/protosw.h>
@@ -29,7 +40,7 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  
  # if  defined(HASMSDOSFS)
  #  if HASMSDOSFS==1
-@@ -146,8 +146,11 @@
+@@ -146,8 +149,11 @@
  #  endif      /* (defined(OPENBSDV) && OPENBSDV<3030)
                   || (defined(NETBSDV) && __NetBSD_Version__<106060000) */
  
@@ -41,7 +52,7 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  #include <msdosfs/msdosfsmount.h>
  #undef        _KERNEL
  #include <msdosfs/direntry.h>
-@@ -160,8 +163,9 @@
+@@ -160,8 +166,9 @@
  
  #include <sys/socketvar.h>
  #include <sys/un.h>
@@ -51,7 +62,7 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  #include <netinet/in_systm.h>
  #include <netinet/ip.h>
  
-@@ -169,9 +173,8 @@
+@@ -169,9 +176,8 @@
  #include <netinet/ip6.h>
  #include <netinet6/in6_pcb.h>
  # endif       /* defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6) */
@@ -61,7 +72,7 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  #include <netinet/ip_var.h>
  #include <netinet/tcp.h>
  #include <netinet/tcpip.h>
-@@ -263,8 +266,11 @@
+@@ -263,8 +269,11 @@
  #endif        /* defined(HASBUFQ_H) */
  
  #undef KERNEL
@@ -73,17 +84,19 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  # if  defined(HASNFSPROTO)
  #include <nfs/rpcv2.h>
  #include <nfs/nfsproto.h>
-@@ -359,8 +365,9 @@
+@@ -359,8 +368,11 @@
  # if  defined(HASPROCFS)
  #  if defined(HASPROCFS_PFSROOT)
  #define       _KERNEL
  #  endif      /* defined(HASPROCFS_PFSROOT) */
++#if (defined(NETBSDV) && __NetBSD_Version__>=900000000)
 +#include <sys/ptrace.h>
++#endif
  #include <miscfs/procfs/procfs.h>
  #  if defined(HASPROCFS_PFSROOT)
  #undef        _KERNEL
  #define       Proot           PFSroot
-@@ -369,9 +376,8 @@
+@@ -369,9 +381,8 @@
  #define       Pmem            PFSmem
  #define       Pregs           PFSregs
  #define       Pfile           PFSfile
@@ -93,7 +106,7 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  #define       Pnote           PFSnote
  #define       Pnotepg         PFSnotepg
  #   if        defined(NetBSDV)
-@@ -381,8 +387,11 @@
+@@ -381,8 +392,11 @@
  #    if       NETBSDV>=1006000
  #define       Pmap            PFSmap
  #define       Pmaps           PFSmaps
@@ -105,7 +118,7 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
  #  endif      /* defined(HASPROCFS_PFSROOT) */
  #include <machine/reg.h>
  # endif       /* defined(HASPROCFS) */
-@@ -488,9 +497,14 @@
+@@ -488,9 +502,14 @@
  
  struct l_vfs {
        KA_T addr;                      /* kernel address */
@@ -120,7 +133,18 @@ $NetBSD: patch-af,v 1.19 2020/04/16 09:4
        char *fsname;                   /* file system name */
        struct l_vfs *next;             /* forward link */
  };
-@@ -580,5 +594,13 @@
+@@ -564,9 +583,9 @@
+ #define       NCACHE_NMLEN    nc_nlen         /* name length in NCACHE */
+ #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
+ #define       NCACHE_NXT      nc_nxt          /* link in NCACHE */
+@@ -580,5 +599,13 @@
  #define       NCACHE_NODEID   nc_vpid         /* node ID in NCACHE */
  #  endif      /* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */