5 files changed, 30 insertions, 47 deletions

diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 7523a1b7fdf8..528ace948e86 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -14,8 +14,8 @@ DISTNAME=		open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
 MAINTAINER=		mbr@freebsd.org
 COMMENT?=		Open VMware tools for FreeBSD VMware guests
 
-RELEASE_DATE=		2009.02.18
-BUILD_VER=		148847
+RELEASE_DATE=		2009.03.18
+BUILD_VER=		154848
 
 GNU_CONFIGURE=		yes
 USE_LDCONFIG=		yes
diff --git a/emulators/open-vm-tools/distinfo b/emulators/open-vm-tools/distinfo
index efe005c41f64..68b4a3c88239 100644
--- a/emulators/open-vm-tools/distinfo
+++ b/emulators/open-vm-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (open-vm-tools-2009.02.18-148847.tar.gz) = 6e473ebdf29f1b15388149bc2fde6941
-SHA256 (open-vm-tools-2009.02.18-148847.tar.gz) = 10c082b629921356b885cc287ca80d4d50d695431b8e1f0898e0f0abb95ad89a
-SIZE (open-vm-tools-2009.02.18-148847.tar.gz) = 3976037
+MD5 (open-vm-tools-2009.03.18-154848.tar.gz) = 23d577a1bc07fa61bcd5352e94f05ed6
+SHA256 (open-vm-tools-2009.03.18-154848.tar.gz) = 6c9d06dee94c04214526f439599ed42064d6cee62125791f7c9c07d60f09cd57
+SIZE (open-vm-tools-2009.03.18-154848.tar.gz) = 3964960
diff --git a/emulators/open-vm-tools/files/patch-freebsd-8 b/emulators/open-vm-tools/files/patch-freebsd-8
index fc11422386a0..a729f67bc55e 100644
--- a/emulators/open-vm-tools/files/patch-freebsd-8
+++ b/emulators/open-vm-tools/files/patch-freebsd-8
@@ -26,21 +26,22 @@
     HgfsAccessMode accessMode = 0;
     Bool isDir = vp->v_type == VDIR;
     if (mode & VREAD) {
---- modules/freebsd/vmblock/vnops.c.orig	2009-02-28 23:21:43.000000000 +0100
-+++ modules/freebsd/vmblock/vnops.c	2009-02-28 23:26:23.000000000 +0100
-@@ -723,7 +723,11 @@
+--- modules/freebsd/vmblock/vnops.c.orig	2009-03-18 03:03:21.000000000 -0400
++++ modules/freebsd/vmblock/vnops.c	2009-04-04 20:33:28.000000000 -0400
+@@ -726,7 +726,11 @@
         * NB:  Allowing only the superuser to open this directory breaks
         *      readdir() of the filesystem root for non-privileged users.
         */
-+#if __FreeBSD_version >= 800001
-+      if ((retval = priv_check(ap->a_td, PRIV_VFS_GETFH)) == 0) {
-+#else
-       if ((retval = suser(ap->a_td)) == 0) {
-+#endif
- #if __FreeBSD_version >= 700000
+-      if ((retval = suser(ap->a_td)) == 0) {
++ #if __FreeBSD_version >= 800001
++       if ((retval = priv_check(ap->a_td, PRIV_VFS_GETFH)) == 0) {
++ #else
++        if ((retval = suser(ap->a_td)) == 0) {
++ #endif
+ #if __FreeBSD_version >= 700055
           fp = ap->a_fp;
  #else
-@@ -1007,7 +1011,11 @@
+@@ -1010,7 +1014,11 @@
  */
  {
     struct vnode *vp = ap->a_vp;
diff --git a/emulators/open-vm-tools/files/patch-guestd-Makefile b/emulators/open-vm-tools/files/patch-guestd-Makefile
deleted file mode 100644
index c51af040cc96..000000000000
--- a/emulators/open-vm-tools/files/patch-guestd-Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- guestd/Makefile.am.orig	2009-02-28 20:32:39.000000000 +0100
-+++ guestd/Makefile.am	2009-02-28 20:33:09.000000000 +0100
-@@ -104,8 +104,8 @@
- endif LINUX
- 
- install-exec-hook:
--	$(INSTALL) -d $(DESTDIR)/etc/vmware-tools
--	echo 'disable-tools-version = "true"' > $(DESTDIR)/etc/vmware-tools/tools.conf
-+	$(INSTALL) -d $(prefix)/etc/vmware-tools
-+	echo 'disable-tools-version = "true"' > $(prefix)/etc/vmware-tools/tools.conf
- 
- uninstall-hook:
--	rm -rf $(DESTDIR)/etc/vmware-tools
-+	rm -rf $(prefix)/etc/vmware-tools
---- guestd/Makefile.in.orig	2009-02-28 20:43:51.000000000 +0100
-+++ guestd/Makefile.in	2009-02-28 20:44:45.000000000 +0100
-@@ -667,11 +667,11 @@
- 
- 
- install-exec-hook:
--	$(INSTALL) -d $(DESTDIR)/etc/vmware-tools
--	echo 'disable-tools-version = "true"' > $(DESTDIR)/etc/vmware-tools/tools.conf
-+	$(INSTALL) -d $(prefix)/etc/vmware-tools
-+	echo 'disable-tools-version = "true"' > $(prefix)/etc/vmware-tools/tools.conf
- 
- uninstall-hook:
--	rm -rf $(DESTDIR)/etc/vmware-tools
-+	rm -rf $(prefix)/etc/vmware-tools
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/emulators/open-vm-tools/files/patch-vmblock-subr.c b/emulators/open-vm-tools/files/patch-vmblock-subr.c
index ac640b1520ae..0474a83699bf 100644
--- a/emulators/open-vm-tools/files/patch-vmblock-subr.c
+++ b/emulators/open-vm-tools/files/patch-vmblock-subr.c
@@ -1,6 +1,19 @@
 --- modules/freebsd/vmblock/subr.c.orig	2009-02-28 23:04:14.000000000 +0100
 +++ modules/freebsd/vmblock/subr.c	2009-02-28 23:05:38.000000000 +0100
-@@ -372,6 +372,13 @@
+@@ -334,7 +334,12 @@
+    vp->v_vnlock = &vp->v_lock;
+    FREE(xp, M_VMBLOCKFSNODE);
+    vp->v_op = &dead_vnodeops;
++
++#if __FreeBSD_version >= 800011
++   (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
++#else
+    (void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread);
++#endif
+    vgone(vp);
+    vput(vp);
+ }
+@@ -405,6 +410,13 @@
        return error;
     }