Update to 10.3.0

Changelog:
Resolved Issues

    The open-vm-tools process might take a long time and consume 100% CPU of a core in a Linux OS with many IPv6 routes

    Prior to open-vm-tools 10.3.0, gathering network adapter information in a Linux guest OS with many IPv6 routes was a time-consuming process with 100% use of the CPU of a core. The exported data contained only a maximum of 100 routes. IPv4 routes took precedence over IPv6, leading to data loss in reporting IPv6 routes. If there were more than 100 IPv4 routes, IPv6 routes were not reported.

    This performance issue has been resolved in this release. The default routes gathering behavior can be overridden by configuring the values in the /etc/vmware-tools/tools.conf file:

    [guestinfo]
    max-ipv4-routes=0
    max-ipv6-routes=0

    Note: If they are not manually set, or an invalid value (over 100 or less than 0) is set, 'max-ipv4-routes' and 'max-ipv6-routes' are set to 100 by default. They can be set to 0 to disable the data collection.

    This issue is resolved in this release.

    Installation of the libvmtools package might fail the installation of VMware Tools

    When the package "libvmtools0" is installed in SUSE Linux 12 and open-vm-tools is not installed, the VMware Tools installer fails. This is done to prevent an incomplete installation. Users have to uninstall both open-vm-tools and libvmtools0 packages to install VMware Tools.

7 files changed, 62 insertions, 50 deletions

diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index 50efe1b4398..f4c370caa13 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.86 2018/07/20 03:34:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.87 2018/09/20 21:41:16 ryoon Exp $
 
-OVTVER=		10.2.5
-DISTNAME=	open-vm-tools-${OVTVER}-8068406
+OVTVER=		10.3.0
+DISTNAME=	open-vm-tools-${OVTVER}-8931395
 PKGNAME=	open-vm-tools-${OVTVER}
-PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_GITHUB:=vmware/}
 
@@ -16,6 +15,8 @@ GITHUB_PROJECT=	open-vm-tools
 GITHUB_RELEASE=	stable-${OVTVER}
 #WRKSRC=	${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT}
 
+EXTRACT_USING=	bsdtar
+
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-x86_64
 
 GCC_REQD+=	4.8
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index d7f4f041900..7bc621828f3 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.28 2018/04/30 05:32:22 ryoon Exp $
+$NetBSD: distinfo,v 1.29 2018/09/20 21:41:16 ryoon Exp $
 
-SHA1 (open-vm-tools-10.2.5-8068406.tar.gz) = 6199d6d3227540192f2fcdf53684f7bfbbd82655
-RMD160 (open-vm-tools-10.2.5-8068406.tar.gz) = 4081012fc6f24e79cc16e53e29aa5f202e93a8f4
-SHA512 (open-vm-tools-10.2.5-8068406.tar.gz) = da2f26b4b22e195af111cc16d5819aeb963f0dfa18b5d2677d897549836ec8679808315646f7f86ae36862df9e623bbcb5d553dae97a68b3ef928a5c07ea2e68
-Size (open-vm-tools-10.2.5-8068406.tar.gz) = 4818035 bytes
-SHA1 (patch-ag) = 67ce2bcba5cfcbd48f4d2345d5529329424952b3
+SHA1 (open-vm-tools-10.3.0-8931395.tar.gz) = 236d8159882ab2663043232a59f84eba144d0345
+RMD160 (open-vm-tools-10.3.0-8931395.tar.gz) = 5287327b105bfb2356b510f8a6e11b2153d50f17
+SHA512 (open-vm-tools-10.3.0-8931395.tar.gz) = 627056db94b79aa7782324ed1a71e7f0c2420f0a0d76d3e65b84035b1350e29757a1412cbf195ef3d79fae37ddd6f17c6892ea2c64dbfa331854ded016965604
+Size (open-vm-tools-10.3.0-8931395.tar.gz) = 4638881 bytes
+SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da
 SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
 SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
 SHA1 (patch-aj) = e0bba963e3eed96cf7ae5b0e439a16524194e4df
-SHA1 (patch-ak) = c74a8185508d34cb35fbf14b638fab59661e191f
+SHA1 (patch-ak) = 07f926ccc90f07301075e1fb63769f8c1e926f75
 SHA1 (patch-aq) = 512a662530ef96c905eb61f6f9e459d6cd1c4b8e
 SHA1 (patch-ar) = b06873f37ac826912e647f2349dc88053bf2cb67
 SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f
@@ -23,9 +23,9 @@ SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
 SHA1 (patch-bf) = b5fffbfada52e1ebfa3652756ef26bde3343b1cd
 SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
 SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892
-SHA1 (patch-bt) = f0b696a582d69d325c44f6200f2e367ada6d7674
+SHA1 (patch-bt) = 98afde7ca576c17324d96e115ba4f64b901931ba
 SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
