Build bin/vmhgfs-fuse and bin/vmware-vmblock-fuse

Please note that you need -CURRENT to actually use these filesystems. They still build on older systems but fail to run.

8 files changed, 142 insertions, 7 deletions

diff --git a/sysutils/open-vm-tools/MESSAGE.x11 b/sysutils/open-vm-tools/MESSAGE.x11
new file mode 100644
index 00000000000..3e7551016fc
--- /dev/null
+++ b/sysutils/open-vm-tools/MESSAGE.x11
@@ -0,0 +1,14 @@
+===========================================================================
+$NetBSD: MESSAGE.x11,v 1.1 2016/11/21 00:14:16 pho Exp $
+
+You need to mount the vmblock file system in order to enable the clipboard
+synchronization and drag and drop support:
+
+    # mkdir /var/run/vmblock-fuse
+    # vmware-vmblock-fuse /var/run/vmblock-fuse
+
+Then start vmware-user-suid-wrapper in your .xinitrc:
+
+    % vmware-user-suid-wrapper
+
+===========================================================================
diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index 7ec13b0e598..3df1d43ad21 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.62 2016/10/17 20:55:49 ryoon Exp $
+# $NetBSD: Makefile,v 1.63 2016/11/21 00:14:16 pho Exp $
 
 DISTNAME=	open-vm-tools-10.0.7-3227872
 PKGNAME=	open-vm-tools-10.0.7
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	https://github.com/vmware/open-vm-tools/files/133266/
 
@@ -60,6 +60,7 @@ CWRAPPERS_APPEND.cc+=	-Wno-error=unused-local-typedefs -Wno-error=unused-but-set
 
 .include "../../archivers/libmspack/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../mk/fuse.buildlink3.mk"
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/xml-security-c/buildlink3.mk"
diff --git a/sysutils/open-vm-tools/PLIST.common b/sysutils/open-vm-tools/PLIST.common
index 9b497086897..1f99692e814 100644
--- a/sysutils/open-vm-tools/PLIST.common
+++ b/sysutils/open-vm-tools/PLIST.common
@@ -1,10 +1,12 @@
-@comment $NetBSD: PLIST.common,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2016/11/21 00:14:16 pho Exp $
+bin/vmhgfs-fuse
 bin/vmtoolsd
 bin/vmware-checkvm
 bin/vmware-hgfsclient
 bin/vmware-namespace-cmd
 bin/vmware-rpctool
 bin/vmware-toolbox-cmd
+bin/vmware-vmblock-fuse
 bin/vmware-xferlogs
 include/libDeployPkg/guestcust-events.h
 include/libDeployPkg/imgcust-api.h
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index 588b778c096..c0d7febed0f 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2016/10/17 20:55:49 ryoon Exp $
+$NetBSD: distinfo,v 1.16 2016/11/21 00:14:16 pho Exp $
 
 SHA1 (open-vm-tools-10.0.7-3227872.tar.gz) = cd22a3d79d68de46647e8add78bcaf829bb0598d
 RMD160 (open-vm-tools-10.0.7-3227872.tar.gz) = df8cfa62ffd0fbba0432cb0deac0f202b2278625
@@ -27,7 +27,7 @@ SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
 SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a
 SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e
 SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
-SHA1 (patch-configure.ac) = cf2c2bb8526ee4916a1a81059b9b776cec97b877
+SHA1 (patch-configure.ac) = 1a8422cdca984b32c0d9e4fa926a92fa3b9178ba
 SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af
 SHA1 (patch-libDeployPkg_processPosix.c) = 9f62110eb903eec85e51d8e579abc3d36e54fe7e
 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
@@ -53,3 +53,5 @@ SHA1 (patch-vgauth_common_VGAuthLog.c) = 9beacc4665fb6133059279be2594892ebb6ba5d
 SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532
 SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768
 SHA1 (patch-vmblockmounter_vmblockmounter.c) = 4287303b188f4df7a2785fe72bbab820e33d6a07
+SHA1 (patch-vmhgfs-fuse_config.c) = d14e2c585a7c5716ea9dd4b60ef1411d299282ae
+SHA1 (patch-vmhgfs-fuse_fsutil.h) = 9233e5612a1f22ab4b43b04cfca5f0f7d120bc21
diff --git a/sysutils/open-vm-tools/options.mk b/sysutils/open-vm-tools/options.mk
index a7011ffa245..8f6e1408523 100644
--- a/sysutils/open-vm-tools/options.mk
+++ b/sysutils/open-vm-tools/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+# $NetBSD: options.mk,v 1.4 2016/11/21 00:14:16 pho Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.open-vm-tools
 PKG_SUPPORTED_OPTIONS=	x11
@@ -8,6 +8,7 @@ PKG_SUGGESTED_OPTIONS=	x11
 
 .if !empty(PKG_OPTIONS:Mx11)
 PLIST_SRC+=	PLIST.x11
+MESSAGE_SRC+=	MESSAGE.x11
 .  include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
 .  include "../../x11/gtkmm/buildlink3.mk"
 .  include "../../sysutils/desktop-file-utils/desktopdb.mk"
