diff options
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/lsof/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/lsof/files/md5 | 4 | ||||
| -rw-r--r-- | sysutils/lsof/patches/patch-aa | 38 | ||||
| -rw-r--r-- | sysutils/lsof/patches/patch-ac | 78 |
4 files changed, 21 insertions, 105 deletions
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index d266285ea0f..8340ec6d69d 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.19 1999/06/02 16:14:53 christos Exp $ +# $NetBSD: Makefile,v 1.20 1999/06/25 02:41:14 hubertf Exp $ # FreeBSD Id: Makefile,v 1.19 1998/03/08 06:44:48 obrien Exp # -DISTNAME= lsof_4.43_W -PKGNAME= lsof-4.43 +DISTNAME= lsof_4.44_W +PKGNAME= lsof-4.44 WRKSRC= ${WRKDIR}/${SRCBALL_NAME} CATEGORIES= sysutils MASTER_SITES= ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/ \ diff --git a/sysutils/lsof/files/md5 b/sysutils/lsof/files/md5 index aa8325bc2a0..91380e3585c 100644 --- a/sysutils/lsof/files/md5 +++ b/sysutils/lsof/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.13 1999/06/02 16:14:53 christos Exp $ +$NetBSD: md5,v 1.14 1999/06/25 02:41:15 hubertf Exp $ -MD5 (lsof_4.43_W.tar.gz) = 4d5263b853c882a33f626be0a47c937d +MD5 (lsof_4.44_W.tar.gz) = 1c59e64f60421b18e28bb2c11ad84255 diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa deleted file mode 100644 index 146a21dedf1..00000000000 --- a/sysutils/lsof/patches/patch-aa +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-aa,v 1.9 1999/06/02 16:14:53 christos Exp $ - ---- Configure.orig Tue May 11 07:40:20 1999 -+++ Configure Mon May 3 11:53:20 1999 -@@ -1575,6 +1575,9 @@ - 1.4*) - LSOF_VERS="1030" - ;; -+ 1.4*) -+ LSOF_VERS="1040" -+ ;; - *) - echo Unknown NetBSD release: `uname -r` - echo Assuming NetBSD 1.0 -@@ -1668,7 +1671,13 @@ - if test $? -eq 0 # { - then - NETBSD_UVM="Y" -- fi # } -+ else -+ NETBSD_VM_FAULT=`nm /netbsd | grep 'vm_fault$' | cut -d " " -f 3` -+ case $NETBSD_VM_FAULT in # { -+ *uvm_fault) -+ NETBSD_UVM="Y";; -+ esac # } -+ fi # } - fi # } - if test "X$NETBSD_UVM" = "X" # { - then -@@ -3037,7 +3046,7 @@ - then - echo "AR= $LSOF_AR" >> ${LSOF_LIB}/$LSOF_LIBMKF - fi # } -- if test "X$LSOF_RANLIB" != "X" # { -+ if test "X$LSOF_TGT" = "Xsolaris" -o "X$LSOF_RANLIB" != "X" # { - then - echo "RANLIB= $LSOF_RANLIB" >> ${LSOF_LIB}/$LSOF_LIBMKF - fi # } diff --git a/sysutils/lsof/patches/patch-ac b/sysutils/lsof/patches/patch-ac index e5a596ef115..37b251ec8b8 100644 --- a/sysutils/lsof/patches/patch-ac +++ b/sysutils/lsof/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.3 1999/06/02 16:14:53 christos Exp $ +$NetBSD: patch-ac,v 1.4 1999/06/25 02:41:15 hubertf Exp $ ---- dialects/n+obsd/dproc.c.orig Sun May 9 15:56:13 1999 -+++ dialects/n+obsd/dproc.c Mon May 3 12:03:10 1999 +--- dialects/n+obsd/dproc.c.orig Tue Jun 22 23:04:06 1999 ++++ dialects/n+obsd/dproc.c Fri Jun 25 04:13:10 1999 @@ -150,6 +150,9 @@ gather_proc_info() { @@ -12,70 +12,24 @@ $NetBSD: patch-ac,v 1.3 1999/06/02 16:14:53 christos Exp $ int i, nf; MALLOC_S nb; static struct file **ofb = NULL; -@@ -215,23 +218,53 @@ +@@ -231,6 +234,20 @@ (UID_ARG)uid, p->P_COMM, (int)pss, (int)sf); Plf = (struct lfile *)NULL; Kpa = (KA_T)p->P_ADDR; +#if __NetBSD_Version__ >= 104010000 -+ /* -+ * Save current working directory framework information. -+ */ -+ (void)memset(&cwdi, 0, sizeof(cwdi)); -+ if (p->kp_proc.p_cwdi) { -+ if (kvm_read(Kd, (u_long)p->kp_proc.p_cwdi, &cwdi, sizeof(cwdi)) -+ != sizeof(cwdi)) { -+ fprintf(stderr, "%s: cannot read cwdinfo: %s\n", Pn, -+ kvm_geterr(Kd)); -+ Exit(1); -+ } -+ } ++ /* ++ * Save current working directory framework information. ++ */ ++ (void)memset(&cwdi, 0, sizeof(cwdi)); ++ if (p->kp_proc.p_cwdi) { ++ if (kvm_read(Kd, (u_long)p->kp_proc.p_cwdi, &cwdi, sizeof(cwdi)) ++ != sizeof(cwdi)) { ++ fprintf(stderr, "%s: cannot read cwdinfo: %s\n", Pn, ++ kvm_geterr(Kd)); ++ Exit(1); ++ } ++ } +#endif /* * Save current working directory information. */ -+#if __NetBSD_Version__ >= 104010000 -+ if (cwdi.cwdi_cdir) { -+#else - if (fd.fd_cdir) { -+#endif - alloc_lfile(CWD, -1); - Cfp = (struct file *)NULL; -+#if __NetBSD_Version__ >= 104010000 -+ process_node((KA_T)cwdi.cwdi_cdir); -+#else - process_node((KA_T)fd.fd_cdir); -+#endif - if (Lf->sf) - link_lfile(); - } - /* - * Save root directory information. - */ -+#if __NetBSD_Version__ >= 104010000 -+ if (cwdi.cwdi_rdir) { -+#else - if (fd.fd_rdir) { -+#endif - alloc_lfile(RTD, -1); - Cfp = (struct file *)NULL; -+#if __NetBSD_Version__ >= 104010000 -+ process_node((KA_T)cwdi.cwdi_rdir); -+#else - process_node((KA_T)fd.fd_rdir); -+#endif - if (Lf->sf) - link_lfile(); - } -@@ -422,11 +455,11 @@ - int i, j; - KA_T ka; - int n = 0; -- struct pager_struct pg; - struct vm_map_entry vmme, *e; - struct vmspace vmsp; - - #if !defined(UVM) -+ struct pager_struct pg; - struct vm_object vmo; - #endif /* !defined(UVM) */ - |