Thu Sep 20 21:41:16 2018 UTC ()
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.


(ryoon)
diff -r1.86 -r1.87 pkgsrc/sysutils/open-vm-tools/Makefile
diff -r1.28 -r1.29 pkgsrc/sysutils/open-vm-tools/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-ag
diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-ak
diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-bt
diff -r1.4 -r1.5 pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac
diff -r1.2 -r0 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_include_vm__basic__types.h
cvs diff -r1.86 -r1.87 pkgsrc/sysutils/open-vm-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/Makefile 2018/07/20 03:34:28 1.86
+++ pkgsrc/sysutils/open-vm-tools/Makefile 2018/09/20 21:41:16 1.87
@@ -1,31 +1,32 @@ @@ -1,31 +1,32 @@
1# $NetBSD: Makefile,v 1.86 2018/07/20 03:34:28 ryoon Exp $ 1# $NetBSD: Makefile,v 1.87 2018/09/20 21:41:16 ryoon Exp $
2 2
3OVTVER= 10.2.5 3OVTVER= 10.3.0
4DISTNAME= open-vm-tools-${OVTVER}-8068406 4DISTNAME= open-vm-tools-${OVTVER}-8931395
5PKGNAME= open-vm-tools-${OVTVER} 5PKGNAME= open-vm-tools-${OVTVER}
6PKGREVISION= 1 
7CATEGORIES= sysutils 6CATEGORIES= sysutils
8MASTER_SITES= ${MASTER_SITE_GITHUB:=vmware/} 7MASTER_SITES= ${MASTER_SITE_GITHUB:=vmware/}
9 8
10MAINTAINER= agc@NetBSD.org 9MAINTAINER= agc@NetBSD.org
11HOMEPAGE= https://github.com/vmware/open-vm-tools 10HOMEPAGE= https://github.com/vmware/open-vm-tools
12COMMENT= Open source VMware tools 11COMMENT= Open source VMware tools
13LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
14 13
15GITHUB_PROJECT= open-vm-tools 14GITHUB_PROJECT= open-vm-tools
16GITHUB_RELEASE= stable-${OVTVER} 15GITHUB_RELEASE= stable-${OVTVER}
17#WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT} 16#WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}/${GITHUB_PROJECT}
18 17
 18EXTRACT_USING= bsdtar
 19
19ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 20ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64
20 21
21GCC_REQD+= 4.8 22GCC_REQD+= 4.8
22BUILDLINK_TRANSFORM.NetBSD+= rm:-Werror 23BUILDLINK_TRANSFORM.NetBSD+= rm:-Werror
23 24
24USE_LANGUAGES= c gnu++11 25USE_LANGUAGES= c gnu++11
25USE_LIBTOOL= yes 26USE_LIBTOOL= yes
26USE_TOOLS+= autoconf automake pkg-config 27USE_TOOLS+= autoconf automake pkg-config
27GNU_CONFIGURE= yes 28GNU_CONFIGURE= yes
28CONFIGURE_ARGS+= --disable-docs # Requires doxygen 29CONFIGURE_ARGS+= --disable-docs # Requires doxygen
29CONFIGURE_ARGS+= --disable-grabbitmqproxy 30CONFIGURE_ARGS+= --disable-grabbitmqproxy
30CONFIGURE_ARGS+= --disable-unity 31CONFIGURE_ARGS+= --disable-unity
31CONFIGURE_ARGS+= --disable-vgauth 32CONFIGURE_ARGS+= --disable-vgauth
cvs diff -r1.28 -r1.29 pkgsrc/sysutils/open-vm-tools/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/distinfo 2018/04/30 05:32:22 1.28
+++ pkgsrc/sysutils/open-vm-tools/distinfo 2018/09/20 21:41:16 1.29
@@ -1,50 +1,49 @@ @@ -1,50 +1,49 @@
1$NetBSD: distinfo,v 1.28 2018/04/30 05:32:22 ryoon Exp $ 1$NetBSD: distinfo,v 1.29 2018/09/20 21:41:16 ryoon Exp $
2 2
3SHA1 (open-vm-tools-10.2.5-8068406.tar.gz) = 6199d6d3227540192f2fcdf53684f7bfbbd82655 3SHA1 (open-vm-tools-10.3.0-8931395.tar.gz) = 236d8159882ab2663043232a59f84eba144d0345
4RMD160 (open-vm-tools-10.2.5-8068406.tar.gz) = 4081012fc6f24e79cc16e53e29aa5f202e93a8f4 4RMD160 (open-vm-tools-10.3.0-8931395.tar.gz) = 5287327b105bfb2356b510f8a6e11b2153d50f17
5SHA512 (open-vm-tools-10.2.5-8068406.tar.gz) = da2f26b4b22e195af111cc16d5819aeb963f0dfa18b5d2677d897549836ec8679808315646f7f86ae36862df9e623bbcb5d553dae97a68b3ef928a5c07ea2e68 5SHA512 (open-vm-tools-10.3.0-8931395.tar.gz) = 627056db94b79aa7782324ed1a71e7f0c2420f0a0d76d3e65b84035b1350e29757a1412cbf195ef3d79fae37ddd6f17c6892ea2c64dbfa331854ded016965604
6Size (open-vm-tools-10.2.5-8068406.tar.gz) = 4818035 bytes 6Size (open-vm-tools-10.3.0-8931395.tar.gz) = 4638881 bytes
7SHA1 (patch-ag) = 67ce2bcba5cfcbd48f4d2345d5529329424952b3 7SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da
8SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa 8SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
9SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06 9SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
10SHA1 (patch-aj) = e0bba963e3eed96cf7ae5b0e439a16524194e4df 10SHA1 (patch-aj) = e0bba963e3eed96cf7ae5b0e439a16524194e4df
11SHA1 (patch-ak) = c74a8185508d34cb35fbf14b638fab59661e191f 11SHA1 (patch-ak) = 07f926ccc90f07301075e1fb63769f8c1e926f75
12SHA1 (patch-aq) = 512a662530ef96c905eb61f6f9e459d6cd1c4b8e 12SHA1 (patch-aq) = 512a662530ef96c905eb61f6f9e459d6cd1c4b8e
13SHA1 (patch-ar) = b06873f37ac826912e647f2349dc88053bf2cb67 13SHA1 (patch-ar) = b06873f37ac826912e647f2349dc88053bf2cb67
14SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f 14SHA1 (patch-as) = b029c646cb49ee15a92827f100470489106a2f2f
15SHA1 (patch-at) = 6dbe029926e18075eedf9e2947807f8a4d593136 15SHA1 (patch-at) = 6dbe029926e18075eedf9e2947807f8a4d593136
16SHA1 (patch-au) = 518ca50f944fad718a5e8deb66e83a405ce88159 16SHA1 (patch-au) = 518ca50f944fad718a5e8deb66e83a405ce88159
17SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d 17SHA1 (patch-ay) = ff2f26b43c5d74c3d6e6d816d5ac3177cfbe505d
18SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7 18SHA1 (patch-az) = 971e3389db9d5d0a758ebe5b75cb45b419d50ba7
19SHA1 (patch-ba) = 77a57e736f3b02b8f942ae3543cee065a4c4e732 19SHA1 (patch-ba) = 77a57e736f3b02b8f942ae3543cee065a4c4e732
20SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa 20SHA1 (patch-bb) = 5405e552faba3811d16df899baf4acd1cee466aa
21SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f 21SHA1 (patch-bc) = 7d7ef35f6ab514c7818fcb80f070a325e4207b1f
22SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb 22SHA1 (patch-be) = 4e4f88df81daf40769b38d1ddd49fbf5e8d8d1eb
23SHA1 (patch-bf) = b5fffbfada52e1ebfa3652756ef26bde3343b1cd 23SHA1 (patch-bf) = b5fffbfada52e1ebfa3652756ef26bde3343b1cd
24SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad 24SHA1 (patch-bh) = 813a390478247b12c0ec0dd9e84302f1700b99ad
25SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892 25SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892
26SHA1 (patch-bt) = f0b696a582d69d325c44f6200f2e367ada6d7674 26SHA1 (patch-bt) = 98afde7ca576c17324d96e115ba4f64b901931ba
27SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d 27SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
28SHA1 (patch-configure.ac) = 8a3d6c8548eceead8dc5cdb8baf051861cacb7ae 28SHA1 (patch-configure.ac) = 292f4144bb635127b2b2e011af684034a0d423ce
29SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af 29SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af
30SHA1 (patch-libDeployPkg_processPosix.c) = 4b7688d44f1ca8dcd40076391dc0fb9a627bfebe 30SHA1 (patch-libDeployPkg_processPosix.c) = 4b7688d44f1ca8dcd40076391dc0fb9a627bfebe
31SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531 31SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
32SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab 32SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab
33SHA1 (patch-lib_guestApp_guestApp.c) = ed916ad0726b8d992319828f8f3a4115d7aba753 33SHA1 (patch-lib_guestApp_guestApp.c) = ed916ad0726b8d992319828f8f3a4115d7aba753
34SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863 34SHA1 (patch-lib_hgfsHelper_hgfsHelperPosix.c) = 9299f0a781d11689b04223a1dfd1c4725912f863
35SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4 35SHA1 (patch-lib_hgfsUri_hgfsUriPosix.c) = f98eab5cb5885a9c2e258bf072b24d8806b20fd4
36SHA1 (patch-lib_include_sigPosixRegs.h) = a2d7a4c72ea4a7ba4c191fac06ebf1085ec31fa9 36SHA1 (patch-lib_include_sigPosixRegs.h) = a2d7a4c72ea4a7ba4c191fac06ebf1085ec31fa9
37SHA1 (patch-lib_include_vm__basic__types.h) = 35816f81ef480d884f8a538df92af57cd3403b4c 
38SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a 37SHA1 (patch-lib_include_vmblock__user.h) = fedbed79f997ce1e2c5a9d834374734ed56be51a
39SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968 38SHA1 (patch-lib_include_vmci__sockets.h) = fba82038daf87a08f04ddd541281122f0047e968
40SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624 39SHA1 (patch-lib_lock_ulSema.c) = 6908d4b453cbdb74100c9419da95a07db532c624
41SHA1 (patch-lib_misc_hostinfoPosix.c) = 4daea6167cee2be57cc3acc0caa710ca940d1eb7 40SHA1 (patch-lib_misc_hostinfoPosix.c) = 4daea6167cee2be57cc3acc0caa710ca940d1eb7
42SHA1 (patch-lib_misc_vthreadBase.c) = 8d2a2749d7ed343d2648f74546d69baab949e5cf 41SHA1 (patch-lib_misc_vthreadBase.c) = 8d2a2749d7ed343d2648f74546d69baab949e5cf
43SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7 42SHA1 (patch-lib_nicInfo_nicInfoInt.h) = 81d5e8625496218a679c0a87f30a08cc2e3af7a7
44SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 0f44134e1e256a46b5ce35fff91d0568649c1bad 43SHA1 (patch-lib_nicInfo_nicInfoPosix.c) = 0f44134e1e256a46b5ce35fff91d0568649c1bad
45SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 34602bb8a34a930e487ae594137eacda804c3fe0 44SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 34602bb8a34a930e487ae594137eacda804c3fe0
46SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b 45SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b
47SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e 46SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e
48SHA1 (patch-scripts_Makefile.am) = 5238c5cabf1125f9cd334349e5f67f1b7a568428 47SHA1 (patch-scripts_Makefile.am) = 5238c5cabf1125f9cd334349e5f67f1b7a568428
49SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf 48SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
50SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3 49SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-ag (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-ag 2016/10/09 03:41:56 1.3
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-ag 2018/09/20 21:41:16 1.4
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ag,v 1.3 2016/10/09 03:41:56 ryoon Exp $ 1$NetBSD: patch-ag,v 1.4 2018/09/20 21:41:16 ryoon Exp $
2 2
3--- lib/dynxdr/dynxdr.c.orig 2016-02-16 20:06:45.000000000 +0000 3--- lib/dynxdr/dynxdr.c.orig 2018-06-23 10:04:02.000000000 +0000
4+++ lib/dynxdr/dynxdr.c 4+++ lib/dynxdr/dynxdr.c
5@@ -54,7 +54,7 @@ typedef struct DynXdrData { 5@@ -55,7 +55,7 @@ typedef struct DynXdrData {
6 * Mac OS X, FreeBSD and Solaris don't take a const parameter to the 6 * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
7 * "x_getpostn" function. 7 * "x_getpostn" function.
8 */ 8 */
9-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) 9-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(USE_TIRPC)
10+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__) 10+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(USE_TIRPC) || defined(__NetBSD__)
11 # define DYNXDR_GETPOS_CONST 11 # define DYNXDR_GETPOS_CONST
12 #else 12 #else
13 # define DYNXDR_GETPOS_CONST const 13 # define DYNXDR_GETPOS_CONST const
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/open-vm-tools/patches/patch-ak (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-ak 2016/10/09 03:41:56 1.3
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-ak 2018/09/20 21:41:16 1.4
@@ -1,58 +1,76 @@ @@ -1,58 +1,76 @@
1$NetBSD: patch-ak,v 1.3 2016/10/09 03:41:56 ryoon Exp $ 1$NetBSD: patch-ak,v 1.4 2018/09/20 21:41:16 ryoon Exp $
2 2
3--- lib/file/filePosix.c.orig 2016-02-16 20:06:45.000000000 +0000 3--- lib/file/filePosix.c.orig 2018-06-23 10:04:02.000000000 +0000
4+++ lib/file/filePosix.c 4+++ lib/file/filePosix.c
5@@ -24,7 +24,7 @@ 5@@ -24,7 +24,7 @@
6  6
7 #include <sys/types.h> /* Needed before sys/vfs.h with glibc 2.0 --hpreg */ 7 #include <sys/types.h> /* Needed before sys/vfs.h with glibc 2.0 --hpreg */
8  8
9-#if defined(__FreeBSD__) 9-#if defined(__FreeBSD__)
10+#if defined(__FreeBSD__) || defined(__NetBSD__) 10+#if defined(__FreeBSD__) || defined(__NetBSD__)
11 # include <sys/param.h> 11 # include <sys/param.h>
12 # include <sys/mount.h> 12 # include <sys/mount.h>
13 #else 13 #else
14@@ -73,7 +73,7 @@ 14@@ -77,7 +77,7 @@
15  15
16 #include "unicodeOperations.h" 16 #include "unicodeOperations.h"
17  17
18-#if !defined(__FreeBSD__) && !defined(sun) 18-#if !defined(__FreeBSD__) && !defined(sun)
19+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) 19+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__)
20 #if !defined(__APPLE__) 20 #if !defined(__APPLE__)
21 static char *FilePosixLookupMountPoint(char const *canPath, Bool *bind); 21 static char *FilePosixLookupMountPoint(char const *canPath, Bool *bind);
22 #endif 22 #endif
23@@ -360,7 +360,7 @@ FileAttributes(const char *pathName, // 23@@ -364,7 +364,7 @@ FileAttributes(const char *pathName, //
24 *---------------------------------------------------------------------- 24 *----------------------------------------------------------------------
25 */ 25 */
26  26
27-#if !defined(__FreeBSD__) && !defined(sun) 27-#if !defined(__FreeBSD__) && !defined(sun)
28+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) 28+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__)
29 Bool 29 Bool
30 File_IsRemote(const char *pathName) // IN: Path name 30 File_IsRemote(const char *pathName) // IN: Path name
31 { 31 {
32@@ -909,7 +909,7 @@ File_SetFilePermissions(const char *path 32@@ -620,7 +620,7 @@ File_FullPath(const char *pathName) //
 33 if (ret == NULL) {
 34 char *dir;
 35 char *file;
 36-#if defined(__FreeBSD__) || defined(sun)
 37+#if defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
 38 char *realDir;
 39 #else
 40 char *ancestorPath;
 41@@ -628,7 +628,7 @@ File_FullPath(const char *pathName) //
 42 #endif
 43
 44 File_GetPathName(path, &dir, &file);
 45-#if defined(__FreeBSD__) || defined(sun)
 46+#if defined(__FreeBSD__) || defined(sun) || defined(__NetBSD__)
 47 realDir = Posix_RealPath(dir);
 48 if (realDir == NULL) {
 49 realDir = File_StripFwdSlashes(dir);
 50@@ -961,7 +961,7 @@ File_SetFilePermissions(const char *path
33 } 51 }
34  52
35  53
36-#if !defined(__FreeBSD__) && !defined(sun) 54-#if !defined(__FreeBSD__) && !defined(sun)
37+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__) 55+#if !defined(__FreeBSD__) && !defined(sun) && !defined(__NetBSD__)
38 /* 56 /*
39 *----------------------------------------------------------------------------- 57 *-----------------------------------------------------------------------------
40 * 58 *
41@@ -2006,7 +2006,7 @@ File_IsSameFile(const char *path1, // I 59@@ -2108,7 +2108,7 @@ File_IsSameFile(const char *path1, // I
42 { 60 {
43 struct stat st1; 61 struct stat st1;
44 struct stat st2; 62 struct stat st2;
45-#if !defined(sun) // Solaris does not have statfs 63-#if !defined(sun) // Solaris does not have statfs
46+#if !defined(sun) && !defined(__NetBSD__) // Solaris does not have statfs 64+#if !defined(sun) && !defined(__NetBSD__) // Solaris does not have statfs
47 struct statfs stfs1; 65 struct statfs stfs1;
48 struct statfs stfs2; 66 struct statfs stfs2;
49 #endif 67 #endif
50@@ -2049,7 +2049,7 @@ File_IsSameFile(const char *path1, // I 68@@ -2151,7 +2151,7 @@ File_IsSameFile(const char *path1, // I
51 return TRUE; 69 return TRUE;
52 } 70 }
53  71
54-#if !defined(sun) // Solaris does not have statfs 72-#if !defined(sun) // Solaris does not have statfs
55+#if !defined(sun) && !defined(__NetBSD__) // Solaris does not have statfs 73+#if !defined(sun) && !defined(__NetBSD__) // Solaris does not have statfs
56 if (Posix_Statfs(path1, &stfs1) != 0) { 74 if (Posix_Statfs(path1, &stfs1) != 0) {
57 return FALSE; 75 return FALSE;
58 } 76 }
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/open-vm-tools/patches/patch-bt (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-bt 2018/01/01 06:56:01 1.2
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-bt 2018/09/20 21:41:16 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-bt,v 1.2 2018/01/01 06:56:01 ryoon Exp $ 1$NetBSD: patch-bt,v 1.3 2018/09/20 21:41:16 ryoon Exp $
2 2
3--- vmware-user-suid-wrapper/main.c.orig 2017-12-15 19:09:51.000000000 +0000 3--- vmware-user-suid-wrapper/main.c.orig 2018-06-23 10:03:28.000000000 +0000
4+++ vmware-user-suid-wrapper/main.c 4+++ vmware-user-suid-wrapper/main.c
5@@ -28,7 +28,7 @@ 5@@ -30,7 +30,7 @@
6 * remove blocks in the blocking file system. 6 * vmware-user.
7 */ 7 */
8  8
9-#if !defined(sun) && !defined(__FreeBSD__) && !defined(__linux__) 9-#if !defined(sun) && !defined(__FreeBSD__) && !defined(__linux__)
10+#if !defined(sun) && !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__) 10+#if !defined(sun) && !defined(__FreeBSD__) && !defined(__linux__) && !defined(__NetBSD__)
11 # error This program is not supported on your platform. 11 # error This program is not supported on your platform.
12 #endif 12 #endif
13  13
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac 2018/01/01 06:56:01 1.4
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac 2018/09/20 21:41:16 1.5
@@ -1,47 +1,56 @@ @@ -1,47 +1,56 @@
1$NetBSD: patch-configure.ac,v 1.4 2018/01/01 06:56:01 ryoon Exp $ 1$NetBSD: patch-configure.ac,v 1.5 2018/09/20 21:41:16 ryoon Exp $
2 2
3--- configure.ac.orig 2017-12-15 19:09:51.000000000 +0000 3--- configure.ac.orig 2018-06-23 10:03:29.000000000 +0000
4+++ configure.ac 4+++ configure.ac
5@@ -126,6 +126,9 @@ case "$host_os" in 5@@ -126,6 +126,9 @@ case "$host_os" in
6 [solaris*]) 6 [solaris*])
7 os="solaris" 7 os="solaris"
8 ;; 8 ;;
9+ [netbsd*]) 9+ [netbsd*])
10+ os="netbsd" 10+ os="netbsd"
11+ ;; 11+ ;;
12 [*]) 12 [*])
13 AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.]) 13 AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.])
14 ;; 14 ;;
15@@ -470,7 +473,7 @@ AC_VMW_CHECK_LIB([fuse], 15@@ -477,7 +480,7 @@ AC_VMW_CHECK_LIB([fuse],
16 [], 16 [],
17 [], 17 [],
18 [fuse.h], 18 [fuse.h],
19- [fuse_main], 19- [fuse_main],
20+ [fuse_exit], 20+ [fuse_exit],
21 [have_fuse=yes], 21 [have_fuse=yes],
22 [have_fuse=no; 22 [have_fuse=no;
23 AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])]) 23 AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])])
24@@ -1263,6 +1266,15 @@ if test "$os" = "linux"; then 24@@ -1136,7 +1139,7 @@ AC_PATH_PROG(
 25 [RPCGEN],
 26 [rpcgen],
 27 [not_found])
 28-if test "$RPCGEN" == "not_found"; then
 29+if test "$RPCGEN" = "not_found"; then
 30 AC_MSG_ERROR([rpcgen not found.])
 31 fi
 32
 33@@ -1363,6 +1366,15 @@ if test "$os" = "linux"; then
