pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/lsof Tweak the sys/bufq.h support (it disappe...
details: https://anonhg.NetBSD.org/pkgsrc/rev/0668f9acbb4b
branches: trunk
changeset: 484656:0668f9acbb4b
user: atatat <atatat%pkgsrc.org@localhost>
date: Sun Nov 28 22:39:07 2004 +0000
description:
Tweak the sys/bufq.h support (it disappeared again), enhance the
procfs support a little, incorporate the author's patches to deal with
netbsd-current version numbers getting longer, and add ptyfs support.
These patches are adapted from an interim release the author made and
will appear in the next full release.
PKGREVISION bumped to 1 for the ptyfs support.
diffstat:
sysutils/lsof/Makefile | 4 +-
sysutils/lsof/distinfo | 13 +-
sysutils/lsof/patches/patch-aa | 40 +-
sysutils/lsof/patches/patch-ab | 124 +++++-
sysutils/lsof/patches/patch-ac | 929 ++++++++++++++++++++++++++++++++++++++++-
sysutils/lsof/patches/patch-ad | 25 +
sysutils/lsof/patches/patch-ae | 161 +++++++
sysutils/lsof/patches/patch-af | 21 +
sysutils/lsof/patches/patch-ag | 31 +
sysutils/lsof/patches/patch-ah | 45 +
10 files changed, 1365 insertions(+), 28 deletions(-)
diffs (truncated from 1497 to 300 lines):
diff -r d4a224ebfd0e -r 0668f9acbb4b sysutils/lsof/Makefile
--- a/sysutils/lsof/Makefile Sun Nov 28 21:32:47 2004 +0000
+++ b/sysutils/lsof/Makefile Sun Nov 28 22:39:07 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.78 2004/10/21 13:09:20 atatat Exp $
+# $NetBSD: Makefile,v 1.79 2004/11/28 22:39:07 atatat Exp $
#
DISTNAME= lsof_4.73
+PKGREVISION= 1
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= sysutils
MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
@@ -30,6 +31,7 @@
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
+BUILDLINK_PASSTHRU_DIRS= /usr/src/sys
.include "../../mk/bsd.prefs.mk"
diff -r d4a224ebfd0e -r 0668f9acbb4b sysutils/lsof/distinfo
--- a/sysutils/lsof/distinfo Sun Nov 28 21:32:47 2004 +0000
+++ b/sysutils/lsof/distinfo Sun Nov 28 22:39:07 2004 +0000
@@ -1,7 +1,12 @@
-$NetBSD: distinfo,v 1.45 2004/11/12 05:41:36 erh Exp $
+$NetBSD: distinfo,v 1.46 2004/11/28 22:39:07 atatat Exp $
SHA1 (lsof_4.73.tar.bz2) = 3e8112f854fc83f5e5dfdc9271c8d27d31aefc6c
Size (lsof_4.73.tar.bz2) = 725530 bytes
-SHA1 (patch-aa) = 36790019394b4088c226222d4aefaec50430bcf3
-SHA1 (patch-ab) = 339dde4ed2d24fbfcfadb52f0cc5dfe2b1861170
-SHA1 (patch-ac) = f8ea499518695f5dbed2536c89373840fc3272c9
+SHA1 (patch-aa) = 4878381537330258e9270c9d198d49a426283fab
+SHA1 (patch-ab) = f35db0c78d3b6a743d132900649d1bf31617ca63
+SHA1 (patch-ac) = e8388f7e6925c89b0a2264a35dd3e264f9d135e4
+SHA1 (patch-ad) = 49f3d0899e8055815c8b25d304281f83e7b1a98d
+SHA1 (patch-ae) = fc314546f0b3769414939cf22894e69c13589f1e
+SHA1 (patch-af) = 0a5ca7b243be925cba841b1358427e86b65ccde1
+SHA1 (patch-ag) = 06a5a07cf550136c8b58f82d4aa0f75d85378db0
+SHA1 (patch-ah) = 35dc2b9ec90a1f418d3cd103b951db46df19bf3c
diff -r d4a224ebfd0e -r 0668f9acbb4b sysutils/lsof/patches/patch-aa
--- a/sysutils/lsof/patches/patch-aa Sun Nov 28 21:32:47 2004 +0000
+++ b/sysutils/lsof/patches/patch-aa Sun Nov 28 22:39:07 2004 +0000
@@ -1,13 +1,18 @@
-$NetBSD: patch-aa,v 1.23 2003/11/22 23:30:03 atatat Exp $
+$NetBSD: patch-aa,v 1.24 2004/11/28 22:39:07 atatat Exp $
If LSOF_MORE_SECURE is non-zero, compile lsof with security, and
only let unprivileged (non-root) users view their own open files.
Set LSOF_LESS_SECURE_SOCKETS to non-zero in order to allow non-root
users to see open sockets, even when LSOF_MORE_SECURE is set.
---- dialects/n+obsd/machine.h.orig Tue Dec 3 13:23:54 2002
+Also, incorporate a patch from the author that widens the NETBSDV
+definition to account for new current versioning system, properly
+handles the sys/bufq.h mess, adds a bit more to procfs support, and
+adds ptyfs support.
+
+--- dialects/n+obsd/machine.h.orig 2004-10-17 17:55:27.000000000 -0400
+++ dialects/n+obsd/machine.h
-@@ -371,7 +371,9 @@
+@@ -383,7 +383,9 @@
* (the one that its user logged on with) of the lsof process.
*/
@@ -18,7 +23,7 @@
/*
-@@ -380,7 +382,9 @@
+@@ -392,7 +394,9 @@
* listing is selected by the "-i" option.
*/
@@ -29,3 +34,30 @@
/*
+@@ -407,9 +411,9 @@
+
+ #define HASSETLOCALE 1
+
+-# if defined(NETBSDV) && NETBSDV>=1060
++# if defined(NETBSDV) && NETBSDV>=1006000
+ #define HASWIDECHAR 1
+-# endif /* defined(NETBSDV) && NETBSDV>=1060*/
++# endif /* defined(NETBSDV) && NETBSDV>=1006000 */
+
+ /* #define WIDECHARINCL <wchar.h> */
+
+@@ -529,11 +533,11 @@
+ /* #define USE_LIB_READMNT 1 rmnt.c */
+ /* #define USE_LIB_REGEX 1 regex.c */
+
+-# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020)
++# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000)
+ #define USE_LIB_RNMH 1 /* rnmh.c */
+-# else /* (defined(OPENBSDV) && OPENBSDV<2010) && (defined(NETBSDV) && NETBSDV<1020) */
++# else /* (defined(OPENBSDV) && OPENBSDV<2010) && (defined(NETBSDV) && NETBSDV<1002000) */
+ #define USE_LIB_RNAM 1 /* rnam.c */
+-# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
++# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
+
+ /* #define USE_LIB_RNCH 1 rnch.c */
+ /* #define USE_LIB_SNPF 1 snpf.c */
diff -r d4a224ebfd0e -r 0668f9acbb4b sysutils/lsof/patches/patch-ab
--- a/sysutils/lsof/patches/patch-ab Sun Nov 28 21:32:47 2004 +0000
+++ b/sysutils/lsof/patches/patch-ab Sun Nov 28 22:39:07 2004 +0000
@@ -1,16 +1,130 @@
-$NetBSD: patch-ab,v 1.30 2004/11/07 18:16:27 kim Exp $
+$NetBSD: patch-ab,v 1.31 2004/11/28 22:39:07 atatat Exp $
+
+Incorporate a patch from the author that widens the NETBSDV definition
+to account for new current versioning system, properly handles the
+sys/bufq.h mess, adds a bit more to procfs support, and adds ptyfs
+support.
--- dialects/n+obsd/dlsof.h.orig 2004-03-10 18:51:36.000000000 -0500
-+++ dialects/n+obsd/dlsof.h 2004-11-07 13:12:14.000000000 -0500
-@@ -245,6 +245,11 @@
++++ dialects/n+obsd/dlsof.h
+@@ -98,9 +98,9 @@ struct uio; /* dummy for function protot
+ #include <rpc/types.h>
+ #include <sys/protosw.h>
+
+-# if defined(NETBSDV) && NETBSDV>=1030
++# if defined(NETBSDV) && NETBSDV>=1003000
+ #define sockproto NETBSD_sockproto
+-# endif /* defined(NETBSDV) && NETBSDV>=1030 */
++# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
+
+ #include <sys/socket.h>
+
+@@ -145,9 +145,9 @@ struct nameidata; /* to satisfy a functi
+ #include <msdosfs/denode.h>
+ # endif /* defined(HASMSDOSFS) */
+
+-# if defined(NETBSDV) && NETBSDV>=1030
++# if defined(NETBSDV) && NETBSDV>=1003000
+ #undef sockproto
+-# endif /* defined(NETBSDV) && NETBSDV>=1030 */
++# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
+
+ #include <sys/socketvar.h>
+ #include <sys/un.h>
+@@ -202,7 +202,7 @@ struct nameidata; /* to satisfy a functi
+
+ #include <sys/vnode.h>
+
+-# if defined(NETBSDV) && NETBSDV>=1030
++# if defined(NETBSDV) && NETBSDV>=1003000
+ /*
+ * Because late in the 1.3I NetBSD development cycle the sockproto structure
+ * was placed under _KERNEL in <sys/socket.h>, and because defining _KERNEL
+@@ -217,7 +217,7 @@ struct sockproto {
+ u_short sp_family;
+ u_short sp_protocol;
+ };
+-# endif /* defined(NETBSDV) && NETBSDV>=1030 */
++# endif /* defined(NETBSDV) && NETBSDV>=1003000 */
+
+ #include <net/raw_cb.h>
+ #include <sys/domain.h>
+@@ -245,6 +245,14 @@ struct sockproto {
#undef DIRENT_DIRBLKSIZ
# endif /*defined(DIRENT_BLKSIZ) */
-+# if defined(NETBSDV) && NETBSDV>=2991
++# if defined(HASBUFQ_H)
++# if defined(NETBSDV) && NETBSDV>=2099010
+#define _KERNEL
+#include <sys/bufq.h>
+#undef _KERNEL
-+# endif /* defined(NETBSDV) && NETBSDV>=2991 */
++# endif /* defined(NETBSDV) && NETBSDV>=2099010 */
++#endif /* defined(HASBUFQ_H) */
++
#undef KERNEL
#include <ufs/mfs/mfsnode.h>
+@@ -331,9 +339,9 @@ struct sockproto {
+
+ # if defined(HASNULLFS)
+ #define _KERNEL
+-# if defined(NETBSDV) && NETBSDV>=1050 && __NetBSD_Version__<106060000
++# if defined(NETBSDV) && NETBSDV>=1005000 && __NetBSD_Version__<106060000
+ #include "netexport.h"
+-# endif /* defined(NETBSDV) && NETBSDV>=1050
++# endif /* defined(NETBSDV) && NETBSDV>=1005000
+ && __NetBSD_Version__<106060000 */
+ #include <miscfs/nullfs/null.h>
+ #undef _KERNEL
+@@ -357,10 +365,20 @@ struct sockproto {
+ #define Pstatus PFSstatus
+ #define Pnote PFSnote
+ #define Pnotepg PFSnotepg
++#define Pfd PFSfd
++#define Pmap PFSmap
++#define Pmaps PFSmaps
+ # endif /* defined(HASPROCFS_PFSROOT) */
+ #include <machine/reg.h>
+ # endif /* defined(HASPROCFS) */
+
++# if defined(HASPTYFS)
++#define _KERNEL
++#include <fs/ptyfs/ptyfs.h>
++#include <miscfs/specfs/specdev.h>
++#undef _KERNEL
++# endif /* defined(HASPTYFS) */
++
+ #define KERNEL
+ #define _KERNEL
+ #include <sys/file.h>
+@@ -515,9 +533,9 @@ struct sfile {
+ */
+
+ # if defined(HASNCACHE)
+-# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020)
++# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000)
+ #include <stddef.h>
+-#endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
++#endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
+
+ #include <sys/uio.h>
+ #include <sys/namei.h>
+@@ -527,15 +545,15 @@ 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>=1020)
++# if (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000)
+ #define NCACHE_NXT nc_hash.le_next /* link in NCACHE */
+-# else /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
++# else /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
+ # if defined(NetBSD1_0) && NetBSD<1994101
+ #define NCACHE_NXT nc_nxt /* link in NCACHE */
+ # else /* !defined(NetBSD1_0) || NetBSD>=1994101 */
+ #define NCACHE_NXT nc_lru.tqe_next /* link in NCACHE */
+ # endif /* defined(NetBSD1_0) && NetBSD<1994101 */
+-# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1020) */
++# endif /* (defined(OPENBSDV) && OPENBSDV>=2010) || (defined(NETBSDV) && NETBSDV>=1002000) */
+
+ # if defined(HASNCVPID)
+ #define NCACHE_PARID nc_dvpid /* parent node ID in NCACHE */
diff -r d4a224ebfd0e -r 0668f9acbb4b sysutils/lsof/patches/patch-ac
--- a/sysutils/lsof/patches/patch-ac Sun Nov 28 21:32:47 2004 +0000
+++ b/sysutils/lsof/patches/patch-ac Sun Nov 28 22:39:07 2004 +0000
@@ -1,30 +1,931 @@
-$NetBSD: patch-ac,v 1.19 2004/11/12 05:41:36 erh Exp $
+$NetBSD: patch-ac,v 1.20 2004/11/28 22:39:07 atatat Exp $
+
+Incorporate a patch from the author that widens the NETBSDV definition
+to account for new current versioning system, properly handles the
+sys/bufq.h mess, adds a bit more to procfs support, and adds ptyfs
+support.
---- Configure.orig 2004-10-19 19:36:21.000000000 +0000
-+++ Configure 2004-11-12 05:35:16.000000000 +0000
-@@ -2298,7 +2298,15 @@
+--- Configure.orig 2004-10-19 15:36:21.000000000 -0400
++++ Configure
+@@ -161,6 +161,7 @@ LSOF_TSTK64=0
+ LSOF_TSTKMEM=1
+ LSOF_TSTLFF="${LSOF_TSTSUBD}/config.ldflags"
+ LSOF_TSTLFLG=""
++LSOF_TSTVPATH=0
+ LSOF_TSTXO=""
+ LSOF_TSTXOC="${LSOF_TSTSUBD}/config.xobj"
+ if test "X$LSOF_VERS" = "X" # {
+@@ -2264,51 +2279,49 @@ return(0); }
+ # Validate the NetBSD version.
+
+ case $LSOF_VSTR in # {
+- 1.0*)
+- LSOF_VERS="1000"
+- ;;
+- 1.1*)
+- LSOF_VERS="1010"
+- ;;
+ 1.2*)
+- LSOF_VERS="1020"
++ LSOF_VERS="1002000"
+ ;;
+ 1.3*)
+- LSOF_VERS="1030"
++ LSOF_VERS="1003000"
+ ;;
+ 1.4*)
+- LSOF_VERS="1040"
++ LSOF_VERS="1004000"
+ ;;
+ 1.5*)
+ LSOF_TSTBIGF=" "
+- LSOF_VERS="1050"
++ LSOF_VERS="1005000"
+ ;;
+ 1.6*)
+ LSOF_TSTBIGF=" "
+- LSOF_VERS="1060"
Home |
Main Index |
Thread Index |
Old Index