Update to 10.1.0

Changelog:
What's New

VMware Tools is a suite of utilities that enhances the performance of the virtual machine's guest operating system and improves management of the virtual machine. Read about the new and enhanced features in this release below:

    vmware-namespace-cmd: Added vmware-namespace-cmd command line utility that exposes set/get commands for the namespace database in the VMX.
    gtk3 support: open-vm-tools has been updated to use gtk3 libraries.
    Common Agent Framework (CAF): CAF provides the basic services necessary to simplify secure and efficient management of agents inside virtual machines.
    xmlsec1: Changed guest authentication to xmlsec1.
    FreeBSD: Changes to support open-vm-tools on FreeBSD.
    Automatic Linux Kernel Modules: Automatic rebuilding of kernel modules is enabled by default.
    New sub-command: Added a new sub-command to push updated network information to the host on demand.
    udev-rules: Added udev rules for configuring SCSI timeout in the guest.
    Ubuntu 16.10: Fixes for running on Ubuntu 16.10.
    Quiesced Snapshot: Fix for quiesced snapshot failure leaving guest file system quiesced.

Internationalization

open-vm-tools 10.1.0 supports the following languages:

    English
    French
    German
    Spanish
    Italian
    Japanese
    Korean
    Simplified Chinese
    Traditional Chinese

Compatibility

open-vm-tools 10.1.0 is compatible with all supported versions of VMware vSphere, VMware Workstation 12.5 and VMware Fusion 8.5.

12 files changed, 199 insertions, 234 deletions

diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index 5bab2875dd7..171c89088f4 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.64 2016/12/04 05:17:41 ryoon Exp $
+# $NetBSD: Makefile,v 1.65 2016/12/23 04:11:03 ryoon Exp $
 
-DISTNAME=	open-vm-tools-10.0.7-3227872
-PKGNAME=	open-vm-tools-10.0.7
-PKGREVISION=	5
+DISTNAME=	open-vm-tools-10.1.0-4449150
+PKGNAME=	open-vm-tools-10.1.0
 CATEGORIES=	sysutils
-MASTER_SITES=	https://github.com/vmware/open-vm-tools/files/133266/
+MASTER_SITES=	https://github.com/vmware/open-vm-tools/files/590760/
 
 MAINTAINER=	agc@NetBSD.org
 HOMEPAGE=	https://github.com/vmware/open-vm-tools
@@ -13,6 +12,8 @@ LICENSE=	gnu-lgpl-v2.1
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64
 
+WRKSRC=		${WRKDIR}/${DISTNAME}/open-vm-tools
+
 GCC_REQD+=	4.8
 CXXFLAGS+=	-std=gnu++11
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-Werror
@@ -42,8 +43,9 @@ RCD_SCRIPTS=			vmtools
 
 SUBST_CLASSES+=			fix-etc-path
 SUBST_STAGE.fix-etc-path=	pre-configure
-SUBST_MESSAGE.fix-etc-path=	Fixing /etc to ${PREFIX}/etc
+SUBST_MESSAGE.fix-etc-path=	Fixing PREFIX
 SUBST_FILES.fix-etc-path+=	lib/guestApp/guestApp.c
+SUBST_FILES.fix-etc-path+=	lib/procMgr/procMgrPosix.c
 SUBST_VARS.fix-etc-path+=	PREFIX
 
 pre-configure:
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index 220cc2ec1b8..3091023031c 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2016/12/16 00:04:03 joerg Exp $
+$NetBSD: distinfo,v 1.19 2016/12/23 04:11:03 ryoon Exp $
 
-SHA1 (open-vm-tools-10.0.7-3227872.tar.gz) = cd22a3d79d68de46647e8add78bcaf829bb0598d
-RMD160 (open-vm-tools-10.0.7-3227872.tar.gz) = df8cfa62ffd0fbba0432cb0deac0f202b2278625
-SHA512 (open-vm-tools-10.0.7-3227872.tar.gz) = 5838c971a41540cb54ddf83400d2b728bae3245765b6e7d80e7f4be4035308f045ea4a735abafb2a7accbd90c6fe4c381dabd102a98be08a7ee08feab03bfa8b
-Size (open-vm-tools-10.0.7-3227872.tar.gz) = 4009790 bytes
+SHA1 (open-vm-tools-10.1.0-4449150.tar.gz) = ed888568783eb8720d862314fee05c16b2381481
+RMD160 (open-vm-tools-10.1.0-4449150.tar.gz) = f18840f835ec030f72c55713fd7140396253aae5
+SHA512 (open-vm-tools-10.1.0-4449150.tar.gz) = 455e570fc13334e85a946e7eb496baebc459c138760c0c4c206b2182ebbb2e8b00b1025bafc284c163ffa1ffab7ab8566073ccd13b34bf5e8ef32addad9a4639
+Size (open-vm-tools-10.1.0-4449150.tar.gz) = 5025787 bytes
 SHA1 (patch-ag) = 67ce2bcba5cfcbd48f4d2345d5529329424952b3
 SHA1 (patch-ah) = bdee6d92cdfe64f1ab513876ccd9d01f6fda6882
 SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
