pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/lsof Upgrade to lsof version 4.74, thereby ge...
details: https://anonhg.NetBSD.org/pkgsrc/rev/05eb12f6c3b5
branches: trunk
changeset: 487618:05eb12f6c3b5
user: atatat <atatat%pkgsrc.org@localhost>
date: Mon Jan 17 14:54:01 2005 +0000
description:
Upgrade to lsof version 4.74, thereby getting rid of most of the
accumulated patches. Changes related to or affecting NetBSD (or
pkgsrc) from the 00DIST file:
4.74 January 17, 2005
...
Updated lsof for NetBSD 2.99.10 and tested it on a
system provided by Andrew Brown <atatat%atatdot.net@localhost>.
...
Added BSDI, FreeBSD, NetBSD and OpenBSD support for the
*effnlink member of the inode structure. This makes
the lsof LTnlink test run faster on all modified
dialects and correctly on OpenBSD.
Added ptyfs support for NetBSD, using modifications
provided by Andrew Brown.
Changed the netbsd Configure stanza to look by default
for system header files in both /usr/include and
/usr/src. (The NETBSD_SYS environment variable can
still be used to select an alternate for /usr/src.)
...
diffstat:
sysutils/lsof/Makefile | 5 +-
sysutils/lsof/distinfo | 15 +-
sysutils/lsof/patches/patch-aa | 34 +-
sysutils/lsof/patches/patch-ab | 136 ------
sysutils/lsof/patches/patch-ac | 928 -----------------------------------------
sysutils/lsof/patches/patch-ad | 25 -
sysutils/lsof/patches/patch-ae | 213 ---------
sysutils/lsof/patches/patch-af | 21 -
sysutils/lsof/patches/patch-ag | 31 -
sysutils/lsof/patches/patch-ah | 45 -
10 files changed, 7 insertions(+), 1446 deletions(-)
diffs (truncated from 1512 to 300 lines):
diff -r 5ddb615f77b4 -r 05eb12f6c3b5 sysutils/lsof/Makefile
--- a/sysutils/lsof/Makefile Mon Jan 17 14:44:30 2005 +0000
+++ b/sysutils/lsof/Makefile Mon Jan 17 14:54:01 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.80 2004/11/30 02:02:13 atatat Exp $
+# $NetBSD: Makefile,v 1.81 2005/01/17 14:54:01 atatat Exp $
#
-DISTNAME= lsof_4.73
-PKGREVISION= 1
+DISTNAME= lsof_4.74
PKGNAME= ${DISTNAME:S/_/-/}
CATEGORIES= sysutils
MASTER_SITES= ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ \
diff -r 5ddb615f77b4 -r 05eb12f6c3b5 sysutils/lsof/distinfo
--- a/sysutils/lsof/distinfo Mon Jan 17 14:44:30 2005 +0000
+++ b/sysutils/lsof/distinfo Mon Jan 17 14:54:01 2005 +0000
@@ -1,12 +1,5 @@
-$NetBSD: distinfo,v 1.48 2004/12/18 05:30:33 atatat Exp $
+$NetBSD: distinfo,v 1.49 2005/01/17 14:54:01 atatat Exp $
-SHA1 (lsof_4.73.tar.bz2) = 3e8112f854fc83f5e5dfdc9271c8d27d31aefc6c
-Size (lsof_4.73.tar.bz2) = 725530 bytes
-SHA1 (patch-aa) = 4878381537330258e9270c9d198d49a426283fab
-SHA1 (patch-ab) = 96c7ec1b1b710b10182da370c0c13e741d4687d8
-SHA1 (patch-ac) = b844e10f4df066bb65bfc644bd387f0d13935726
-SHA1 (patch-ad) = 49f3d0899e8055815c8b25d304281f83e7b1a98d
-SHA1 (patch-ae) = ee3a1ec6e7ac95a92d8f5cc1c76569cc22cb167d
-SHA1 (patch-af) = 0a5ca7b243be925cba841b1358427e86b65ccde1
-SHA1 (patch-ag) = 06a5a07cf550136c8b58f82d4aa0f75d85378db0
-SHA1 (patch-ah) = 35dc2b9ec90a1f418d3cd103b951db46df19bf3c
+SHA1 (lsof_4.74.tar.bz2) = eed401b9d32bc009be48359ffb3bcdea119570d6
+Size (lsof_4.74.tar.bz2) = 732392 bytes
+SHA1 (patch-aa) = 332eb1ac95d86023dde66d1b99b9335c8f54b81f
diff -r 5ddb615f77b4 -r 05eb12f6c3b5 sysutils/lsof/patches/patch-aa
--- a/sysutils/lsof/patches/patch-aa Mon Jan 17 14:44:30 2005 +0000
+++ b/sysutils/lsof/patches/patch-aa Mon Jan 17 14:54:01 2005 +0000
@@ -1,15 +1,10 @@
-$NetBSD: patch-aa,v 1.24 2004/11/28 22:39:07 atatat Exp $
+$NetBSD: patch-aa,v 1.25 2005/01/17 14:54:01 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.
-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
@@ -383,7 +383,9 @@
@@ -34,30 +29,3 @@
/*
-@@ -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 5ddb615f77b4 -r 05eb12f6c3b5 sysutils/lsof/patches/patch-ab
--- a/sysutils/lsof/patches/patch-ab Mon Jan 17 14:44:30 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-$NetBSD: patch-ab,v 1.32 2004/11/30 02:02:13 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
-@@ -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(HASBUFQ_H)
-+# if defined(NETBSDV) && NETBSDV>=2099010
-+#define _KERNEL
-+#include <sys/bufq.h>
-+#undef _KERNEL
-+# 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,26 @@ struct sockproto {
- #define Pstatus PFSstatus
- #define Pnote PFSnote
- #define Pnotepg PFSnotepg
-+# if defined(NetBSDV)
-+# if NETBSDV>=2000000
-+#define Pfd PFSfd
-+# endif /* NETBSDV>=2000000 */
-+# if NETBSDV>=1006000
-+#define Pmap PFSmap
-+#define Pmaps PFSmaps
-+# endif /* NETBSDV>=1006000 */
-+# endif /* defined(NetBSDV) */
- # 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 +539,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 +551,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 5ddb615f77b4 -r 05eb12f6c3b5 sysutils/lsof/patches/patch-ac
--- a/sysutils/lsof/patches/patch-ac Mon Jan 17 14:44:30 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,928 +0,0 @@
-$NetBSD: patch-ac,v 1.21 2004/11/30 02:02:13 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 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 +2265,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"
-+ LSOF_VERS="1006000"
- ;;
- 1*)
-- LSOF_VERS=1060
-+ LSOF_VERS="1006000"
- echo "!!!WARNING!!! Unsupported NetBSD version: $LSOF_VSTR"
- echo "!!!WARNING!!! Configuring for NetBSD 1.6"
- ;;
- 2.0*)
- LSOF_TSTBIGF=" "
-- LSOF_VERS="2000"
-+ LSOF_VERS="2000000"
- ;;
- 2.99.9)
- LSOF_TSTBIGF=" "
-- LSOF_VERS="2999"
-+ LSOF_VERS="2099009"
-+ ;;
-+ 2.99.10)
-+ LSOF_TSTBIGF=" "
-+ LSOF_VERS="2099010"
- ;;
- 2*)
-- LSOF_VERS=2000
Home |
Main Index |
Thread Index |
Old Index