25 fi 34 fi
26 fi 35 fi
27  36
28+if test "$os" = "netbsd"; then 37+if test "$os" = "netbsd"; then
29+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm" 38+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
30+ #MODULES_DIR="/boot/modules" 39+ #MODULES_DIR="/boot/modules"
31+ 40+
32+ #MODULES="$MODULES vmmemctl" 41+ #MODULES="$MODULES vmmemctl"
33+ #MODULES="$MODULES vmxnet" 42+ #MODULES="$MODULES vmxnet"
34+ #MODULES="$MODULES vmblock" 43+ #MODULES="$MODULES vmblock"
35+fi 44+fi
36+ 45+
37 if test "$os" = "freebsd" || test "$os" = "kfreebsd-gnu"; then 46 if test "$os" = "freebsd" || test "$os" = "kfreebsd-gnu"; then
38 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm" 47 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
39 MODULES_DIR="/boot/modules" 48 MODULES_DIR="/boot/modules"
40@@ -1360,6 +1372,7 @@ fi 49@@ -1460,6 +1472,7 @@ fi
41 AM_CONDITIONAL(BUILD_HGFSMOUNTER, test "$buildHgfsmounter" = "yes") 50 AM_CONDITIONAL(BUILD_HGFSMOUNTER, test "$buildHgfsmounter" = "yes")
42 AM_CONDITIONAL(LINUX, test "$os" = "linux") 51 AM_CONDITIONAL(LINUX, test "$os" = "linux")
43 AM_CONDITIONAL(SOLARIS, test "$os" = "solaris") 52 AM_CONDITIONAL(SOLARIS, test "$os" = "solaris")
44+AM_CONDITIONAL(NETBSD, test "$os" = "netbsd") 53+AM_CONDITIONAL(NETBSD, test "$os" = "netbsd")
45 AM_CONDITIONAL(FREEBSD, test "$os" = "freebsd" -o "$os" = "kfreebsd-gnu") 54 AM_CONDITIONAL(FREEBSD, test "$os" = "freebsd" -o "$os" = "kfreebsd-gnu")
46 AM_CONDITIONAL(FREEBSD_CUSTOM_SYSDIR, 55 AM_CONDITIONAL(FREEBSD_CUSTOM_SYSDIR,
47 test \( "$os" = "freebsd" -o "$os" = "kfreebsd-gnu" \) -a -n "$SYSDIR") 56 test \( "$os" = "freebsd" -o "$os" = "kfreebsd-gnu" \) -a -n "$SYSDIR")
File Deleted: pkgsrc/sysutils/open-vm-tools/patches/Attic/patch-lib_include_vm__basic__types.h