@@ -22,20 +22,19 @@ SHA1 (patch-bb) = e22d082689016d81add208e1d3b31d9d897d36e8
 SHA1 (patch-bc) = c2f316cd9035648676fd9d0d7e40fc7f6bf5c8d4
 SHA1 (patch-bd) = eacc267fad7021a96ee435e8fc41c82fb49d9c5f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
-SHA1 (patch-bf) = e902ad24ed7e9616aa57d07cd3485ba3870ba51b
+SHA1 (patch-bf) = 705b0eb11296e5563af9167dc2bc3ba13dec645a
 SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
 SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a
 SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e
 SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
 SHA1 (patch-configure.ac) = 1a8422cdca984b32c0d9e4fa926a92fa3b9178ba
 SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af
-SHA1 (patch-libDeployPkg_processPosix.c) = 9f62110eb903eec85e51d8e579abc3d36e54fe7e
+SHA1 (patch-libDeployPkg_processPosix.c) = 4b7688d44f1ca8dcd40076391dc0fb9a627bfebe
 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
 SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab
-SHA1 (patch-lib_guestApp_guestApp.c) = 2348c1b4b8c103fa29ac5962deaa0a3dcfe199a2
+SHA1 (patch-lib_guestApp_guestApp.c) = ed916ad0726b8d992319828f8f3a4115d7aba753
 SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863
 SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4
-SHA1 (patch-lib_hgfs_hgfsUtil.c) = 473bc65ceccad16d3d2ce726dd5544d581cb30a8
 SHA1 (patch-lib_include_sigPosixRegs.h) = 634e12414f004671c1b2855764970e5d16ef4ef8
 SHA1 (patch-lib_include_vmblock__user.h) = 05ed8a0cdd481b759643ea47e27ef6e223a835d8
 SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968
@@ -43,13 +42,13 @@ SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624
 SHA1 (patch-lib_misc_hostinfoPosix.c) = 4daea6167cee2be57cc3acc0caa710ca940d1eb7
 SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
 SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 0f44134e1e256a46b5ce35fff91d0568649c1bad
+SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 34602bb8a34a930e487ae594137eacda804c3fe0
 SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b
+SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e
 SHA1 (patch-scripts_Makefile.am) = 5238c5cabf1125f9cd334349e5f67f1b7a568428
-SHA1 (patch-scripts_netbsd_network) = cf4c47e337b0d1f8bba3d4e87678924f85dd635e
-SHA1 (patch-services_plugins_dndcp_copyPasteUIX11.cpp) = 2027b2eb49a1c83ed7bedd1e195f9f3b4a323cbc
-SHA1 (patch-services_plugins_dndcp_dndUIX11.cpp) = 43107436e7bed9aa32786af42ba5fd0abd7c3337
+SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
 SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = 61acce40961ac82b48e055c159efd0c3b7a8899c
-SHA1 (patch-services_plugins_timeSync_Makefile.am) = 45a9c9044f1e4274c173d822a74dfc63bde0f5e9
+SHA1 (patch-services_plugins_timeSync_Makefile.am) = c92d64573e7c5718e955d32991c8951ea2408d43
 SHA1 (patch-services_vmtoolsd_Makefile.am) = 8a34599f5bd9722333de1ecf741a27a0636104c5
 SHA1 (patch-vgauth_common_VGAuthLog.c) = 9beacc4665fb6133059279be2594892ebb6ba5d9
 SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532
diff --git a/sysutils/open-vm-tools/patches/patch-bf b/sysutils/open-vm-tools/patches/patch-bf
index 22f0555d1d3..474f3ce6978 100644
--- a/sysutils/open-vm-tools/patches/patch-bf
+++ b/sysutils/open-vm-tools/patches/patch-bf
@@ -1,6 +1,6 @@
-$NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
+$NetBSD: patch-bf,v 1.5 2016/12/23 04:11:03 ryoon Exp $
 
---- lib/procMgr/procMgrPosix.c.orig	2016-02-16 20:06:46.000000000 +0000
+--- lib/procMgr/procMgrPosix.c.orig	2016-09-29 10:07:22.000000000 +0000
 +++ lib/procMgr/procMgrPosix.c
 @@ -27,7 +27,7 @@
  // pull in setresuid()/setresgid() if possible
