diff options
author | christos <christos@pkgsrc.org> | 2003-04-19 02:09:09 +0000 |
---|---|---|
committer | christos <christos@pkgsrc.org> | 2003-04-19 02:09:09 +0000 |
commit | 0b3883902e5e3d27249d8f030a20a1187ff75335 (patch) | |
tree | 6a71a5ff557726a9c98b9ddd2475982d4510c26d | |
parent | 8860449a53f38f9597582693a5a251085bc9098f (diff) | |
download | pkgsrc-0b3883902e5e3d27249d8f030a20a1187ff75335.tar.gz |
make this compile again. No UFS2 support.
-rw-r--r-- | sysutils/lsof/distinfo | 3 | ||||
-rw-r--r-- | sysutils/lsof/patches/patch-ab | 49 |
2 files changed, 51 insertions, 1 deletions
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index cee5ed91d9a..0225e840d5e 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.25 2003/03/27 14:13:26 atatat Exp $ +$NetBSD: distinfo,v 1.26 2003/04/19 02:09:09 christos Exp $ SHA1 (lsof_4.67.tar.gz) = bc6339455586e1dbb7e9b1b70af6f43ec12144f1 Size (lsof_4.67.tar.gz) = 959529 bytes SHA1 (patch-aa) = 36790019394b4088c226222d4aefaec50430bcf3 +SHA1 (patch-ab) = a98b4e787816528b53b0bedf619732ecb3512cc3 diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab new file mode 100644 index 00000000000..047db072a7e --- /dev/null +++ b/sysutils/lsof/patches/patch-ab @@ -0,0 +1,49 @@ +$NetBSD: patch-ab,v 1.19 2003/04/19 02:09:09 christos Exp $ + +--- dialects/n+obsd/dnode.c.orig 2003-03-23 14:26:47.000000000 -0500 ++++ dialects/n+obsd/dnode.c 2003-04-18 22:02:42.000000000 -0400 +@@ -616,8 +616,18 @@ + dev = i.i_dev; + devs = 1; + if ((type == VCHR) || (type == VBLK)) { ++#ifdef i_e2fs_rdev ++ struct ext2fs_dinode din; ++ if (i.i_din.e2fs_din && ++ !kread((KA_T)i.i_din.e2fs_din, (char *)&din, sizeof(din))) { ++ rdev = din.e2di_rdev; ++ rdevs = 1; ++ } else ++ rdevs = 0; ++#else + rdev = i.i_rdev; + rdevs = 1; ++#endif + } + # endif /* defined(HASI_FFS) */ + +@@ -628,14 +638,22 @@ + dev = i.i_dev; + devs = 1; + if ((type == VCHR) || (type == VBLK)) { +- + #if defined(HASI_FFS) +- rdev = i.i_ffs_rdev; + #else /* !defined(HASI_FFS) */ ++#ifdef i_ffs1_rdev ++ struct ufs1_dinode din; ++ if (i.i_din.ffs1_din && ++ !kread((KA_T)i.i_din.ffs1_din, (char *)&din, sizeof(din))) { ++ rdev = din.di_rdev; ++ rdevs = 1; ++ } else ++ rdevs = 0; ++#else + rdev = i.i_rdev; ++ rdevs = 1; ++#endif + #endif /* defined(HASI_FFS) */ + +- rdevs = 1; + } + break; + |