From 7af1d9b0ee0f8f298a3519f539708ba3f3834a39 Mon Sep 17 00:00:00 2001 From: atatat Date: Sat, 4 Oct 2003 20:22:35 +0000 Subject: Refix build on -current now that procfs and kernfs have churned again. --- sysutils/lsof/distinfo | 8 ++++---- sysutils/lsof/patches/patch-ab | 37 ++++++++++++++++++++++++++++++------- sysutils/lsof/patches/patch-ac | 22 +--------------------- sysutils/lsof/patches/patch-af | 39 ++++++++++++++++++++++++++++++++++++++- 4 files changed, 73 insertions(+), 33 deletions(-) (limited to 'sysutils') diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index 4bfb692bef4..13cc8c4d60b 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.31 2003/09/26 03:13:04 atatat Exp $ +$NetBSD: distinfo,v 1.32 2003/10/04 20:22:35 atatat Exp $ SHA1 (lsof_4.68.tar.gz) = 71df82816e84b4218c473a7102ff31c002192803 Size (lsof_4.68.tar.gz) = 963862 bytes SHA1 (patch-aa) = 7e13302b231240a5225fb02a604268539d956fe7 -SHA1 (patch-ab) = 5c7f1c1ce17644c5c5062fcd0106c9fbcec4b5e5 -SHA1 (patch-ac) = ec12a6ab5acbeb61fe7ad7a9237a04178dbf8fad +SHA1 (patch-ab) = f27ce713c6a00825c96deab0eb013ea57dcfc1ae +SHA1 (patch-ac) = 4cd8d56feb94008c7d54df7f3bbd0c64bcbcfbd8 SHA1 (patch-ad) = f1c66f3903ac99dfdfce9163ede04dc3b84af2d4 SHA1 (patch-ae) = ab22b7026bb59bbaa9e41349f452b8274ccdc43a -SHA1 (patch-af) = 54c47b27f79916304d9724603ef9e337b2768016 +SHA1 (patch-af) = 51d1c7ebfeeb95cb1fcefef22fc96f4cf769d115 diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab index 3a5c990f9da..b55e44fa350 100644 --- a/sysutils/lsof/patches/patch-ab +++ b/sysutils/lsof/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.22 2003/08/13 13:24:16 atatat Exp $ +$NetBSD: patch-ab,v 1.23 2003/10/04 20:22:35 atatat Exp $ Patch for vnode/DNLC interface change courtesy of lsof maintainer. --- Configure.orig 2003-06-11 20:55:38.000000000 -0400 +++ Configure -@@ -819,10 +819,13 @@ +@@ -819,10 +819,13 @@ case $LSOF_TGT in # { LSOF_CFGF="$LSOF_CFGF -DHASFDLINK" fi # } fi # } @@ -21,7 +21,7 @@ Patch for vnode/DNLC interface change courtesy of lsof maintainer. fi # } if test $LSOF_VERS -ge 40000 # { then -@@ -938,6 +941,14 @@ +@@ -938,6 +941,14 @@ case $LSOF_TGT in # { exit 1 fi # } fi # } @@ -36,7 +36,7 @@ Patch for vnode/DNLC interface change courtesy of lsof maintainer. LSOF_DINC="$LSOF_DINC -I`pwd`/dialects/darwin/xnu/bsd" LSOF_DINC="$LSOF_DINC -I/usr/include" LSOF_DINC="$LSOF_DINC -I${DARWIN_SYSDIR}/System.framework/PrivateHeaders" -@@ -1175,6 +1186,14 @@ +@@ -1175,6 +1186,14 @@ kernel generation process. LSOF_CFGF="$LSOF_CFGF -DHASIPv6" fi # } @@ -51,7 +51,7 @@ Patch for vnode/DNLC interface change courtesy of lsof maintainer. LSOF_DIALECT_DIR=du ;; -@@ -1526,10 +1545,13 @@ +@@ -1526,10 +1545,13 @@ kernel generation process. fi # } LSOF_CFGF="$LSOF_CFGF -DHAS9660FS" fi # } @@ -68,7 +68,30 @@ Patch for vnode/DNLC interface change courtesy of lsof maintainer. fi # } if test $LSOF_DINC_ADD -eq 1 # { then -@@ -2241,10 +2263,13 @@ +@@ -2217,6 +2239,11 @@ kernel generation process. + then + LSOF_CFGF="$LSOF_CFGF -DHASPROCFS" + LSOF_TMP1=1 ++ grep -q PFSroot ${NETBSD_SYS}/miscfs/procfs/procfs.h ++ if test $? -eq 0 # { ++ then ++ LSOF_CFGF="$LSOF_CFGF -DHASPROCFS_PFSROOT" ++ fi # } + fi # } + if test -d ${NETBSD_SYS}/isofs/cd9660 # { + then +@@ -2235,16 +2262,24 @@ kernel generation process. + then + LSOF_CFGF="$LSOF_CFGF -DHASKERNFS" + LSOF_TMP1=1 ++ grep -q "*kfs_kt;" ${NETBSD_SYS}/miscfs/kernfs/kernfs.h ++ if test $? -eq 0 # { ++ then ++ LSOF_CFGF="$LSOF_CFGF -DHASKERNFS_KFS_KT" ++ fi # } + fi # } + fi # } + if test $LSOF_TMP1 -eq 1 # { then LSOF_DINC="-I$LSOF_INCLUDE -I$NETBSD_SYS" fi # } @@ -85,7 +108,7 @@ Patch for vnode/DNLC interface change courtesy of lsof maintainer. fi # } grep -q i_ffs_size ${LSOF_INCLUDE}/ufs/ufs/inode.h if test $? -eq 0 # { -@@ -2645,10 +2670,13 @@ +@@ -2645,10 +2680,13 @@ kernel generation process. LSOF_CFGF="$LSOF_CFGF -DHASI_E2FS_PTR" fi # } fi # } diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac index 5487c8cb655..70f857283d0 100644 --- a/sysutils/lsof/patches/patch-ac +++ b/sysutils/lsof/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.11 2003/09/26 03:13:04 atatat Exp $ +$NetBSD: patch-ac,v 1.12 2003/10/04 20:22:35 atatat Exp $ Patch for vnode/DNLC interface change courtesy of lsof maintainer. @@ -31,23 +31,3 @@ Patch for vnode/DNLC interface change courtesy of lsof maintainer. #endif /* defined(HASNCACHE) */ #if defined(HASFSTRUCT) -@@ -394,6 +400,9 @@ - enter_nm(Namech); - return; - } else -+#if defined(NETBSDV) && defined(KERNFSTOV) -+#define kf_kt kfs_kt -+#endif - kn.kf_kt = (struct kern_target *)NULL; - } - /* -@@ -402,6 +411,9 @@ - */ - if (kn.kf_kt - && kread((KA_T)kn.kf_kt, (char *)&kt, sizeof(kt)) == 0 -+#if defined(NETBSDV) && defined(KERNFSTOV) -+#undef kf_kt kfs_kt -+#endif - && (ktnl = (int)kt.kt_namlen) > 0 - && kt.kt_name) - { diff --git a/sysutils/lsof/patches/patch-af b/sysutils/lsof/patches/patch-af index a786e2ce7a1..88fbea2c6ab 100644 --- a/sysutils/lsof/patches/patch-af +++ b/sysutils/lsof/patches/patch-af @@ -1,4 +1,6 @@ -$NetBSD: patch-af,v 1.1 2003/09/26 03:13:04 atatat Exp $ +$NetBSD: patch-af,v 1.2 2003/10/04 20:22:35 atatat Exp $ + +Deal with recent procfs and kernfs churn on the -current branch. --- dialects/n+obsd/dlsof.h.orig 2003-06-11 07:44:54.000000000 -0400 +++ dialects/n+obsd/dlsof.h @@ -10,3 +12,38 @@ $NetBSD: patch-af,v 1.1 2003/09/26 03:13:04 atatat Exp $ # endif /* defined(NETBSDV) */ #include # endif /* (defined(OPENBSDV) && OPENBSDV>=3030) +@@ -253,6 +254,9 @@ struct sockproto { + #define _KERNEL + #include + #undef _KERNEL ++# if defined(HASKERNFS_KFS_KT) ++#define kf_kt kfs_kt ++# endif /* defined(HASKERNFS_KFS_KT) */ + # endif /* defined(HASKERNFS) */ + + # if defined(HASNULLFS) +@@ -266,7 +270,24 @@ struct sockproto { + # endif /* defined(HASNULLFS) */ + + # if defined(HASPROCFS) ++# if defined(HASPROCFS_PFSROOT) ++#define _KERNEL ++# endif /* defined(HASPROCFS_PFSROOT) */ + #include ++# if defined(HASPROCFS_PFSROOT) ++#undef _KERNEL ++#define Proot PFSroot ++#define Pproc PFSproc ++#define Pcurproc PFScurproc ++#define Pmem PFSmem ++#define Pregs PFSregs ++#define Pfile PFSfile ++#define Pfpregs PFSfpregs ++#define Pctl PFSctl ++#define Pstatus PFSstatus ++#define Pnote PFSnote ++#define Pnotepg PFSnotepg ++# endif /* defined(HASPROCFS_PFSROOT) */ + #include + # endif /* defined(HASPROCFS) */ + -- cgit v1.2.3