@@ -27,7 +27,16 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
  #include <kvm.h>
  #include <limits.h>
  #include <paths.h>
-@@ -633,7 +633,7 @@ abort:
+@@ -136,7 +136,7 @@ Bool ProcMgr_PromoteEffectiveToReal(void
+ #ifdef sun
+ #define  BASH_PATH "/usr/bin/bash"
+ #else
+-#define  BASH_PATH "/bin/bash"
++#define  BASH_PATH "@PREFIX@/bin/bash"
+ #endif
+ 
+ 
+@@ -607,7 +607,7 @@ abort:
   *----------------------------------------------------------------------
   */
  
@@ -36,7 +45,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
  ProcMgrProcInfoArray *
  ProcMgr_ListProcesses(void)
  {
-@@ -641,7 +641,11 @@ ProcMgr_ListProcesses(void)
+@@ -615,7 +615,11 @@ ProcMgr_ListProcesses(void)
     ProcMgrProcInfo procInfo;
     Bool failed = TRUE;
     static kvm_t *kd;
@@ -48,7 +57,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
     char errbuf[_POSIX2_LINE_MAX];
     int i;
     int nentries=-1;
-@@ -664,7 +668,12 @@ ProcMgr_ListProcesses(void)
+@@ -638,7 +642,12 @@ ProcMgr_ListProcesses(void)
     /*
      * Get the list of process info structs
      */
@@ -61,7 +70,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
     if (kp == NULL || nentries <= 0) {
        Warning("%s: failed to get proc infos with error: %s\n",
                __FUNCTION__, kvm_geterr(kd));
-@@ -692,14 +701,26 @@ ProcMgr_ListProcesses(void)
+@@ -666,14 +675,26 @@ ProcMgr_ListProcesses(void)
        /*
         * Store the pid of the process.
         */
@@ -88,7 +97,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
                             : Unicode_Alloc(pwd->pw_name, STRING_ENCODING_DEFAULT);
  
        /*
-@@ -707,15 +728,24 @@ ProcMgr_ListProcesses(void)
+@@ -681,15 +702,24 @@ ProcMgr_ListProcesses(void)
         * maximum allowed size, then we can save it right now. Else we shall
         * need to try and parse it from the entire command line.
         */
@@ -113,7 +122,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
        if (cmdLineTemp != NULL) {
           /*
            * Flatten the argument list to get cmd & all params.
-@@ -771,9 +801,15 @@ ProcMgr_ListProcesses(void)
+@@ -745,9 +775,15 @@ ProcMgr_ListProcesses(void)
           procInfo.procCmdLine = DynBuf_Detach(&dbuf);
           DynBuf_Destroy(&dbuf);
        } else {
@@ -129,7 +138,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
              cmdNameLookup = FALSE;
           }
        }
-@@ -781,7 +817,11 @@ ProcMgr_ListProcesses(void)
+@@ -755,7 +791,11 @@ ProcMgr_ListProcesses(void)
        /*
         * Store the start time of the process
         */
@@ -141,7 +150,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
  
        /*
         * Store the process info pointer into a list buffer.
-@@ -811,7 +851,7 @@ abort:
+@@ -785,7 +825,7 @@ abort:
  
     return procList;
  }
@@ -150,7 +159,7 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
  
  
  #if defined(__APPLE__)
-@@ -2033,7 +2073,7 @@ ProcMgr_Free(ProcMgr_AsyncProc *asyncPro
+@@ -2022,7 +2062,7 @@ ProcMgr_Free(ProcMgr_AsyncProc *asyncPro
     free(asyncProc);
  }
  
@@ -159,39 +168,39 @@ $NetBSD: patch-bf,v 1.4 2016/10/13 21:48:26 ryoon Exp $
  
  /*
   *----------------------------------------------------------------------
-@@ -2106,7 +2146,7 @@ ProcMgr_ImpersonateUserStart(const char 
+@@ -2104,7 +2144,7 @@ ProcMgr_ImpersonateUserStart(const char 
     // first change group
  #if defined(USERWORLD)
     ret = Id_SetREGid(ppw->pw_gid, ppw->pw_gid);
 -#elif defined(__APPLE__)
 +#elif defined(__APPLE__) || defined(__NetBSD__)
-    ret = setregid(ppw->pw_gid, ppw->pw_gid);
+    ret = setegid(ppw->pw_gid);
  #else
     ret = setresgid(ppw->pw_gid, ppw->pw_gid, root_gid);
-@@ -2125,7 +2165,7 @@ ProcMgr_ImpersonateUserStart(const char 
+@@ -2123,7 +2163,7 @@ ProcMgr_ImpersonateUserStart(const char 
     // now user
  #if defined(USERWORLD)
     ret = Id_SetREUid(ppw->pw_uid, ppw->pw_uid);
 -#elif defined(__APPLE__)
 +#elif defined(__APPLE__) || defined(__NetBSD__)
-    ret = setreuid(ppw->pw_uid, ppw->pw_uid);
+    ret = seteuid(ppw->pw_uid);
  #else
     ret = setresuid(ppw->pw_uid, ppw->pw_uid, 0);
-@@ -2187,7 +2227,7 @@ ProcMgr_ImpersonateUserStop(void)
+@@ -2185,7 +2225,7 @@ ProcMgr_ImpersonateUserStop(void)
     // first change back user
  #if defined(USERWORLD)
     ret = Id_SetREUid(ppw->pw_uid, ppw->pw_uid);
 -#elif defined(__APPLE__)
 +#elif defined(__APPLE__) || defined(__NetBSD__)
-    ret = setreuid(ppw->pw_uid, ppw->pw_uid);
+    ret = seteuid(ppw->pw_uid);
  #else
     ret = setresuid(ppw->pw_uid, ppw->pw_uid, 0);
-@@ -2200,7 +2240,7 @@ ProcMgr_ImpersonateUserStop(void)
+@@ -2198,7 +2238,7 @@ ProcMgr_ImpersonateUserStop(void)
     // now group
  #if defined(USERWORLD)
     ret = Id_SetREGid(ppw->pw_gid, ppw->pw_gid);
 -#elif defined(__APPLE__)
 +#elif defined(__APPLE__) || defined(__NetBSD__)
-    ret = setregid(ppw->pw_gid, ppw->pw_gid);
+    ret = setegid(ppw->pw_gid);
  #else
     ret = setresgid(ppw->pw_gid, ppw->pw_gid, ppw->pw_gid);
diff --git a/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c b/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c
index 4ecd6d36f8c..8b8ccdb476e 100644
--- a/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c
+++ b/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c
@@ -1,12 +1,12 @@
-$NetBSD: patch-libDeployPkg_processPosix.c,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-libDeployPkg_processPosix.c,v 1.2 2016/12/23 04:11:03 ryoon Exp $
 
---- libDeployPkg/processPosix.c.orig	2016-02-16 20:06:47.000000000 +0000
+--- libDeployPkg/processPosix.c.orig	2016-09-29 10:05:27.000000000 +0000
 +++ libDeployPkg/processPosix.c
-@@ -22,6 +22,7 @@
+@@ -28,6 +28,7 @@
  #include <unistd.h>
  #include <fcntl.h>
  #include <sys/wait.h>
 +#include <signal.h>
  
- // vmware headers
  #include "util.h"
+ 
diff --git a/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c b/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c
index 3e21b3ead6d..2aff385a364 100644
--- a/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c
+++ b/sysutils/open-vm-tools/patches/patch-lib_guestApp_guestApp.c
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_guestApp_guestApp.c,v 1.1 2016/10/17 20:55:49 ryoon Exp $
+$NetBSD: patch-lib_guestApp_guestApp.c,v 1.2 2016/12/23 04:11:03 ryoon Exp $
 
 * Fix pkgsrc powerops scripts location
 
---- lib/guestApp/guestApp.c.orig	2016-02-16 20:06:45.000000000 +0000
+--- lib/guestApp/guestApp.c.orig	2016-09-29 10:07:22.000000000 +0000
 +++ lib/guestApp/guestApp.c
 @@ -63,7 +63,7 @@
  #elif defined __APPLE__
diff --git a/sysutils/open-vm-tools/patches/patch-lib_hgfs_hgfsUtil.c b/sysutils/open-vm-tools/patches/patch-lib_hgfs_hgfsUtil.c
deleted file mode 100644
index 46ea0037058..00000000000
--- a/sysutils/open-vm-tools/patches/patch-lib_hgfs_hgfsUtil.c
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-lib_hgfs_hgfsUtil.c,v 1.1 2016/10/17 20:55:49 ryoon Exp $
-
-* Fix NetBSD/i386 build
-
---- lib/hgfs/hgfsUtil.c.orig	2016-02-16 20:06:45.000000000 +0000
-+++ lib/hgfs/hgfsUtil.c
-@@ -109,7 +109,7 @@ int
- HgfsConvertFromNtTimeNsec(struct timespec *unixTime, // OUT: Time in UNIX format
- 			  uint64 ntTime) // IN: Time in Windows NT format
- {
--#if !defined(VM_X86_64) && !defined(__arm__)
-+#if !defined(VM_X86_64) && !defined(__arm__) && !defined(__NetBSD__)
-    uint32 sec;
-    uint32 nsec;
- 
-@@ -134,7 +134,7 @@ HgfsConvertFromNtTimeNsec(struct timespe
-       return -1;
-    }
- 
--#if !defined(VM_X86_64) && !defined(__arm__)
-+#if !defined(VM_X86_64) && !defined(__arm__) && !defined(__NetBSD__)
-    Div643232(ntTime - UNIX_EPOCH, 10000000, &sec, &nsec);
-    unixTime->tv_sec = sec;
-    unixTime->tv_nsec = nsec * 100;
diff --git a/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c b/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c
new file mode 100644
index 00000000000..b304d0ea501
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-lib_rpcChannel_rpcChannel.c,v 1.1 2016/12/23 04:11:03 ryoon Exp $
+
+--- lib/rpcChannel/rpcChannel.c.orig	2016-09-29 10:07:22.000000000 +0000
++++ lib/rpcChannel/rpcChannel.c
+@@ -272,7 +272,11 @@ RpcChannelXdrWrapper(RpcInData *data,
+          goto exit;
+       }
+ 
++#if defined(__NetBSD__)
++      if (!xdrProc(&xdrs, copy.result)) {
++#else
+       if (!xdrProc(&xdrs, copy.result, 0)) {
++#endif
+          ret = RPCIN_SETRETVALS(data, "XDR serialization failed.", FALSE);
+          DynXdr_Destroy(&xdrs, TRUE);
+          goto exit;
+@@ -330,7 +334,11 @@ RpcChannel_BuildXdrCommand(const char *c
+       goto exit;
+    }
+ 
++#if defined(__NetBSD__)
++   if (!proc(&xdrs, xdrData)) {
++#else
+    if (!proc(&xdrs, xdrData, 0)) {
++#endif
+       goto exit;
+    }
+ 
diff --git a/sysutils/open-vm-tools/patches/patch-network b/sysutils/open-vm-tools/patches/patch-network
new file mode 100644
index 00000000000..42cc50c9b56
--- /dev/null
+++ b/sysutils/open-vm-tools/patches/patch-network
@@ -0,0 +1,108 @@
+$NetBSD: patch-network,v 1.1 2016/12/23 04:11:03 ryoon Exp $
+
+--- network.orig	2016-12-17 20:35:10.558398448 +0000
++++ network
+@@ -0,0 +1,103 @@
++#!/bin/sh
++##########################################################
++# Copyright (C) 2010-2015 VMware, Inc. All rights reserved.
++#
++# This program is free software; you can redistribute it and/or modify it
++# under the terms of the GNU Lesser General Public License as published
++# by the Free Software Foundation version 2.1 and no later version.
++#
++# This program is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++# or FITNESS FOR A PARTICULAR PURPOSE.  See the Lesser GNU General Public
++# License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public License
++# along with this program; if not, write to the Free Software Foundation, Inc.,
++# 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA.
++#
++##########################################################
++
++##########################################################################
++# DO NOT modify this file directly as it will be overwritten the next
++# time the VMware Tools are installed.
++##########################################################################
++
++#
++# network (FreeBSD 6.3 and above)
++#
++# This script uses FreeBSD's rc(8) scripts to stop and restart networking
++# services in response to suspend and resume events, respectively.
++#
++
++
++echo `date` ": Executing '$0'"
++echo
++
++. `dirname "$0"`/../../statechange.subr
++
++
++#
++# ToggleNetwork --
++#
++#    Sources native configuration files in a subshell and executes native
++#    scripts to either start or stop networking services associated with
++#    a single interface.
++#
++# Results:
++#    See description above.
++#
++# Side effects:
++#    All side effects implied by FreeBSD's netif script.
++#
++
++ToggleNetwork() {
++   (
++      . /etc/rc.subr
++      . /etc/network.subr
++
++      load_rc_config network
++
++      for intf in `list_net_interfaces dhcp`; do
++         /etc/rc.d/netif $1 $intf
++         ec=$?
++
++         # Failure to stop an interface should not interfere with suspend.
++         if [ "$1" != "stop" ]; then
++            exitCode=`expr $exitCode \| $ec`
++         fi
++      done
++   )
++}
++
++
++#
++# main --
++#
++#    Main entry point.  Perform some sanity checking, then map state change
++#    events to relevant networking operations.
++#
++# Results:
++#    See comment at top of file.
++#
++
++main() {
++   exitCode=0
++
++   [ -r /etc/rc.subr ] || Panic "Cannot read /etc/rc.subr."
++   [ -r /etc/network.subr ] || Panic "Cannot read /etc/network.subr"
++   [ -x /etc/rc.d/netif ] || Panic "Cannot read /etc/rc.d/netif"
++
++   case "$1" in
++      suspend-vm)
++         ToggleNetwork stop
++         ;;
++      resume-vm)
++         ToggleNetwork start
++         ;;
++      *) ;;
++   esac
++
++   return $exitCode
++}
++
++main "$@"
diff --git a/sysutils/open-vm-tools/patches/patch-scripts_netbsd_network b/sysutils/open-vm-tools/patches/patch-scripts_netbsd_network
index a1f277db2f3..4c7117a23c3 100644
--- a/sysutils/open-vm-tools/patches/patch-scripts_netbsd_network
+++ b/sysutils/open-vm-tools/patches/patch-scripts_netbsd_network
@@ -1,11 +1,11 @@
-$NetBSD: patch-scripts_netbsd_network,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-scripts_netbsd_network,v 1.2 2016/12/23 04:11:03 ryoon Exp $
 
---- scripts/netbsd/network.orig	2016-10-04 11:37:34.038469430 +0000
+--- scripts/netbsd/network.orig	2016-12-17 20:49:31.242238289 +0000
 +++ scripts/netbsd/network
 @@ -0,0 +1,103 @@
 +#!/bin/sh
 +##########################################################
-+# Copyright (C) 2010-2015 VMware, Inc. All rights reserved.
++# Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
 +#
 +# This program is free software; you can redistribute it and/or modify it
 +# under the terms of the GNU Lesser General Public License as published
diff --git a/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_copyPasteUIX11.cpp b/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_copyPasteUIX11.cpp
deleted file mode 100644
index d9daa5eed7f..00000000000
--- a/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_copyPasteUIX11.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-$NetBSD: patch-services_plugins_dndcp_copyPasteUIX11.cpp,v 1.1 2016/12/16 00:04:03 joerg Exp $
-
-Avoid User-defined Literals in C++11.
-
---- services/plugins/dndcp/copyPasteUIX11.cpp.orig	2016-12-15 15:01:19.828851463 +0000
-+++ services/plugins/dndcp/copyPasteUIX11.cpp
-@@ -214,7 +214,7 @@ CopyPasteUIX11::~CopyPasteUIX11()
-        !mHGStagingDir.empty()) {
-       uint64 totalSize = File_GetSizeEx(mHGStagingDir.c_str());
-       if (mTotalFileSize != totalSize) {
--         g_debug("%s: deleting %s, expecting %"FMT64"d, finished %"FMT64"d\n",
-+         g_debug("%s: deleting %s, expecting %" FMT64 "d, finished %" FMT64 "d\n",
-                  __FUNCTION__, mHGStagingDir.c_str(),
-                  mTotalFileSize, totalSize);
-          DnD_DeleteStagingFiles(mHGStagingDir.c_str(), FALSE);
-@@ -552,7 +552,7 @@ CopyPasteUIX11::LocalGetTextOrRTFRequest
-          return;
-       }
- 
--      g_debug("%s: providing RTF data, size %"FMTSZ"u\n",
-+      g_debug("%s: providing RTF data, size %" FMTSZ "u\n",
-             __FUNCTION__, mHGRTFData.size());
- 
-       sd.set(target.c_str(), mHGRTFData.c_str());
-@@ -566,7 +566,7 @@ CopyPasteUIX11::LocalGetTextOrRTFRequest
-          g_debug("%s: Can not get valid text data\n", __FUNCTION__);
-          return;
-       }
--      g_debug("%s: providing plain text, size %"FMTSZ"u\n",
-+      g_debug("%s: providing plain text, size %" FMTSZ "u\n",
-             __FUNCTION__, mHGTextData.bytes());
- 
-       sd.set(target.c_str(), mHGTextData.c_str());
-@@ -743,7 +743,7 @@ again:
-           CPClipboard_SetItem(&mClipboard, CPFORMAT_IMG_PNG,
-                               buf, bufSize)) {
-          validDataInClip = true;
--         g_debug("%s: Got PNG: %"FMTSZ"u\n", __FUNCTION__, bufSize);
-+         g_debug("%s: Got PNG: %" FMTSZ "u\n", __FUNCTION__, bufSize);
-       } else {
-          g_debug("%s: Failed to get PNG\n", __FUNCTION__);
-       }
-@@ -796,7 +796,7 @@ again:
-           CPClipboard_SetItem(&mClipboard, CPFORMAT_TEXT,
-                               (const void *)str.data(), bufSize + 1)) {
-          validDataInClip = true;
--         g_debug("%s: Got TEXT: %"FMTSZ"u\n", __FUNCTION__, bufSize);
-+         g_debug("%s: Got TEXT: %" FMTSZ "u\n", __FUNCTION__, bufSize);
-       } else {
-          g_debug("%s: Failed to get TEXT\n", __FUNCTION__);
-       }
-@@ -1031,7 +1031,7 @@ CopyPasteUIX11::LocalGetSelectionFileLis
- 
-    DynBuf_Init(&buf);
-    fileList.SetFileSize(totalSize);
--   g_debug("%s: totalSize is %"FMT64"u\n", __FUNCTION__, totalSize);
-+   g_debug("%s: totalSize is %" FMT64 "u\n", __FUNCTION__, totalSize);
-    fileList.ToCPClipboard(&buf, false);
-    CPClipboard_SetItem(&mClipboard, CPFORMAT_FILELIST, DynBuf_Get(&buf),
-                        DynBuf_GetSize(&buf));
-@@ -1198,7 +1198,7 @@ CopyPasteUIX11::GetRemoteClipboardCB(con
-        * accept paste.
-        */
-       if (CPClipboard_GetItem(clip, CPFORMAT_RTF, &buf, &sz)) {
--         g_debug("%s: RTF data, size %"FMTSZ"u.\n", __FUNCTION__, sz);
-+         g_debug("%s: RTF data, size %" FMTSZ "u.\n", __FUNCTION__, sz);
-          Gtk::TargetEntry appRtf(TARGET_NAME_APPLICATION_RTF);
-          Gtk::TargetEntry textRtf(TARGET_NAME_TEXT_RICHTEXT);
- 
-@@ -1214,7 +1214,7 @@ CopyPasteUIX11::GetRemoteClipboardCB(con
-          Gtk::TargetEntry utf8Text(TARGET_NAME_UTF8_STRING);
-          Gtk::TargetEntry compountText(TARGET_NAME_COMPOUND_TEXT);
- 
--         g_debug("%s: Text data, size %"FMTSZ"u.\n", __FUNCTION__, sz);
-+         g_debug("%s: Text data, size %" FMTSZ "u.\n", __FUNCTION__, sz);
-          targets.push_back(stringText);
-          targets.push_back(plainText);
-          targets.push_back(utf8Text);
-@@ -1234,7 +1234,7 @@ CopyPasteUIX11::GetRemoteClipboardCB(con
-    }
- 
-    if (CPClipboard_GetItem(clip, CPFORMAT_IMG_PNG, &buf, &sz)) {
--      g_debug("%s: PNG data, size %"FMTSZ"u.\n", __FUNCTION__, sz);
-+      g_debug("%s: PNG data, size %" FMTSZ "u.\n", __FUNCTION__, sz);
-       /* Try to load buf into pixbuf, and write to local clipboard. */
-       try {
-          Glib::RefPtr<Gdk::PixbufLoader> loader = Gdk::PixbufLoader::create();
-@@ -1388,7 +1388,7 @@ CopyPasteUIX11::LocalPrepareFileContents
- 
-       if (!fileItem[i].cpName.cpName_val ||
-           0 == fileItem[i].cpName.cpName_len) {
--         g_debug("%s: invalid fileItem[%"FMTSZ"u].cpName.\n", __FUNCTION__, i);
-+         g_debug("%s: invalid fileItem[%" FMTSZ "u].cpName.\n", __FUNCTION__, i);
-          goto exit;
-       }
- 
diff --git a/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dndUIX11.cpp b/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dndUIX11.cpp
deleted file mode 100644
index bcbee7cf92d..00000000000
--- a/sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dndUIX11.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-$NetBSD: patch-services_plugins_dndcp_dndUIX11.cpp,v 1.1 2016/12/16 00:04:03 joerg Exp $
-
-Avoid User-defined Literals in C++11.
-
---- services/plugins/dndcp/dndUIX11.cpp.orig	2016-12-15 15:03:55.031323362 +0000
-+++ services/plugins/dndcp/dndUIX11.cpp
-@@ -128,7 +128,7 @@ DnDUIX11::~DnDUIX11()
-        && !mHGStagingDir.empty()) {
-       uint64 totalSize = File_GetSizeEx(mHGStagingDir.c_str());
-       if (mTotalFileSize != totalSize) {
--         g_debug("%s: deleting %s, expecting %"FMT64"d, finished %"FMT64"d\n",
-+         g_debug("%s: deleting %s, expecting %" FMT64 "d, finished %" FMT64 "d\n",
-                  __FUNCTION__, mHGStagingDir.c_str(),
-                  mTotalFileSize, totalSize);
-          DnD_DeleteStagingFiles(mHGStagingDir.c_str(), FALSE);
-@@ -1125,14 +1125,14 @@ DnDUIX11::OnGtkDragDataGet(
- 
-    if (   TargetIsPlainText(target)
-        && CPClipboard_GetItem(&mClipboard, CPFORMAT_TEXT, &buf, &sz)) {
--      g_debug("%s: providing plain text, size %"FMTSZ"u\n", __FUNCTION__, sz);
-+      g_debug("%s: providing plain text, size %" FMTSZ "u\n", __FUNCTION__, sz);
-       selection_data.set(target.c_str(), (const char *)buf);
-       return;
-    }
- 
-    if (   TargetIsRichText(target)
-        && CPClipboard_GetItem(&mClipboard, CPFORMAT_RTF, &buf, &sz)) {
--      g_debug("%s: providing rtf text, size %"FMTSZ"u\n", __FUNCTION__, sz);
-+      g_debug("%s: providing rtf text, size %" FMTSZ "u\n", __FUNCTION__, sz);
-       selection_data.set(target.c_str(), (const char *)buf);
-       return;
-    }
-@@ -1457,7 +1457,7 @@ DnDUIX11::SetCPClipboardFromGtk(const Gt
-           && source.size() < DNDMSG_MAX_ARGSZ
-           && CPClipboard_SetItem(&mClipboard, CPFORMAT_TEXT, source.c_str(),
-                                  source.size() + 1)) {
--         g_debug("%s: Got text, size %"FMTSZ"u\n", __FUNCTION__, source.size());
-+         g_debug("%s: Got text, size %" FMTSZ "u\n", __FUNCTION__, source.size());
-       } else {
-          g_debug("%s: Failed to get text\n", __FUNCTION__);
-          return false;
-@@ -1473,7 +1473,7 @@ DnDUIX11::SetCPClipboardFromGtk(const Gt
-           && source.size() < DNDMSG_MAX_ARGSZ
-           && CPClipboard_SetItem(&mClipboard, CPFORMAT_RTF, source.c_str(),
-                                  source.size() + 1)) {
--         g_debug("%s: Got RTF, size %"FMTSZ"u\n", __FUNCTION__, source.size());
-+         g_debug("%s: Got RTF, size %" FMTSZ "u\n", __FUNCTION__, source.size());
-          return true;
-       } else {
-          g_debug("%s: Failed to get text\n", __FUNCTION__ );
-@@ -2229,7 +2229,7 @@ DnDUIX11::WriteFileContentsToStagingDir(
- 
-       if (!fileItem[i].cpName.cpName_val ||
-           0 == fileItem[i].cpName.cpName_len) {
--         g_debug("%s: invalid fileItem[%"FMTSZ"u].cpName.\n", __FUNCTION__, i);
-+         g_debug("%s: invalid fileItem[%" FMTSZ "u].cpName.\n", __FUNCTION__, i);
-          goto exit;
-       }
- 
diff --git a/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am b/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am
index be8e91300ea..8141be3f3ae 100644
--- a/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am
+++ b/sysutils/open-vm-tools/patches/patch-services_plugins_timeSync_Makefile.am
@@ -1,15 +1,13 @@
-$NetBSD: patch-services_plugins_timeSync_Makefile.am,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-services_plugins_timeSync_Makefile.am,v 1.2 2016/12/23 04:11:03 ryoon Exp $
 
---- services/plugins/timeSync/Makefile.am.orig	2016-02-16 20:06:48.000000000 +0000
+--- services/plugins/timeSync/Makefile.am.orig	2016-09-29 10:07:01.000000000 +0000
 +++ services/plugins/timeSync/Makefile.am
-@@ -39,6 +39,10 @@ if FREEBSD
- libtimeSync_la_SOURCES += slewAdjtime.c
- libtimeSync_la_SOURCES += pllNone.c
+@@ -43,4 +43,8 @@ if LINUX
+ libtimeSync_la_SOURCES += slewLinux.c
+ libtimeSync_la_SOURCES += pllLinux.c
  endif
 +if NETBSD
 +libtimeSync_la_SOURCES += slewAdjtime.c
 +libtimeSync_la_SOURCES += pllNone.c
 +endif
- if LINUX
- libtimeSync_la_SOURCES += slewLinux.c
- libtimeSync_la_SOURCES += pllLinux.c
+