From e31fd121dbf5e94c9d8b9f0c437d5b2169144c9f Mon Sep 17 00:00:00 2001 From: pvalchev Date: Sun, 5 Jun 2005 19:40:54 +0000 Subject: [PATCH] update to lsof-4.75 --- sysutils/lsof/Makefile | 6 +-- sysutils/lsof/distinfo | 8 ++-- sysutils/lsof/patches/patch-Configure | 35 -------------- .../patches/patch-dialects_n+obsd_dnode1_c | 11 ----- .../patches/patch-dialects_n+obsd_dnode_c | 48 ------------------- sysutils/lsof/pkg/PLIST | 3 +- 6 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 sysutils/lsof/patches/patch-Configure delete mode 100644 sysutils/lsof/patches/patch-dialects_n+obsd_dnode1_c delete mode 100644 sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index a8bdd5b134a..2499e0fe0ec 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.55 2005/02/17 12:48:09 espie Exp $ +# $OpenBSD: Makefile,v 1.56 2005/06/05 19:40:54 pvalchev Exp $ COMMENT= "list information about open files" -VERSION= 4.69 +VERSION= 4.75 DISTNAME= lsof_${VERSION} -PKGNAME= ${DISTNAME:S/_/-/}p0 +PKGNAME= ${DISTNAME:S/_/-/} CATEGORIES= sysutils MASTER_SITES= ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/ \ ftp://ftp.ayamura.org/pub/lsof/ \ diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index 112205977e1..479567ee7f4 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,4 +1,4 @@ -MD5 (lsof_4.69.tar.gz) = d13e98fc85806424e371efde71f1e186 -RMD160 (lsof_4.69.tar.gz) = a5e05ffeb3b59cb0aac38c90146d9b3bf5616a08 -SHA1 (lsof_4.69.tar.gz) = 2ed1fc88e5508dfc38dc0a70559b6e8ee78a0bae -SIZE (lsof_4.69.tar.gz) = 969757 +MD5 (lsof_4.75.tar.gz) = ec4e62f1e70aaac52b58bdacf0cc9c05 +RMD160 (lsof_4.75.tar.gz) = 0b12aa6b98841026475b2bd219389f32d17de63e +SHA1 (lsof_4.75.tar.gz) = 714390a7bad628b7a746a79557ee16236663bc04 +SIZE (lsof_4.75.tar.gz) = 978144 diff --git a/sysutils/lsof/patches/patch-Configure b/sysutils/lsof/patches/patch-Configure deleted file mode 100644 index 21d1f1263ca..00000000000 --- a/sysutils/lsof/patches/patch-Configure +++ /dev/null @@ -1,35 +0,0 @@ -$OpenBSD: patch-Configure,v 1.17 2005/03/13 05:02:01 pvalchev Exp $ ---- Configure.orig Wed Oct 15 14:30:40 2003 -+++ Configure Sat Mar 12 22:01:04 2005 -@@ -2619,6 +2619,22 @@ kernel generation process. - LSOF_TSTBIGF=" " - LSOF_VERS=3030 - ;; -+ 3.4*) -+ LSOF_TSTBIGF=" " -+ LSOF_VERS=3040 -+ ;; -+ 3.5*) -+ LSOF_TSTBIGF=" " -+ LSOF_VERS=3050 -+ ;; -+ 3.6*) -+ LSOF_TSTBIGF=" " -+ LSOF_VERS=3060 -+ ;; -+ 3.7*) -+ LSOF_TSTBIGF=" " -+ LSOF_VERS=3070 -+ ;; - 3*) - LSOF_TSTBIGF=" " - LSOF_VERS=3020 -@@ -2636,7 +2652,7 @@ kernel generation process. - # Test for legal OpenBSD version. - - case $LSOF_VERS in # { -- 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030) -+ 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070) - ;; - *) - echo "Unknown OpenBSD version: $LSOF_VERS" diff --git a/sysutils/lsof/patches/patch-dialects_n+obsd_dnode1_c b/sysutils/lsof/patches/patch-dialects_n+obsd_dnode1_c deleted file mode 100644 index 42c52718a74..00000000000 --- a/sysutils/lsof/patches/patch-dialects_n+obsd_dnode1_c +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-dialects_n+obsd_dnode1_c,v 1.1 2004/02/07 07:20:16 sturm Exp $ ---- dialects/n+obsd/dnode1.c.orig 2004-02-06 21:28:57.000000000 +0100 -+++ dialects/n+obsd/dnode1.c 2004-02-06 21:29:44.000000000 +0100 -@@ -48,6 +48,7 @@ static char *rcsid = "$Id: dnode1.c,v 1. - - #undef doff_t - #undef i_dev -+#undef i_devvp - #undef i_number - #undef IN_ACCESS - #undef IN_LOCKED diff --git a/sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c b/sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c deleted file mode 100644 index 32c87570970..00000000000 --- a/sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c +++ /dev/null @@ -1,48 +0,0 @@ -$OpenBSD: patch-dialects_n+obsd_dnode_c,v 1.5 2004/01/11 00:14:31 pvalchev Exp $ ---- dialects/n+obsd/dnode.c.orig 2004-01-10 16:57:19.000000000 -0700 -+++ dialects/n+obsd/dnode.c 2004-01-10 16:57:55.000000000 -0700 -@@ -542,11 +542,11 @@ process_overlaid_node: - nty = EXT2NODE; - - # if defined(HASI_E2FS_PTR) -- if (i.i_din.e2fs_din -- && !kread((KA_T)i.i_din.e2fs_din, (char *)&ed, sizeof(ed))) -+ if (i.dinode_u.e2fs_din -+ && !kread((KA_T)i.dinode_u.e2fs_din, (char *)&ed, sizeof(ed))) - edp = &ed; - # else /* !defined(HASI_E2FS_PTR) */ -- edp = &i.i_din.e2fs_din; -+ edp = &i.dinode_u.e2fs_din; - # endif /* defined(HASI_E2FS_PTR) */ - - } else -@@ -563,16 +563,16 @@ process_overlaid_node: - && !kread((KA_T)i.i_ump, (char *)&um, sizeof(um))) { - if (um.um_fstype == UFS1) { - ffs = 1; -- if (i.i_din.ffs1_din -- && !kread((KA_T)i.i_din.ffs1_din, (char *)&u1, -+ if (i.dinode_u.ffs1_din -+ && !kread((KA_T)i.dinode_u.ffs1_din, (char *)&u1, - sizeof(u1))) - { - u1s = 1; - } - } else if (um.um_fstype == UFS2) { - ffs = 2; -- if (i.i_din.ffs2_din -- && !kread((KA_T)i.i_din.ffs2_din, (char *)&u2, -+ if (i.dinode_u.ffs2_din -+ && !kread((KA_T)i.dinode_u.ffs2_din, (char *)&u2, - sizeof(u2))) - { - u2s = 1; -@@ -693,7 +693,7 @@ process_overlaid_node: - rdevs = 1; - } - # else /* !defined(HASI_E2FS_PTR) */ -- rdev = i.i_din.e2fs_din.e2di_rdev; -+ rdev = i.dinode_u.e2fs_din.e2di_rdev; - rdevs = 1; - # endif /* defined(HASI_E2FS_PTR) */ - diff --git a/sysutils/lsof/pkg/PLIST b/sysutils/lsof/pkg/PLIST index 704409cdd9e..a69f57be107 100644 --- a/sysutils/lsof/pkg/PLIST +++ b/sysutils/lsof/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.8 2004/09/15 18:39:33 espie Exp $ +@comment $OpenBSD: PLIST,v 1.9 2005/06/05 19:40:54 pvalchev Exp $ @man man/cat8/lsof.0 sbin/lsof share/lsof/ @@ -14,5 +14,6 @@ share/lsof/list_NULf.perl5 share/lsof/list_fields.awk share/lsof/list_fields.perl share/lsof/shared.perl5 +share/lsof/sort_res.perl5 share/lsof/watch_a_file.perl share/lsof/xusers.awk