[pkgsrc/trunk]: pkgsrc/sysutils/open-vm-tools Update to 10.2.0

[ryoon <ryoon%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2ae22428963
branches:  trunk
changeset: 373390:f2ae22428963
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Mon Jan 01 06:56:01 2018 +0000

description:
Update to 10.2.0

* Use x11/gtkmm3

Changelog:
Compatibility
  * open-vm-tools 10.2.0 is compatible with all supported versions
    of VMware vSphere ESXi 5.5 and later, VMware Workstation 14.0 and
    VMware Fusion 10.0. See VMware Compatibility Guide for more information.

  * Starting with VMware Tools version 10.2.0, Perl script based VMware
    Tools installation for FreeBSD has been discontinued. Going forward,
    FreeBSD systems are supported only through the open-vm-tools packages
    directly available from FreeBSD package repositories. FreeBSD packages
    for open-vm-tools 10.1.0 and later are available from FreeBSD package
    repositories.

Resolved Issues
  * Summary page of the VM does not list the IP address of the VMs in
    the right order

  * Guest authentication fails with a SystemError fault when the requested
    password is expired

  * The free space reported in vim.vm.GuestInfo.DiskInfo for a Linux guest
    does not match with df command in the guest

  * VMware user process might not restart after upgrades of open-vm-tools

diffstat:

 sysutils/open-vm-tools/Makefile                                            |  11 +-
 sysutils/open-vm-tools/PLIST                                               |  14 +--
 sysutils/open-vm-tools/distinfo                                            |  35 +++---
 sysutils/open-vm-tools/options.mk                                          |   4 +-
 sysutils/open-vm-tools/patches/patch-ah                                    |   6 +-
 sysutils/open-vm-tools/patches/patch-av                                    |  14 --
 sysutils/open-vm-tools/patches/patch-bb                                    |   6 +-
 sysutils/open-vm-tools/patches/patch-bc                                    |  18 +-
 sysutils/open-vm-tools/patches/patch-bd                                    |  20 ----
 sysutils/open-vm-tools/patches/patch-bf                                    |  47 ++++-----
 sysutils/open-vm-tools/patches/patch-bm                                    |  20 ++--
 sysutils/open-vm-tools/patches/patch-bt                                    |   8 +-
 sysutils/open-vm-tools/patches/patch-configure.ac                          |  14 +-
 sysutils/open-vm-tools/patches/patch-lib_include_sigPosixRegs.h            |  10 +-
 sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h        |  12 +-
 sysutils/open-vm-tools/patches/patch-lib_include_vmblock__user.h           |  12 +-
 sysutils/open-vm-tools/patches/patch-lib_misc_vthreadBase.c                |  13 ++
 sysutils/open-vm-tools/patches/patch-services_plugins_dndcp_dnd_dndLinux.c |  16 +-
 18 files changed, 120 insertions(+), 160 deletions(-)

diffs (truncated from 717 to 300 lines):

diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/Makefile
--- a/sysutils/open-vm-tools/Makefile   Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/Makefile   Mon Jan 01 06:56:01 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.78 2017/11/30 16:45:38 adam Exp $
+# $NetBSD: Makefile,v 1.79 2018/01/01 06:56:01 ryoon Exp $
 
-DISTNAME=      open-vm-tools-10.1.15
-PKGREVISION=   1
+OVTVER=                10.2.0
+DISTNAME=      open-vm-tools-${OVTVER}-7253323
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vmware/}
 
@@ -10,8 +10,9 @@
 COMMENT=       Open source VMware tools
 LICENSE=       gnu-lgpl-v2.1
 
-GITHUB_TAG=    stable-${PKGVERSION_NOREV}
-WRKSRC=                ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT}
+GITHUB_PROJECT=        open-vm-tools
+GITHUB_RELEASE=        stable-${OVTVER}
+#WRKSRC=       ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT}
 
 ONLY_FOR_PLATFORM=     NetBSD-*-i386 NetBSD-*-x86_64
 
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/PLIST
--- a/sysutils/open-vm-tools/PLIST      Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/PLIST      Mon Jan 01 06:56:01 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2017/10/08 16:01:30 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 bin/vmhgfs-fuse
 bin/vmtoolsd
 bin/vmware-checkvm
@@ -6,29 +6,20 @@
 bin/vmware-namespace-cmd
 bin/vmware-rpctool
 bin/vmware-toolbox-cmd
+${PLIST.x11}bin/vmware-user
 ${PLIST.x11}bin/vmware-user-suid-wrapper
 bin/vmware-vmblock-fuse
 bin/vmware-xferlogs
 ${PLIST.x11}etc/vmware-tools/xdg/autostart/vmware-user.desktop