-SHA1 (patch-configure.ac) = 8a3d6c8548eceead8dc5cdb8baf051861cacb7ae
+SHA1 (patch-configure.ac) = 292f4144bb635127b2b2e011af684034a0d423ce
 SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af
 SHA1 (patch-libDeployPkg_processPosix.c) = 4b7688d44f1ca8dcd40076391dc0fb9a627bfebe
 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
@@ -34,7 +34,6 @@ 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) = 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
diff --git a/sysutils/open-vm-tools/patches/patch-ag b/sysutils/open-vm-tools/patches/patch-ag
index b3eae11886f..2b5968ee4bc 100644
--- a/sysutils/open-vm-tools/patches/patch-ag
+++ b/sysutils/open-vm-tools/patches/patch-ag
@@ -1,13 +1,13 @@
-$NetBSD: patch-ag,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-ag,v 1.4 2018/09/20 21:41:16 ryoon Exp $
 
---- lib/dynxdr/dynxdr.c.orig	2016-02-16 20:06:45.000000000 +0000
+--- lib/dynxdr/dynxdr.c.orig	2018-06-23 10:04:02.000000000 +0000
 +++ lib/dynxdr/dynxdr.c
-@@ -54,7 +54,7 @@ typedef struct DynXdrData {
+@@ -55,7 +55,7 @@ typedef struct DynXdrData {
   * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
   * "x_getpostn" function.
   */
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
+-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(USE_TIRPC)
++#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(USE_TIRPC) || defined(__NetBSD__)
  #  define DYNXDR_GETPOS_CONST
  #else
  #  define DYNXDR_GETPOS_CONST const
diff --git a/sysutils/open-vm-tools/patches/patch-ak b/sysutils/open-vm-tools/patches/patch-ak
index 1fcb4745df3..ce1cf53ba75 100644
--- a/sysutils/open-vm-tools/patches/patch-ak
+++ b/sysutils/open-vm-tools/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.3 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-ak,v 1.4 2018/09/20 21:41:16 ryoon Exp $
 
---- lib/file/filePosix.c.orig	2016-02-16 20:06:45.000000000 +0000
+--- lib/file/filePosix.c.orig	2018-06-23 10:04:02.000000000 +0000
 +++ lib/file/filePosix.c
 @@ -24,7 +24,7 @@
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ak,v 1.3 2016/10/09 03:41:56 ryoon Exp $
  # include <sys/param.h>
  # include <sys/mount.h>
  #else
-@@ -73,7 +73,7 @@
+@@ -77,7 +77,7 @@
  
  #include "unicodeOperations.h"
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ak,v 1.3 2016/10/09 03:41:56 ryoon Exp $
  #if !defined(__APPLE__)
  static char *FilePosixLookupMountPoint(char const *canPath, Bool *bind);
  #endif
-@@ -360,7 +360,7 @@ FileAttributes(const char *pathName,  //
+@@ -364,7 +364,7 @@ FileAttributes(const char *pathName,  //
   *----------------------------------------------------------------------
   */
  
@@ -29,7 +29,25 @@ $NetBSD: patch-ak,v 1.3 2016/10/09 03:41:56 ryoon Exp $
  Bool
  File_IsRemote(const char *pathName)  // IN: Path name
  {
-@@ -909,7 +909,7 @@ File_SetFilePermissions(const char *path
+@@ -620,7 +620,7 @@ File_FullPath(const char *pathName)  // 
+       if (ret == NULL) {
+          char *dir;
+          char *file;
+-#if defined(__FreeBSD__) || defined(sun)
++#if defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
+          char *realDir;
+ #else
+          char *ancestorPath;
+@@ -628,7 +628,7 @@ File_FullPath(const char *pathName)  // 
+ #endif
+ 
+          File_GetPathName(path, &dir, &file);
+-#if defined(__FreeBSD__) || defined(sun)
++#if defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
+          realDir = Posix_RealPath(dir);
+          if (realDir == NULL) {
+             realDir = File_StripFwdSlashes(dir);
+@@ -961,7 +961,7 @@ File_SetFilePermissions(const char *path
  }
  
  
@@ -38,7 +56,7 @@ $NetBSD: patch-ak,v 1.3 2016/10/09 03:41:56 ryoon Exp $
  /*
   *-----------------------------------------------------------------------------
   *
-@@ -2006,7 +2006,7 @@ File_IsSameFile(const char *path1,  // I
+@@ -2108,7 +2108,7 @@ File_IsSameFile(const char *path1,  // I
  {
     struct stat st1;
     struct stat st2;
@@ -47,7 +65,7 @@ $NetBSD: patch-ak,v 1.3 2016/10/09 03:41:56 ryoon Exp $
     struct statfs stfs1;
     struct statfs stfs2;
  #endif
-@@ -2049,7 +2049,7 @@ File_IsSameFile(const char *path1,  // I
+@@ -2151,7 +2151,7 @@ File_IsSameFile(const char *path1,  // I
        return TRUE;
     }
  
diff --git a/sysutils/open-vm-tools/patches/patch-bt b/sysutils/open-vm-tools/patches/patch-bt
index 825b1f21bbe..ba6e6c64ea1 100644
--- a/sysutils/open-vm-tools/patches/patch-bt
+++ b/sysutils/open-vm-tools/patches/patch-bt
@@ -1,9 +1,9 @@
-$NetBSD: patch-bt,v 1.2 2018/01/01 06:56:01 ryoon Exp $
+$NetBSD: patch-bt,v 1.3 2018/09/20 21:41:16 ryoon Exp $
 
---- vmware-user-suid-wrapper/main.c.orig	2017-12-15 19:09:51.000000000 +0000
+--- vmware-user-suid-wrapper/main.c.orig	2018-06-23 10:03:28.000000000 +0000
 +++ vmware-user-suid-wrapper/main.c
-@@ -28,7 +28,7 @@
-  *      remove blocks in the blocking file system.
+@@ -30,7 +30,7 @@
+  *        vmware-user.
   */
  
 -#if !defined(sun) && !defined(__FreeBSD__) && !defined(__linux__)
diff --git a/sysutils/open-vm-tools/patches/patch-configure.ac b/sysutils/open-vm-tools/patches/patch-configure.ac
index 6341ba33b6a..121384278ac 100644
--- a/sysutils/open-vm-tools/patches/patch-configure.ac
+++ b/sysutils/open-vm-tools/patches/patch-configure.ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure.ac,v 1.4 2018/01/01 06:56:01 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.5 2018/09/20 21:41:16 ryoon Exp $
 
---- configure.ac.orig	2017-12-15 19:09:51.000000000 +0000
+--- configure.ac.orig	2018-06-23 10:03:29.000000000 +0000
 +++ configure.ac
 @@ -126,6 +126,9 @@ case "$host_os" in
     [solaris*])
@@ -12,7 +12,7 @@ $NetBSD: patch-configure.ac,v 1.4 2018/01/01 06:56:01 ryoon Exp $
     [*])
        AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.])
        ;;
-@@ -470,7 +473,7 @@ AC_VMW_CHECK_LIB([fuse],
+@@ -477,7 +480,7 @@ AC_VMW_CHECK_LIB([fuse],
                   [],
                   [],
                   [fuse.h],
@@ -21,7 +21,16 @@ $NetBSD: patch-configure.ac,v 1.4 2018/01/01 06:56:01 ryoon Exp $
                   [have_fuse=yes],
                   [have_fuse=no;
                    AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])])
-@@ -1263,6 +1266,15 @@ if test "$os" = "linux"; then
+@@ -1136,7 +1139,7 @@ AC_PATH_PROG(
+    [RPCGEN],
+    [rpcgen],
+    [not_found])
+-if test "$RPCGEN" == "not_found"; then
++if test "$RPCGEN" = "not_found"; then
+    AC_MSG_ERROR([rpcgen not found.])
+ fi
+ 
+@@ -1363,6 +1366,15 @@ if test "$os" = "linux"; then
     fi
  fi
  
@@ -37,7 +46,7 @@ $NetBSD: patch-configure.ac,v 1.4 2018/01/01 06:56:01 ryoon Exp $
  if test "$os" = "freebsd" || test "$os" = "kfreebsd-gnu"; then
     LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
     MODULES_DIR="/boot/modules"
-@@ -1360,6 +1372,7 @@ fi
+@@ -1460,6 +1472,7 @@ fi
  AM_CONDITIONAL(BUILD_HGFSMOUNTER, test "$buildHgfsmounter" = "yes")
  AM_CONDITIONAL(LINUX, test "$os" = "linux")
  AM_CONDITIONAL(SOLARIS, test "$os" = "solaris")
diff --git a/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h b/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h
deleted file mode 100644
index 814a9fc6a9c..00000000000
--- a/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-lib_include_vm__basic__types.h,v 1.2 2018/01/01 06:56:01 ryoon Exp $
-
-Fix build on NetBSD 6.
-
---- lib/include/vm_basic_types.h.orig	2017-12-15 19:09:51.000000000 +0000
-+++ lib/include/vm_basic_types.h
-@@ -80,7 +80,7 @@
- /* STRICT ANSI means the Xserver build and X defines Bool differently. */
- #if !defined(_XTYPEDEF_BOOL) && \
-     (!defined(__STRICT_ANSI__) || defined(__FreeBSD__) || \
--      defined(__MINGW32__) || defined(__APPLE__))
-+      defined(__MINGW32__) || defined(__APPLE__) || defined(__NetBSD__))
- #define _XTYPEDEF_BOOL
- typedef char           Bool;
- #endif