diff options
author | atatat <atatat> | 2004-01-17 19:31:30 +0000 |
---|---|---|
committer | atatat <atatat> | 2004-01-17 19:31:30 +0000 |
commit | 84e5f11b3dac39998d55ddac916c27363c4b940b (patch) | |
tree | c483691f99c1fa4544a274605638612b20b74909 /sysutils/lsof/patches | |
parent | 30f370e11954bb9a2e35c710d9c805fd80b1f34d (diff) | |
download | pkgsrc-84e5f11b3dac39998d55ddac916c27363c4b940b.tar.gz |
Upgrade to lsof version 4.70. Changes related to or affecting NetBSD
(or pkgsrc) from the 00DIST file:
4.70 January 16, 2004
...
Added bz2 compression.
...
Improved handling of parameters after "-i@".
...
With help from Andrew Brown <atatat@atatdot.net> and
John Heasley <heas@netbsd.org> added log-structured
file system (LFS) support for NetBSD and OpenBSD.
Diffstat (limited to 'sysutils/lsof/patches')
-rw-r--r-- | sysutils/lsof/patches/patch-ab | 83 | ||||
-rw-r--r-- | sysutils/lsof/patches/patch-ac | 160 |
2 files changed, 0 insertions, 243 deletions
diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab deleted file mode 100644 index 11a91d5588f..00000000000 --- a/sysutils/lsof/patches/patch-ab +++ /dev/null @@ -1,83 +0,0 @@ -$NetBSD: patch-ab,v 1.25 2004/01/13 02:50:28 atatat Exp $ - -Support for LFS. - ---- Configure.orig 2003-10-15 16:30:40.000000000 -0400 -+++ Configure -@@ -2253,6 +2253,14 @@ kernel generation process. - fi # } - LSOF_TMP1=1 - fi # } -+ if test -r ${LSOF_INCLUDE}/sys/vnode.h # { -+ then -+ grep -q VT_LFS ${LSOF_INCLUDE}/sys/vnode.h -+ if test $? -eq 0 # { -+ then -+ LSOF_CFGF="$LSOF_CFGF -DHASLFS" -+ fi # } -+ fi # } - if test -r ${LSOF_INCLUDE}/miscfs/nullfs/null.h # { - then - LSOF_CFGF="$LSOF_CFGF -DHASNULLFS" -@@ -2619,11 +2627,15 @@ kernel generation process. - LSOF_TSTBIGF=" " - LSOF_VERS=3030 - ;; -+ 3.4*) -+ LSOF_TSTBIGF=" " -+ LSOF_VERS=3040 -+ ;; - 3*) - LSOF_TSTBIGF=" " -- LSOF_VERS=3020 -+ LSOF_VERS=3030 - echo "!!!WARNING!!! Unsupported OpenBSD 3.x version: $LSOF_VSTR" -- echo "!!!WARNING!!! Configuring for OpenBSD 3.2" -+ echo "!!!WARNING!!! Configuring for OpenBSD 3.3" - ;; - *) - echo "Unknown OpenBSD release: $LSOF_VSTR" -@@ -2636,7 +2648,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) - ;; - *) - echo "Unknown OpenBSD version: $LSOF_VERS" -@@ -2680,6 +2692,14 @@ kernel generation process. - fi # } - LSOF_TMP1=1 - fi # } -+ if test -r ${LSOF_INCLUDE}/sys/vnode.h # { -+ then -+ grep -q VT_LFS ${LSOF_INCLUDE}/sys/vnode.h -+ if test $? -eq 0 # { -+ then -+ LSOF_CFGF="$LSOF_CFGF -DHASLFS" -+ fi # } -+ fi # } - if test -r ${LSOF_INCLUDE}/miscfs/nullfs/null.h # { - then - LSOF_CFGF="$LSOF_CFGF -DHASNULLFS" -@@ -2733,12 +2753,18 @@ kernel generation process. - grep -q VT_EXT2FS ${LSOF_INCLUDE}/sys/vnode.h - if test $? -eq 0 # { - then -- LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS" -+ LSOF_TMP1=1 - grep -q "*e2fs_din" ${LSOF_INCLUDE}/ufs/ufs/inode.h - if test $? -eq 0 # { - then - LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR" - fi # } -+ grep -q "^#define[ ]i_e2din" ${LSOF_INCLUDE}/ufs/ufs/inode.h -+ if test $? -eq 0 # { -+ then -+ LSOF_TMP1=2 -+ fi # } -+ LSOF_CFGF="$LSOF_CFGF -DHASEXT2FS=$LSOF_TMP1" - fi # } - if test -r ${LSOF_INCLUDE}/sys/namei.h - then diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac deleted file mode 100644 index 25933df1588..00000000000 --- a/sysutils/lsof/patches/patch-ac +++ /dev/null @@ -1,160 +0,0 @@ -$NetBSD: patch-ac,v 1.14 2004/01/13 02:50:28 atatat Exp $ - -Support for LFS. - ---- dialects/n+obsd/dnode.c.orig 2003-10-15 07:34:21.000000000 -0400 -+++ dialects/n+obsd/dnode.c -@@ -528,6 +528,10 @@ process_overlaid_node: - case VT_EXT2FS: - #endif /* defined(HASEXT2FS) */ - -+#if defined(HASLFS) -+ case VT_LFS: -+#endif /* defined(HASLFS) */ -+ - case VT_UFS: - if (!v->v_data - || kread((KA_T)v->v_data, (char *)&i, sizeof(i))) { -@@ -546,7 +550,11 @@ process_overlaid_node: - && !kread((KA_T)i.i_din.e2fs_din, (char *)&ed, sizeof(ed))) - edp = &ed; - # else /* !defined(HASI_E2FS_PTR) */ -+# if HASEXT2FS<2 - edp = &i.i_din.e2fs_din; -+# else /* HASEXT2FS>=2 */ -+ edp = &i.i_e2din; -+# endif /* HASEXT2FS>=2 */ - # endif /* defined(HASI_E2FS_PTR) */ - - } else -@@ -693,7 +701,11 @@ process_overlaid_node: - rdevs = 1; - } - # else /* !defined(HASI_E2FS_PTR) */ -+# if HASEXT2FS<2 - rdev = i.i_din.e2fs_din.e2di_rdev; -+# else /* HASEXT2FS>=2 */ -+ rdev = i.i_e2din.e2di_rdev; -+# endif /* HASEXT2FS>=2 */ - rdevs = 1; - # endif /* defined(HASI_E2FS_PTR) */ - -@@ -895,13 +907,17 @@ process_overlaid_node: - - case N_REGLR: - if (type == VREG || type == VDIR) { -- if (nty == INODE) { -+ switch (nty) { -+ case INODE: - - #if defined(HASI_FFS) -+ - Lf->sz = (SZOFFTYPE)i.i_ffs_size; - Lf->sz_def = 1; -+ break; - #else /* !defined(HASI_FFS) */ - # if defined(HASI_FFS1) -+ - if (ffs == 1) { - if (u1s) { - Lf->sz = (SZOFFTYPE)u1.di_size; -@@ -913,28 +929,30 @@ process_overlaid_node: - Lf->sz_def = 1; - } - } -+ break; - # else /* !defined(HASI_FFS1) */ - Lf->sz = (SZOFFTYPE)i.i_size; - Lf->sz_def = 1; - # endif /* defined(HASI_FFS1) */ - #endif /* defined(HASI_FFS) */ - -- } -+ break; -+ - - #if defined(HASMSDOSFS) -- else if (nty == DOSNODE) { -+ case DOSNODE: - Lf->sz = (SZOFFTYPE)d.de_FileSize; - Lf->sz_def = 1; -- } -+ break; - #endif /* defined(HASMSDOSFS) */ - -- else if (nty == MFSNODE) { -+ case MFSNODE: - Lf->sz = (SZOFFTYPE)m.mfs_size; - Lf->sz_def = 1; -- } -+ break; - - #if defined(HASEXT2FS) -- else if (nty == EXT2NODE) { -+ case EXT2NODE: - # if defined(HASI_E2FS_PTR) - if (edp) { - Lf->sz = (SZOFFTYPE)edp->e2di_size; -@@ -944,11 +962,11 @@ process_overlaid_node: - Lf->sz = (SZOFFTYPE)i.i_e2fs_size; - Lf->sz_def = 1; - # endif /* defined(HASI_E2FS_PTR) */ -- } -+ break; - #endif /* defined(HASEXT2FS) */ - -- } -- else if ((type == VCHR || type == VBLK) && !Fsize) -+ } -+ } else if ((type == VCHR || type == VBLK) && !Fsize) - Lf->off_def = 1; - break; - } -@@ -984,7 +1002,8 @@ process_overlaid_node: - } - break; - case N_REGLR: -- if (nty == INODE) { -+ switch (nty) { -+ case INODE: - - # if defined(HASI_FFS) - Lf->nlink = (long)i.i_ffs_nlink; -@@ -1009,18 +1028,17 @@ process_overlaid_node: - # endif /* defined(HASI_FFS) */ - - Lf->nlink_def = 1; -- } -+ break; - - #if defined(HASMSDOSFS) -- else if (nty == DOSNODE) { -+ case DOSNODE: - Lf->nlink = (long)d.de_refcnt; - Lf->nlink_def = 1; -- } -+ break; - #endif /* defined(HASMSDOSFS) */ - -- - #if defined(HASEXT2FS) -- else if (nty == EXT2NODE) { -+ case EXT2NODE: - # if defined(HASI_E2FS_PTR) - if (edp) { - Lf->nlink = (long)edp->e2di_nlink; -@@ -1030,9 +1048,12 @@ process_overlaid_node: - Lf->nlink = (long)i.i_e2fs_nlink; - Lf->nlink_def = 1; - # endif /* defined(HASI_E2FS_PTR) */ -- } --#endif /* defined(HASEXT2FS) */ - -+ break; -+ -+#endif /* defined(HASEXT2FS) */ -+ -+ } - break; - } - if (Lf->nlink_def && Nlink && (Lf->nlink < Nlink)) |