-include/libDeployPkg/guestcust-events.h
-include/libDeployPkg/imgcust-api.h
-include/libDeployPkg/includeCheck.h
-include/libDeployPkg/linuxDeployment.h
-include/libDeployPkg/log.h
-include/libDeployPkg/process.h
-include/libDeployPkg/rpcout.h
-include/libDeployPkg/vm_basic_types.h
 include/vmGuestLib/includeCheck.h
 include/vmGuestLib/vmGuestLib.h
 include/vmGuestLib/vmSessionId.h
 include/vmGuestLib/vm_basic_types.h
-lib/libDeployPkg.la
 lib/libguestlib.la
 lib/libhgfs.la
 lib/libvmtools.la
 lib/open-vm-tools/plugins/common/libhgfsServer.la
 lib/open-vm-tools/plugins/common/libvix.la
-lib/open-vm-tools/plugins/vmsvc/libdeployPkgPlugin.so
 lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
 lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
 lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
@@ -36,7 +27,6 @@
 ${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
 ${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libdndcp.so
 ${PLIST.x11}lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
-lib/pkgconfig/libDeployPkg.pc
 lib/pkgconfig/vmguestlib.pc
 sbin/mount.vmblock
 share/examples/vmware-tools/pam.d/vmtoolsd
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/distinfo
--- a/sysutils/open-vm-tools/distinfo   Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/distinfo   Mon Jan 01 06:56:01 2018 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2017/10/08 16:01:30 adam Exp $
+$NetBSD: distinfo,v 1.27 2018/01/01 06:56:01 ryoon Exp $
 
-SHA1 (open-vm-tools-10.1.15.tar.gz) = 1b9a68b8acedeb720c91ac20ddf17e5187320cc6
-RMD160 (open-vm-tools-10.1.15.tar.gz) = 27de01103f7d7ac16258acaf64545f5f47a796bc
-SHA512 (open-vm-tools-10.1.15.tar.gz) = 4c75ee3424c1cb0e4b949a8d52863337ca754eeae90e078fd63790fcc67ea11b9136f9f1cb0f32e31d3f934e514a269706db08c698b6fe0b3beb1fe9437cd103
-Size (open-vm-tools-10.1.15.tar.gz) = 3551568 bytes
+SHA1 (open-vm-tools-10.2.0-7253323.tar.gz) = 7426f42b58e8449e55ac8448e32d80973170c483
+RMD160 (open-vm-tools-10.2.0-7253323.tar.gz) = fdc185cf0b860d87a0b679fbf26ca7450750ca15
+SHA512 (open-vm-tools-10.2.0-7253323.tar.gz) = b54a54685e6863f275966bda26317e181b121b7682980ee4fa376df50156fff4d7b577f025b46ab51669a17b1c1b269474e75374229d5041cca355a908f9565b
+Size (open-vm-tools-10.2.0-7253323.tar.gz) = 4926473 bytes
 SHA1 (patch-ag) = 67ce2bcba5cfcbd48f4d2345d5529329424952b3
-SHA1 (patch-ah) = bdee6d92cdfe64f1ab513876ccd9d01f6fda6882
+SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
 SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
 SHA1 (patch-aj) = e0bba963e3eed96cf7ae5b0e439a16524194e4df
 SHA1 (patch-ak) = c74a8185508d34cb35fbf14b638fab59661e191f
@@ -14,20 +14,18 @@
 SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f
 SHA1 (patch-at) = 6dbe029926e18075eedf9e2947807f8a4d593136
 SHA1 (patch-au) = 518ca50f944fad718a5e8deb66e83a405ce88159
-SHA1 (patch-av) = 9a1a7daf9fdd2c60119e0a59063aff4e74ad10f1
 SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d
 SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7
 SHA1 (patch-ba) = 77a57e736f3b02b8f942ae3543cee065a4c4e732
-SHA1 (patch-bb) = e22d082689016d81add208e1d3b31d9d897d36e8
-SHA1 (patch-bc) = c2f316cd9035648676fd9d0d7e40fc7f6bf5c8d4
-SHA1 (patch-bd) = eacc267fad7021a96ee435e8fc41c82fb49d9c5f
+SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa
+SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f
 SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
-SHA1 (patch-bf) = dc72e905601521cc703a72aea7f1b31ac03a8802
+SHA1 (patch-bf) = b5fffbfada52e1ebfa3652756ef26bde3343b1cd
 SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
-SHA1 (patch-bm) = 219f196fc07e3746e9e6eb340be5e647544a255a
-SHA1 (patch-bt) = 34c85d8d994c33fb4e18f76bb8b6baa41098f23e
+SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892
+SHA1 (patch-bt) = f0b696a582d69d325c44f6200f2e367ada6d7674
 SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
-SHA1 (patch-configure.ac) = 1a8422cdca984b32c0d9e4fa926a92fa3b9178ba
+SHA1 (patch-configure.ac) = 8a3d6c8548eceead8dc5cdb8baf051861cacb7ae
 SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af
 SHA1 (patch-libDeployPkg_processPosix.c) = 4b7688d44f1ca8dcd40076391dc0fb9a627bfebe
 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
@@ -35,12 +33,13 @@
 SHA1 (patch-lib_guestApp_guestApp.c) = ed916ad0726b8d992319828f8f3a4115d7aba753
 SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863
 SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4
-SHA1 (patch-lib_include_sigPosixRegs.h) = 634e12414f004671c1b2855764970e5d16ef4ef8
-SHA1 (patch-lib_include_vm__basic__types.h) = 4dfefc05e2bba336593c74ddac7a4583afa3053a
-SHA1 (patch-lib_include_vmblock__user.h) = 05ed8a0cdd481b759643ea47e27ef6e223a835d8
+SHA1 (patch-lib_include_sigPosixRegs.h) = a2d7a4c72ea4a7ba4c191fac06ebf1085ec31fa9
+SHA1 (patch-lib_include_vm__basic__types.h) = 35816f81ef480d884f8a538df92af57cd3403b4c
+SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a
 SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968
 SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624
 SHA1 (patch-lib_misc_hostinfoPosix.c) = 4daea6167cee2be57cc3acc0caa710ca940d1eb7
+SHA1 (patch-lib_misc_vthreadBase.c) = 8d2a2749d7ed343d2648f74546d69baab949e5cf
 SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
 SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 0f44134e1e256a46b5ce35fff91d0568649c1bad
 SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 34602bb8a34a930e487ae594137eacda804c3fe0
@@ -48,7 +47,7 @@
 SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e
 SHA1 (patch-scripts_Makefile.am) = 5238c5cabf1125f9cd334349e5f67f1b7a568428
 SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
-SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = 61acce40961ac82b48e055c159efd0c3b7a8899c
+SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3
 SHA1 (patch-services_plugins_timeSync_Makefile.am) = c92d64573e7c5718e955d32991c8951ea2408d43
 SHA1 (patch-services_plugins_vix_vixTools.c) = a7e9df7fde7997315ef0ea77c50bbf1d410a2d9d
 SHA1 (patch-services_vmtoolsd_Makefile.am) = 8a34599f5bd9722333de1ecf741a27a0636104c5
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/options.mk
--- a/sysutils/open-vm-tools/options.mk Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/options.mk Mon Jan 01 06:56:01 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2017/10/08 16:01:30 adam Exp $
+# $NetBSD: options.mk,v 1.7 2018/01/01 06:56:01 ryoon Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.open-vm-tools
 PKG_SUPPORTED_OPTIONS= icu x11
@@ -19,7 +19,7 @@
 MESSAGE_SRC+=  MESSAGE.x11
 .  include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
 .  include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.  include "../../x11/gtkmm/buildlink3.mk"
+.  include "../../x11/gtkmm3/buildlink3.mk"
 .  include "../../x11/libXtst/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=               --without-x
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/patches/patch-ah
--- a/sysutils/open-vm-tools/patches/patch-ah   Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/patches/patch-ah   Mon Jan 01 06:56:01 2018 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-ah,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/file/fileIO.c.orig     2016-02-16 20:06:45.000000000 +0000
+--- lib/file/fileIO.c.orig     2017-12-15 19:09:51.000000000 +0000
 +++ lib/file/fileIO.c
 @@ -325,7 +325,7 @@ FileIO_Lock(FileIODescriptor *file,  // 
     FileIOResolveLockBits(&access);
@@ -13,7 +13,7 @@
        ret = FILEIO_LOCK_FAILED;
 @@ -394,7 +394,7 @@ FileIO_Unlock(FileIODescriptor *file)  /
  
-    ASSERT(file);
+    ASSERT(file != NULL);
  
 -#if !defined(__FreeBSD__) && !defined(sun)
 +#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__)
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/patches/patch-av
--- a/sysutils/open-vm-tools/patches/patch-av   Mon Jan 01 01:26:13 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-av,v 1.3 2016/10/09 03:41:56 ryoon Exp $
-
---- lib/include/util.h.orig    2016-02-16 20:06:46.000000000 +0000
-+++ lib/include/util.h
-@@ -67,6 +67,9 @@
- #elif defined(__FreeBSD__)
- #  include <pthread.h>
-    typedef pthread_t Util_ThreadID;
-+#elif defined(__NetBSD__)
-+#  include <pthread.h>
-+   typedef pthread_t Util_ThreadID;
- #else
- #  error "Need typedef for Util_ThreadID"
- #endif
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/patches/patch-bb
--- a/sysutils/open-vm-tools/patches/patch-bb   Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/patches/patch-bb   Mon Jan 01 06:56:01 2018 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-bb,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-bb,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/misc/idLinux.c.orig    2016-02-16 20:06:46.000000000 +0000
+--- lib/misc/idLinux.c.orig    2017-12-15 19:09:51.000000000 +0000
 +++ lib/misc/idLinux.c
 @@ -119,7 +119,7 @@ static AuthorizationRef IdAuthCreateWith
  int
@@ -9,7 +9,7 @@
 -#if defined(__FreeBSD__) || defined(sun)
 +#if defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
     return setuid(euid);
- #elif defined(linux) || defined __ANDROID__
+ #elif defined(__linux__) || defined __ANDROID__
     if (uid32) {
 @@ -162,7 +162,7 @@ Id_SetGid(gid_t egid)              // IN: new egid
     Warning("XXXMACOS: implement %s\n", __func__);
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/patches/patch-bc
--- a/sysutils/open-vm-tools/patches/patch-bc   Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/patches/patch-bc   Mon Jan 01 06:56:01 2018 +0000
@@ -1,17 +1,17 @@
-$NetBSD: patch-bc,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-bc,v 1.4 2018/01/01 06:56:01 ryoon Exp $
 
---- lib/misc/posixPosix.c.orig 2016-02-16 20:06:46.000000000 +0000
+--- lib/misc/posixPosix.c.orig 2017-12-15 19:09:51.000000000 +0000
 +++ lib/misc/posixPosix.c
-@@ -47,7 +47,7 @@
- #include <sys/param.h>
- #include <sys/mount.h>
- #include <CoreFoundation/CoreFoundation.h>
+@@ -52,7 +52,7 @@
+ #include <spawn.h>
+ extern char **environ;
+ #endif
 -#elif defined(__FreeBSD__)
 +#elif defined(__FreeBSD__) || defined(__NetBSD__)
  #include <sys/param.h>
  #include <sys/mount.h>
  #elif defined(sun)
-@@ -65,7 +65,7 @@
+@@ -70,7 +70,7 @@ extern char **environ;
  #define VM_SYSTEM_HAS_GETGRNAM_R 1
  #endif
  
@@ -20,7 +20,7 @@
  #  include <sys/syslimits.h>  // PATH_MAX
  # else
  #  include <limits.h>  // PATH_MAX
-@@ -1585,7 +1585,7 @@ Posix_Putenv(char *name)  // IN:
+@@ -1635,7 +1635,7 @@ Posix_Putenv(char *name)  // IN:
  }
  
  
@@ -29,7 +29,7 @@
  
  /*
   *----------------------------------------------------------------------
-@@ -1746,7 +1746,7 @@ Posix_Unsetenv(const char *name)  // IN:
+@@ -1806,7 +1806,7 @@ Posix_Unsetenv(const char *name)  // IN:
  
  #if !defined(sun) // {
  
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/patches/patch-bd
--- a/sysutils/open-vm-tools/patches/patch-bd   Mon Jan 01 01:26:13 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2016/10/09 03:41:56 ryoon Exp $
-
---- lib/misc/util_misc.c.orig  2016-02-16 20:06:46.000000000 +0000
-+++ lib/misc/util_misc.c
-@@ -488,6 +488,15 @@ Util_GetCurrentThreadId(void)
-    ASSERT_ON_COMPILE(sizeof(Util_ThreadID) >= sizeof(pthread_t));
- 
-    return pthread_self();
-+#elif defined(__NetBSD__)
-+   /*
-+    * These OSes do not implement OS-native thread IDs. You probably
-+    * didn't need one anyway, but guess that pthread_self works
-+    * well enough.
-+    */
-+   ASSERT_ON_COMPILE(sizeof(Util_ThreadID) >= sizeof(pthread_t));
-+
-+   return pthread_self();
- #elif defined(_WIN32)
-    return GetCurrentThreadId();
- #else
diff -r 3ca71c6e7338 -r f2ae22428963 sysutils/open-vm-tools/patches/patch-bf
--- a/sysutils/open-vm-tools/patches/patch-bf   Mon Jan 01 01:26:13 2018 +0000
+++ b/sysutils/open-vm-tools/patches/patch-bf   Mon Jan 01 06:56:01 2018 +0000
@@ -1,6 +1,6 @@