diff --git a/sysutils/open-vm-tools/patches/patch-configure.ac b/sysutils/open-vm-tools/patches/patch-configure.ac
index 988d1df7fe3..8a990207c73 100644
--- a/sysutils/open-vm-tools/patches/patch-configure.ac
+++ b/sysutils/open-vm-tools/patches/patch-configure.ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.2 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.3 2016/11/21 00:14:16 pho Exp $
 
 --- configure.ac.orig	2016-02-16 20:06:45.000000000 +0000
 +++ configure.ac
@@ -12,6 +12,15 @@ $NetBSD: patch-configure.ac,v 1.2 2016/10/09 03:41:56 ryoon Exp $
     [*])
        AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.])
        ;;
+@@ -374,7 +377,7 @@ AC_VMW_CHECK_LIB([fuse],
+                  [],
+                  [],
+                  [fuse.h],
+-                 [fuse_main],
++                 [fuse_exit],
+                  [have_fuse=yes],
+                  [have_fuse=no;
+                   AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])])
 @@ -1064,6 +1067,15 @@ if test "$os" = "linux"; then
     buildHgfsmounter=yes
  fi
diff --git a/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c b/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c
new file mode 100644
index 00000000000..dc6fdcd7541
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_config.c
@@ -0,0 +1,91 @@
+$NetBSD: patch-vmhgfs-fuse_config.c,v 1.1 2016/11/21 00:14:16 pho Exp $
+
+* The original SysCompatCheck() only works on Linux.
+* librefuse doesn't support the old style -ho option.
+
+--- vmhgfs-fuse/config.c.orig	2016-02-16 20:06:49.000000000 +0000
++++ vmhgfs-fuse/config.c
+@@ -23,6 +23,7 @@
+ 
+ #include "module.h"
+ #include <sys/utsname.h>
++#include <sys/stat.h>
+ 
+ #ifdef VMX86_DEVEL
+ int LOGLEVEL_THRESHOLD = 4;
+@@ -136,6 +137,7 @@ Usage(char *prog_name)  // IN
+ #define PROC_FILESYSTEMS       "/proc/filesystems"
+ #define FUSER_KERNEL_FS        "fuse"
+ 
++#if defined(__linuX__)
+ /*
+  *----------------------------------------------------------------------
+  *
+@@ -173,8 +175,9 @@ SysCompatFusermountCheck(void)  // IN:
+ 
+    return fusermountExists;
+ }
++#endif
+ 
+-
++#if defined(__linux__)
+ /*
+  *----------------------------------------------------------------------
+  *
+@@ -253,8 +256,9 @@ exit:
+    free(modulesDep);
+    return installedFuse;
+ }
++#endif
+ 
+-
++#if defined(__linux__)
+ /*
+  *----------------------------------------------------------------------
+  *
+@@ -307,7 +311,7 @@ exit:
+    }
+    return registeredFuse;
+ }
+-
++#endif
+ 
+ /*
+  *----------------------------------------------------------------------
+@@ -328,6 +332,7 @@ exit:
+  */
+ static HgfsSystemCompatibility
+ SysCompatCheck(char *prog_name)  // IN
++#if defined(__linux__)
+ {
+    struct utsname buf;
+    HgfsSystemCompatibility sysCompat = HGFS_SYSCOMPAT_OS_NOT_SUPPORTED;
+@@ -381,6 +386,17 @@ exit:
+            HgfsSystemCompatibilityMsg[sysCompat]);
+    return sysCompat;
+ }
++#elif defined(__NetBSD__)
++{
++   HgfsSystemCompatibility sysCompat = HGFS_SYSCOMPAT_FUSE_ENABLED;
++   struct stat st;
++
++   if (stat("/dev/puffs", &st) == -1)
++      sysCompat = HGFS_SYSCOMPAT_OS_NO_FUSE;
++
++   return sysCompat;
++}
++#endif
+ 
+ 
+ /*
+@@ -444,7 +460,9 @@ vmhgfsOptProc(void *data,               
+ 
+    case KEY_HELP:
+       Usage(outargs->argv[0]);
+-      fuse_opt_add_arg(outargs, "-ho");
++      fuse_opt_add_arg(outargs, "--help");
++      free(outargs->argv[0]);
++      outargs->argv[0] = strdup("");
+       fuse_main(outargs->argc, outargs->argv, NULL, NULL);
+       exit(1);
+ 
diff --git a/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_fsutil.h b/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_fsutil.h
new file mode 100644
index 00000000000..daeca6717ea
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-vmhgfs-fuse_fsutil.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-vmhgfs-fuse_fsutil.h,v 1.1 2016/11/21 00:14:16 pho Exp $
+
+loff_t needs to be typedef'ed on NetBSD too.
+
+--- vmhgfs-fuse/fsutil.h.orig	2016-02-16 20:06:49.000000000 +0000
++++ vmhgfs-fuse/fsutil.h
+@@ -32,7 +32,7 @@
+ #include "hgfsProto.h"
+ #include <fuse.h>
+ 
+-#if defined(__FreeBSD__) || defined(__SOLARIS__) || defined(__APPLE__)
++#if defined(__FreeBSD__) || defined(__SOLARIS__) || defined(__APPLE__) || defined(__NetBSD__)
+ typedef long long loff_t;
+ #endif
+