CVS commit: pkgsrc/sysutils/lsof

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/lsof
From: "Emmanuel Dreyfus" <manu%netbsd.org@localhost>
Date: Thu, 16 Apr 2020 09:47:26 +0000

Module Name:    pkgsrc
Committed By:   manu
Date:           Thu Apr 16 09:47:26 UTC 2020

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

Log Message:
Fix build on NetBSD 9.0


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.18 -r1.19 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.93 pkgsrc/sysutils/lsof/distinfo:1.94
--- pkgsrc/sysutils/lsof/distinfo:1.93  Sat Apr 11 15:22:52 2020
+++ pkgsrc/sysutils/lsof/distinfo       Thu Apr 16 09:47:26 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.93 2020/04/11 15:22:52 tnn Exp $
+$NetBSD: distinfo,v 1.94 2020/04/16 09:47:26 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) = 5e55aef8d1e65c289ce8f4c3c97ae6d2b676fd82
+SHA1 (patch-af) = 0d0246e0e6634cf0b3311bbc376cadb0665d5e70
 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.18 pkgsrc/sysutils/lsof/patches/patch-af:1.19
--- pkgsrc/sysutils/lsof/patches/patch-af:1.18  Sat Apr 11 15:22:52 2020
+++ pkgsrc/sysutils/lsof/patches/patch-af       Thu Apr 16 09:47:26 2020
@@ -1,16 +1,10 @@
-$NetBSD: patch-af,v 1.18 2020/04/11 15:22:52 tnn Exp $
+$NetBSD: patch-af,v 1.19 2020/04/16 09:47:26 manu Exp $
 
---- dialects/n+obsd/dlsof.h.orig       2006-03-28 21:54:15.000000000 +0000
-+++ dialects/n+obsd/dlsof.h
-@@ -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
+
+--- 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 @@
+ #define       _KERNEL
  # endif       /* (defined(OPENBSDV) && OPENBSDV<3030)
           || (defined(NETBSDV) && __NetBSD_Version__>=106060000) */
  
@@ -21,7 +15,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  #include <sys/mount.h>
  
  # if  (defined(OPENBSDV) && OPENBSDV>=3030) \
-@@ -106,10 +111,6 @@ struct uio;       /* dummy for function protot
+   ||  (defined(NETBSDV) && __NetBSD_Version__>=106060000)
+@@ -105,12 +109,8 @@
+ 
  #include <rpc/types.h>
  #include <sys/protosw.h>
  
@@ -32,7 +28,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  #include <sys/socket.h>
  
  # if  defined(HASMSDOSFS)
-@@ -147,6 +148,9 @@ struct uio;        /* dummy for function protot
+ #  if HASMSDOSFS==1
+@@ -146,8 +146,11 @@
+ #  endif      /* (defined(OPENBSDV) && OPENBSDV<3030)
                   || (defined(NETBSDV) && __NetBSD_Version__<106060000) */
  
  #define       _KERNEL
@@ -42,7 +40,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  struct nameidata;     /* to satisfy a function prototype in msdosfsmount.h */
  #include <msdosfs/msdosfsmount.h>
  #undef        _KERNEL
-@@ -161,6 +165,7 @@ struct nameidata;  /* to satisfy a functi
+ #include <msdosfs/direntry.h>
+@@ -160,8 +163,9 @@
+ 
  #include <sys/socketvar.h>
  #include <sys/un.h>
  #include <sys/unpcb.h>
@@ -50,7 +50,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  #include <netinet/in.h>
  #include <netinet/in_systm.h>
  #include <netinet/ip.h>
-@@ -170,7 +175,6 @@ struct nameidata;  /* to satisfy a functi
+ 
+@@ -169,9 +173,8 @@
+ #include <netinet/ip6.h>
  #include <netinet6/in6_pcb.h>
  # endif       /* defined(HASIPv6) && defined(NETBSDV) && !defined(HASINRIAIPv6) */
  
@@ -58,7 +60,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  #include <netinet/in_pcb.h>
  #include <netinet/ip_var.h>
  #include <netinet/tcp.h>
-@@ -264,6 +268,9 @@ struct sockproto {
+ #include <netinet/tcpip.h>
+@@ -263,8 +266,11 @@
+ #endif        /* defined(HASBUFQ_H) */
  
  #undef KERNEL
  #include <ufs/mfs/mfsnode.h>
@@ -68,7 +72,19 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  
  # if  defined(HASNFSPROTO)
  #include <nfs/rpcv2.h>
-@@ -370,7 +377,6 @@ struct sockproto {
+ #include <nfs/nfsproto.h>
+@@ -359,8 +365,9 @@
+ # if  defined(HASPROCFS)
+ #  if defined(HASPROCFS_PFSROOT)
+ #define       _KERNEL
+ #  endif      /* defined(HASPROCFS_PFSROOT) */
++#include <sys/ptrace.h>
+ #include <miscfs/procfs/procfs.h>
+ #  if defined(HASPROCFS_PFSROOT)
+ #undef        _KERNEL
+ #define       Proot           PFSroot
+@@ -369,9 +376,8 @@
+ #define       Pmem            PFSmem
  #define       Pregs           PFSregs
  #define       Pfile           PFSfile
  #define       Pfpregs         PFSfpregs
@@ -76,7 +92,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  #define       Pstatus         PFSstatus
  #define       Pnote           PFSnote
  #define       Pnotepg         PFSnotepg
-@@ -382,6 +388,9 @@ struct sockproto {
+ #   if        defined(NetBSDV)
+@@ -381,8 +387,11 @@
+ #    if       NETBSDV>=1006000
  #define       Pmap            PFSmap
  #define       Pmaps           PFSmaps
  #    endif    /* NETBSDV>=1006000 */
@@ -86,7 +104,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
  #   endif     /* defined(NetBSDV) */
  #  endif      /* defined(HASPROCFS_PFSROOT) */
  #include <machine/reg.h>
-@@ -489,7 +498,12 @@ extern KA_T Kpa;
+ # endif       /* defined(HASPROCFS) */
+@@ -488,9 +497,14 @@
+ 
  struct l_vfs {
        KA_T addr;                      /* kernel address */
        fsid_t  fsid;                   /* file system ID */
@@ -99,16 +119,9 @@ $NetBSD: patch-af,v 1.18 2020/04/11 15:2
        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 {
+ };
+@@ -580,5 +594,13 @@
+ #define       NCACHE_NODEID   nc_vpid         /* node ID in NCACHE */
  #  endif      /* defined(HASNCVPID) */
  # endif  /* defined(HASNCACHE) */

Follow-Ups:
- Re: CVS commit: pkgsrc/sysutils/lsof
  - From: Tobias Nygren

Prev by Date: CVS commit: pkgsrc/www/SOGo
Next by Date: CVS commit: pkgsrc/devel/p5-Log-Any
Previous by Thread: CVS commit: pkgsrc/www/SOGo
Next by Thread: Re: CVS commit: pkgsrc/sysutils/lsof
Indexes:

Home | Main Index | Thread Index | Old Index