From ba48bb444f33c3e3ce9aabdf346d6aabadf4ea7c Mon Sep 17 00:00:00 2001
From: Stanislav Sedov <stas@FreeBSD.org>
Date: Sun, 7 Jun 2009 09:01:13 +0000
Subject: - Fix on current.

---
 sysutils/fuser/Makefile                     |  6 +++---
 sysutils/fuser/files/extra::patch-msdosfs.c | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 sysutils/fuser/files/extra::patch-msdosfs.c

(limited to 'sysutils/fuser')

diff --git a/sysutils/fuser/Makefile b/sysutils/fuser/Makefile
index af490e2cef0e..1379da6dfbe9 100644
--- a/sysutils/fuser/Makefile
+++ b/sysutils/fuser/Makefile
@@ -24,13 +24,13 @@ PLIST_FILES=	bin/fuser
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 800066
-BROKEN=		does not build
-.endif
 .if (${OSVERSION} > 800000)
 EXTRA_PATCHES+=	${FILESDIR}/extra::patch-fuser.c \
 		${FILESDIR}/extra::patch-fuser.h
 .endif
+.if ${OSVERSION} >= 800066
+EXTRA_PATCHES+=	${FILESDIR}/extra::patch-msdosfs.c
+.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
diff --git a/sysutils/fuser/files/extra::patch-msdosfs.c b/sysutils/fuser/files/extra::patch-msdosfs.c
new file mode 100644
index 000000000000..1cf9268ff476
--- /dev/null
+++ b/sysutils/fuser/files/extra::patch-msdosfs.c
@@ -0,0 +1,25 @@
+--- msdosfs.c.orig	2009-06-07 12:53:34.000000000 +0400
++++ msdosfs.c	2009-06-07 12:57:41.000000000 +0400
+@@ -72,6 +72,7 @@
+ 	struct denode		denode;
+ 	u_long			dirsperblk;
+ 	struct msdosfsmount	mnt;
++	struct vnode		devvp;
+ 	int			fileid;
+ 	int			ret;
+ 
+@@ -90,7 +91,13 @@
+ 		return 1;
+ 	}
+ 
+-	fsp->dev = dev2udev(denode.de_dev);
++	ret = KVM_READ(kd, mnt.pm_devvp, &devvp, sizeof(devvp));
++	if (ret != sizeof(devvp)) {
++		warnx("can't read vnode info at %p\n", (void *)mnt.pm_devvp);
++		return 1;
++	}
++
++	fsp->dev = dev2udev(devvp.v_rdev);
+ 
+ 	/*
+ 	 * XXX -
-- 
cgit v1.2.3