pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/sysutils/lsof
Module Name: pkgsrc
Committed By: thorpej
Date: Thu May 28 23:16:38 UTC 2026
Modified Files:
pkgsrc/sysutils/lsof: Makefile distinfo
pkgsrc/sysutils/lsof/patches: patch-ad
Log Message:
On NetBSD, don't use ctob() - it involves the use of a compile-time
constant that is hidden from user-space on variable page-size systems.
Instead, use the same code path used on OpenBSD, which multiplies by
the page size as obtained via sysconf(3).
To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 pkgsrc/sysutils/lsof/Makefile
cvs rdiff -u -r1.113 -r1.114 pkgsrc/sysutils/lsof/distinfo
cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/lsof/patches/patch-ad
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.147 pkgsrc/sysutils/lsof/Makefile:1.148
--- pkgsrc/sysutils/lsof/Makefile:1.147 Fri Apr 24 01:03:30 2026
+++ pkgsrc/sysutils/lsof/Makefile Thu May 28 23:16:38 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.147 2026/04/24 01:03:30 gutteridge Exp $
+# $NetBSD: Makefile,v 1.148 2026/05/28 23:16:38 thorpej Exp $
DISTNAME= lsof_4.91
PKGNAME= ${DISTNAME:S/_/-/}
-PKGREVISION= 9
+PKGREVISION= 10
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.113 pkgsrc/sysutils/lsof/distinfo:1.114
--- pkgsrc/sysutils/lsof/distinfo:1.113 Thu Apr 23 21:23:11 2026
+++ pkgsrc/sysutils/lsof/distinfo Thu May 28 23:16:38 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.113 2026/04/23 21:23:11 kim Exp $
+$NetBSD: distinfo,v 1.114 2026/05/28 23:16:38 thorpej Exp $
BLAKE2s (lsof_4.91.tar.bz2) = 77109e036c36f7d1483e69f2aae2314830dc4d2bdc3bf88a4031832f17e6afef
SHA512 (lsof_4.91.tar.bz2) = 49f811941dd6303f7cb0655fddb8b1177af5d1b18f2bd1edfab09d2c128aea73daecf09c7a5375979c66ba764c88a6e70c9086b55c3634e3be01ab1aa12e9f92
@@ -6,7 +6,7 @@ Size (lsof_4.91.tar.bz2) = 791734 bytes
SHA1 (patch-aa) = 76523a6d3bdff93a835dc442114f2bd4a018f95e
SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4
SHA1 (patch-ac) = ab1dc4540452f413493c58b729c7c6de83abfb6a
-SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a
+SHA1 (patch-ad) = c977ea106d067ad91d3abcfd8869ff3f2f4ccb31
SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a
SHA1 (patch-af) = 96228c315f850341e4e361810acb0a34ded488bb
SHA1 (patch-ag) = d973ccfced801b57c9dbefd97ee624d4fa2e002c
Index: pkgsrc/sysutils/lsof/patches/patch-ad
diff -u pkgsrc/sysutils/lsof/patches/patch-ad:1.16 pkgsrc/sysutils/lsof/patches/patch-ad:1.17
--- pkgsrc/sysutils/lsof/patches/patch-ad:1.16 Wed Aug 30 10:41:24 2017
+++ pkgsrc/sysutils/lsof/patches/patch-ad Thu May 28 23:16:38 2026
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.16 2017/08/30 10:41:24 kamil Exp $
+$NetBSD: patch-ad,v 1.17 2026/05/28 23:16:38 thorpej Exp $
---- dialects/n+obsd/dnode.c.orig 2007-04-24 16:22:06.000000000 +0000
-+++ dialects/n+obsd/dnode.c
-@@ -38,6 +38,9 @@ static char *rcsid = "$Id: dnode.c,v 1.3
+--- dialects/n+obsd/dnode.c.orig 2007-04-24 16:22:06
++++ dialects/n+obsd/dnode.c 2026-05-28 15:14:13
+@@ -38,6 +38,9 @@ static char *rcsid = "$Id: dnode.c,v 1.38 2007/04/24 1
#include "lsof.h"
@@ -12,7 +12,21 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
#if defined(HAS_DINODE_U)
#define DINODE_U dinode_u
-@@ -194,12 +197,17 @@ process_node(va)
+@@ -84,13 +87,8 @@ getmemsz(pid)
+ if (!p->P_VMSPACE
+ || kread((KA_T)p->P_VMSPACE, (char *)&vm, sizeof(vm)))
+ return;
+-# if defined(OPENBSDV)
+ Lf->sz = (SZOFFTYPE)((vm.vm_tsize + vm.vm_dsize
+ + vm.vm_ssize) * sysconf(_SC_PAGESIZE));
+-# else /* !defined(OPENBSDV */
+- Lf->sz = (SZOFFTYPE)ctob(vm.vm_tsize + vm.vm_dsize
+- + vm.vm_ssize);
+-# endif /* defined(OPENBSDV) */
+
+ Lf->sz_def = 1;
+ return;
+@@ -194,12 +192,17 @@ process_node(va)
unsigned char ns;
unsigned char rdevs;
char *ep, *ty;
@@ -31,7 +45,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
enum vtype type;
struct vnode *v, vb;
struct l_vfs *vfs;
-@@ -276,6 +284,11 @@ process_node(va)
+@@ -276,6 +279,11 @@ process_node(va)
#if defined(HASPTYFS)
struct ptyfsnode pt;
@@ -43,7 +57,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
struct specinfo si;
#endif /* defined(HASPTYFS) */
-@@ -414,7 +427,7 @@ process_overlaid_node:
+@@ -414,7 +422,7 @@ process_overlaid_node:
*/
if (!v->v_data
|| kread((KA_T)v->v_data, (char *)&kn, sizeof(kn))) {
@@ -52,7 +66,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
(void) snpf(Namech, Namechl,
"can't read kernfs_node at: %s",
print_kptr((KA_T)v->v_data, (char *)NULL, 0));
-@@ -449,7 +462,7 @@ process_overlaid_node:
+@@ -449,7 +457,7 @@ process_overlaid_node:
* size are fixed; otherwise, safely stat() the file to get the
* inode number and size.
*/
@@ -61,10 +75,12 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
(void) snpf(Namech, Namechl, "%s", _PATH_KERNFS);
ksb.st_ino = (ino_t)2;
ksb.st_size = DEV_BSIZE;
-@@ -471,6 +484,19 @@ process_overlaid_node:
+@@ -469,7 +477,20 @@ process_overlaid_node:
+ return;
+ }
nty = MFSNODE;
- break;
-
++ break;
++
+#if defined(HASTMPFS)
+ case VT_TMPFS:
+ if (!v->v_data
@@ -75,13 +91,12 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
+ return;
+ }
+ nty = TMPFSNODE;
-+ break;
+ break;
+#endif /* defined(HASTMPFS) */
-+
+
#if defined(HASMSDOSFS)
case VT_MSDOSFS:
- if (!v->v_data
-@@ -619,6 +645,7 @@ process_overlaid_node:
+@@ -619,6 +640,7 @@ process_overlaid_node:
}
@@ -89,7 +104,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
if ((lff = i.i_lockf)) {
/*
-@@ -667,6 +694,7 @@ process_overlaid_node:
+@@ -667,6 +689,7 @@ process_overlaid_node:
break;
} while ((lfp = lf.lf_next) && lfp != lff);
}
@@ -97,7 +112,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
break;
default:
if (v->v_type == VBAD || v->v_type == VNON)
-@@ -900,6 +928,13 @@ process_overlaid_node:
+@@ -900,6 +923,13 @@ process_overlaid_node:
break;
#endif /* defined(HASPTYFS) */
@@ -111,7 +126,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
}
/*
-@@ -1019,6 +1054,13 @@ process_overlaid_node:
+@@ -1019,6 +1049,13 @@ process_overlaid_node:
Lf->sz_def = 1;
break;
@@ -125,7 +140,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
#if defined(HASEXT2FS)
case EXT2NODE:
# if defined(HASI_E2FS_PTR)
-@@ -1221,6 +1263,9 @@ process_overlaid_node:
+@@ -1221,6 +1258,9 @@ process_overlaid_node:
Lf->dev_def = Lf->rdev_def = 0;
(void) snpf(Namech, Namechl, "%#x", m.mfs_baseoff);
enter_dev_ch("memory");
@@ -135,7 +150,7 @@ $NetBSD: patch-ad,v 1.16 2017/08/30 10:4
}
#if defined(HASPROCFS)
-@@ -1262,11 +1307,15 @@ process_overlaid_node:
+@@ -1262,11 +1302,15 @@ process_overlaid_node:
(void) snpf(ep, sz, "/%d/fpregs", p.pfs_pid);
ty = "PFPR";
break;
Home |
Main Index |
Thread Index |
Old Index