CVS commit: pkgsrc/sysutils/lsof

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Nov  1 05:18:02 UTC 2026

Modified Files:
        pkgsrc/sysutils/lsof: Makefile distinfo
        pkgsrc/sysutils/lsof/patches: patch-dialects_n+obsd_dproc.c

Log Message:
sysutils/lsof: correct previous patch

Previous patch has a defect refering a variable out of the scope.
Noted by Yoshitaka Tokugawa <toku at tokugawa.org>.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 pkgsrc/sysutils/lsof/Makefile
cvs rdiff -u -r1.115 -r1.116 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/lsof/patches/patch-dialects_n+obsd_dproc.c

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/Makefile
diff -u pkgsrc/sysutils/lsof/Makefile:1.149 pkgsrc/sysutils/lsof/Makefile:1.150
--- pkgsrc/sysutils/lsof/Makefile:1.149 Thu Oct 29 20:59:17 2026
+++ pkgsrc/sysutils/lsof/Makefile       Sun Nov  1 05:18:02 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.149 2026/10/29 20:59:17 taca Exp $
+# $NetBSD: Makefile,v 1.150 2026/11/01 05:18:02 taca Exp $
 
 DISTNAME=              lsof_4.91
 PKGNAME=               ${DISTNAME:S/_/-/}
-PKGREVISION=           11
+PKGREVISION=           12
 CATEGORIES=            sysutils
 MASTER_SITES=          ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/
 MASTER_SITES+=         ftp://ftp.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/

Index: pkgsrc/sysutils/lsof/distinfo
diff -u pkgsrc/sysutils/lsof/distinfo:1.115 pkgsrc/sysutils/lsof/distinfo:1.116
--- pkgsrc/sysutils/lsof/distinfo:1.115 Thu Oct 29 20:59:17 2026
+++ pkgsrc/sysutils/lsof/distinfo       Sun Nov  1 05:18:02 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.115 2026/10/29 20:59:17 taca Exp $
+$NetBSD: distinfo,v 1.116 2026/11/01 05:18:02 taca Exp $
 
 BLAKE2s (lsof_4.91.tar.bz2) = 77109e036c36f7d1483e69f2aae2314830dc4d2bdc3bf88a4031832f17e6afef
 SHA512 (lsof_4.91.tar.bz2) = 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
@@ -11,6 +11,6 @@ SHA1 (patch-ae) = 3f4a7ce54c0646941fd864
 SHA1 (patch-af) = 96228c315f850341e4e361810acb0a34ded488bb
 SHA1 (patch-ag) = d973ccfced801b57c9dbefd97ee624d4fa2e002c
 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09
-SHA1 (patch-dialects_n+obsd_dproc.c) = 1a944d6c882638f989b2c970585e86de8a0f472c
+SHA1 (patch-dialects_n+obsd_dproc.c) = 778bbc89fd0a736a27e32d538d058cea329cbbc8
 SHA1 (patch-dialects_n+obsd_dsock.c) = dadbb0196024c12f59d77b838917036bf90a4e35
 SHA1 (patch-lib_Makefile.skel) = abfb9d50eef60c5d43cbf4978bf179de0ebe371e

Index: pkgsrc/sysutils/lsof/patches/patch-dialects_n+obsd_dproc.c
diff -u pkgsrc/sysutils/lsof/patches/patch-dialects_n+obsd_dproc.c:1.2 pkgsrc/sysutils/lsof/patches/patch-dialects_n+obsd_dproc.c:1.3
--- pkgsrc/sysutils/lsof/patches/patch-dialects_n+obsd_dproc.c:1.2      Thu Oct 29 20:59:17 2026
+++ pkgsrc/sysutils/lsof/patches/patch-dialects_n+obsd_dproc.c  Sun Nov  1 05:18:02 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-dialects_n+obsd_dproc.c,v 1.2 2026/10/29 20:59:17 taca Exp $
+$NetBSD: patch-dialects_n+obsd_dproc.c,v 1.3 2026/11/01 05:18:02 taca Exp $
 
 * Various build fixes for NetBSD.
 * Do not include _STABLE, _RC, etc. suffixes in version comparison.
@@ -39,7 +39,17 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
  
  _PROTOTYPE(static void enter_vn_text,(KA_T va, int *n));
  _PROTOTYPE(static void get_kernel_access,(void));
-@@ -81,6 +108,24 @@ ckkv(d, er, ev, ea)
+@@ -67,6 +94,9 @@ ckkv(d, er, ev, ea)
+       size_t l;
+       int m[2];
+       char v[64];
++#ifdef __NetBSD__
++      char tmp_er[64];
++#endif
+ 
+       if (Fwarn)
+           return;
+@@ -81,6 +111,23 @@ ckkv(d, er, ev, ea)
                Pn, strerror(errno));
            Exit(1);
        }
@@ -50,7 +60,6 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
 + */
 +      {
 +          char *vp;
-+          char tmp_er[64];
 +          vp = strchr(v, '_');
 +          if (vp != NULL)
 +              *vp = '\0';
@@ -64,7 +73,7 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
  /*
   * Warn if the actual and expected releases don't match.
   */
-@@ -152,7 +197,7 @@ gather_proc_info()
+@@ -152,7 +199,7 @@ gather_proc_info()
        struct filedesc fd;
        int i, nf;
        MALLOC_S nb;
@@ -73,7 +82,7 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
        static int ofbb = 0;
        short pss, sf;
        int px;
-@@ -179,6 +224,10 @@ gather_proc_info()
+@@ -179,6 +226,10 @@ gather_proc_info()
        struct kinfo_proc *p;
  #endif        /* defined(HASKVMGETPROC2) */
  
@@ -84,7 +93,7 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
  /*
   * Read the process table.
   */
-@@ -218,7 +267,14 @@ gather_proc_info()
+@@ -218,7 +269,14 @@ gather_proc_info()
            if (!p->P_FD
            ||  kread((KA_T)p->P_FD, (char *)&fd, sizeof(fd)))
                continue;
@@ -100,7 +109,7 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
                continue;
  
  #if   defined(HASCWDINFO)
-@@ -278,14 +334,14 @@ gather_proc_info()
+@@ -278,14 +336,14 @@ gather_proc_info()
        /*
         * Read open file structure pointers.
         */
@@ -119,7 +128,7 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
                if (!ofb) {
                    (void) fprintf(stderr, "%s: PID %d, no file * space\n",
                        Pn, p->P_PID);
-@@ -293,7 +349,7 @@ gather_proc_info()
+@@ -293,7 +351,7 @@ gather_proc_info()
                }
                ofbb = nb;
            }
@@ -128,7 +137,7 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
                continue;
  
  #if   defined(HASFSTRUCT)
-@@ -311,8 +367,10 @@ gather_proc_info()
+@@ -311,8 +369,10 @@ gather_proc_info()
                    }
                    pofb = nb;
                }
@@ -139,7 +148,7 @@ $NetBSD: patch-dialects_n+obsd_dproc.c,v
            }
  #endif        /* defined(HASFSTRUCT) */
  
-@@ -321,8 +379,20 @@ gather_proc_info()
+@@ -321,8 +381,20 @@ gather_proc_info()
         */
            for (i = 0; i < nf; i++) {
                if (ofb[i]) {