CVS commit: pkgsrc/sysutils/open-vm-tools

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/sysutils/open-vm-tools
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Tue, 7 Dec 2021 18:25:46 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Dec  7 18:25:46 UTC 2021

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile PLIST distinfo
        pkgsrc/sysutils/open-vm-tools/patches: patch-configure.ac
            patch-libDeployPkg_linuxDeployment.c
            patch-libDeployPkg_processPosix.c patch-lib_rpcChannel_rpcChannel.c
            patch-scripts_Makefile.am patch-services_vmtoolsd_Makefile.am
Added Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-libguestlib_Makefile.am
            patch-services_plugins_guestInfo_perfMonLinux.c
Removed Files:
        pkgsrc/sysutils/open-vm-tools/patches: patch-aj
            patch-lib_nicInfo_nicInfoPosix.c

Log Message:
open-vm-tools: updated to 11.3.5

open-vm-tools 11.3.5

For issues resolved in this release, see Resolved Issues section.

Added a configurable logging capability to the network script.

The network script has been updated to:

use vmware-toolbox-cmd to query any network logging configuration from the tools.conf file.
use vmtoolsd --cmd "log ..." to log a message to the vmx logfile when the logging handler is configured to "vmx" or when the logfile is full or is not writeable.
The hgfsmounter (mount.vmhgfs) command has been removed from open-vm-tools.

The hgfsmounter (mount.vmhgfs) command is no longer used in Linux open-vm-tools. It has been replaced by hgfs-fuse. Therefore, removing all references to the hgfsmounter in Linux builds.

Open-vm-tools 11.3.0

A small command line tool, vmwgfxctrl, has been added to open-vm-tools for Linux that can be used to control various aspects of the vmwgfx Linux kernel module. Currently it can both display and set 
the current topology of the vmwgfx kernel driver. It is useful when trying to configure custom resolutions on recent Linux distributions, including multi-monitor setups.
A command line tool, vmware-alias-import, has been added to open-vm-tools that can be used to import vgauth config data and apply it to the running vgauth service.


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/open-vm-tools/PLIST
cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/open-vm-tools/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/sysutils/open-vm-tools/patches/patch-aj
cvs rdiff -u -r1.5 -r1.6 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_linuxDeployment.c \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c \
    pkgsrc/sysutils/open-vm-tools/patches/patch-services_vmtoolsd_Makefile.am
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c \
    pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-lib_nicInfo_nicInfoPosix.c
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.101 pkgsrc/sysutils/open-vm-tools/Makefile:1.102
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.101        Wed Apr 21 11:42:43 2021
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Tue Dec  7 18:25:45 2021
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile,v 1.101 2021/04/21 11:42:43 adam Exp $
+# $NetBSD: Makefile,v 1.102 2021/12/07 18:25:45 adam Exp $
 
-OVTVER=                10.3.0
-DISTNAME=      open-vm-tools-${OVTVER}-8931395
+OVTVER=                11.3.5
+DISTNAME=      open-vm-tools-${OVTVER}-18557794
 PKGNAME=       open-vm-tools-${OVTVER}
-PKGREVISION=   13
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=vmware/}
+GITHUB_RELEASE=        stable-${OVTVER}
 
 MAINTAINER=    agc%NetBSD.org@localhost
 HOMEPAGE=      https://github.com/vmware/open-vm-tools
 COMMENT=       Open source VMware tools
 LICENSE=       gnu-lgpl-v2.1
 
-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
 
 GCC_REQD+=     4.8
@@ -64,6 +60,7 @@ pre-configure:
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/xml-security-c/buildlink3.mk"
+.include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/fuse.buildlink3.mk"
 .include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/open-vm-tools/PLIST
diff -u pkgsrc/sysutils/open-vm-tools/PLIST:1.4 pkgsrc/sysutils/open-vm-tools/PLIST:1.5
--- pkgsrc/sysutils/open-vm-tools/PLIST:1.4     Mon Jan  1 06:56:01 2018
+++ pkgsrc/sysutils/open-vm-tools/PLIST Tue Dec  7 18:25:45 2021
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2018/01/01 06:56:01 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/12/07 18:25:45 adam Exp $
 bin/vmhgfs-fuse
 bin/vmtoolsd
 bin/vmware-checkvm
@@ -38,8 +38,19 @@ share/examples/vmware-tools/statechange.
 share/examples/vmware-tools/suspend-vm-default
 share/open-vm-tools/messages/de/toolboxcmd.vmsg
 share/open-vm-tools/messages/de/vmtoolsd.vmsg
+share/open-vm-tools/messages/en/toolboxcmd.vmsg
+share/open-vm-tools/messages/en/vmtoolsd.vmsg
+share/open-vm-tools/messages/es/toolboxcmd.vmsg
+share/open-vm-tools/messages/es/vmtoolsd.vmsg
+share/open-vm-tools/messages/fr/toolboxcmd.vmsg
+share/open-vm-tools/messages/fr/vmtoolsd.vmsg
+share/open-vm-tools/messages/it/toolboxcmd.vmsg
+share/open-vm-tools/messages/it/vmtoolsd.vmsg
 share/open-vm-tools/messages/ja/toolboxcmd.vmsg
 share/open-vm-tools/messages/ja/vmtoolsd.vmsg
 share/open-vm-tools/messages/ko/toolboxcmd.vmsg
 share/open-vm-tools/messages/ko/vmtoolsd.vmsg
 share/open-vm-tools/messages/zh_CN/toolboxcmd.vmsg
+share/open-vm-tools/messages/zh_CN/vmtoolsd.vmsg
+share/open-vm-tools/messages/zh_TW/toolboxcmd.vmsg
+share/open-vm-tools/messages/zh_TW/vmtoolsd.vmsg

Index: pkgsrc/sysutils/open-vm-tools/distinfo
diff -u pkgsrc/sysutils/open-vm-tools/distinfo:1.31 pkgsrc/sysutils/open-vm-tools/distinfo:1.32
--- pkgsrc/sysutils/open-vm-tools/distinfo:1.31 Tue Oct 26 11:19:55 2021
+++ pkgsrc/sysutils/open-vm-tools/distinfo      Tue Dec  7 18:25:45 2021
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.31 2021/10/26 11:19:55 nia Exp $
+$NetBSD: distinfo,v 1.32 2021/12/07 18:25:45 adam Exp $
 
-BLAKE2s (open-vm-tools-10.3.0-8931395.tar.gz) = c03096cacb4fdcc4a5843653b1a3ea0fc94d5ce688516f8748874994c3dc6be4
-SHA512 (open-vm-tools-10.3.0-8931395.tar.gz) = 627056db94b79aa7782324ed1a71e7f0c2420f0a0d76d3e65b84035b1350e29757a1412cbf195ef3d79fae37ddd6f17c6892ea2c64dbfa331854ded016965604
-Size (open-vm-tools-10.3.0-8931395.tar.gz) = 4638881 bytes
+BLAKE2s (open-vm-tools-11.3.5-18557794.tar.gz) = 6093fe8c71a826684fdc8eed50c3367450097b0fd94e39a0a23e45f44a97a635
+SHA512 (open-vm-tools-11.3.5-18557794.tar.gz) = fa31f5615c9c90865ba9122f7fcd0831068d48defee30a5f5c620e744b76ccd5b7cc2de20cea4e37b596f99619ffb7bb47774de04e7c4bea666c7c0b6fa1560e
+Size (open-vm-tools-11.3.5-18557794.tar.gz) = 4218935 bytes
 SHA1 (patch-ag) = a54f2a76e7b08c8c005a576d4e43ede3f0e0c9da
 SHA1 (patch-ah) = 2f59c9d650d378a84118991f75c59281a4836aaa
 SHA1 (patch-ai) = 3e8c67a33f6072319f1741bda960377fc2663b06
-SHA1 (patch-aj) = e0bba963e3eed96cf7ae5b0e439a16524194e4df
 SHA1 (patch-ak) = 07f926ccc90f07301075e1fb63769f8c1e926f75
 SHA1 (patch-aq) = 512a662530ef96c905eb61f6f9e459d6cd1c4b8e
 SHA1 (patch-ar) = b06873f37ac826912e647f2349dc88053bf2cb67
@@ -24,9 +23,9 @@ SHA1 (patch-bh) = 813a390478247b12c0ec0d
 SHA1 (patch-bm) = c868260b8eea95166c727c9542747c0503c65892
 SHA1 (patch-bt) = 98afde7ca576c17324d96e115ba4f64b901931ba
 SHA1 (patch-bu) = 33da24db6d7e3dd75ee6f4f1249772de506ab64d
-SHA1 (patch-configure.ac) = 292f4144bb635127b2b2e011af684034a0d423ce
-SHA1 (patch-libDeployPkg_linuxDeployment.c) = f50c7ff2fa07ab15716128654cc814a81cb924af
-SHA1 (patch-libDeployPkg_processPosix.c) = 4b7688d44f1ca8dcd40076391dc0fb9a627bfebe
+SHA1 (patch-configure.ac) = 6297ac4c79f311ef656231cca810e8d01341fd66
+SHA1 (patch-libDeployPkg_linuxDeployment.c) = 00371f8f986af252e91ebbe4524f8df93e0d2a42
+SHA1 (patch-libDeployPkg_processPosix.c) = 4714cd769331c3454313c6409a4e39f936f08529
 SHA1 (patch-lib_dynxdr_xdrutil.c) = 2a644aeb47bcef7f4db953250b116ec700940531
 SHA1 (patch-lib_file_file.c) = e9ee13e3f5dcdabdf3013095e2af31a65d5afaab
 SHA1 (patch-lib_guestApp_guestApp.c) = ed916ad0726b8d992319828f8f3a4115d7aba753
@@ -39,16 +38,17 @@ SHA1 (patch-lib_lock_ulSema.c) = 6908d4b
 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
+SHA1 (patch-lib_rpcChannel_rpcChannel.c) = 4133707d70844eb12c25c48d6bb0b26a370987b3
 SHA1 (patch-lib_user_utilBacktrace.c) = 741cc72d64f962fa0aa48e90b1f912f422c5dd8b
+SHA1 (patch-libguestlib_Makefile.am) = fff8e8df30c91ffb4fd2c14017633be1b3cb47ec
 SHA1 (patch-network) = 21a9196b4ce6101450bfd9ea6fcb283a9ba4f56e
-SHA1 (patch-scripts_Makefile.am) = 5238c5cabf1125f9cd334349e5f67f1b7a568428
+SHA1 (patch-scripts_Makefile.am) = 295d0b5ab46f9d9df28a7b23ab4a5449fa1528f7
 SHA1 (patch-scripts_netbsd_network) = 0bb7e6f71fa811e1c789a4d0825b4bd0181fb2cf
 SHA1 (patch-services_plugins_dndcp_dnd_dndLinux.c) = d959de9443581ad53de394079fb85bee1bdda8c3
+SHA1 (patch-services_plugins_guestInfo_perfMonLinux.c) = be7912f53989d298b5965cb566085cd0a0e5cc90
 SHA1 (patch-services_plugins_timeSync_Makefile.am) = c92d64573e7c5718e955d32991c8951ea2408d43
 SHA1 (patch-services_plugins_vix_vixTools.c) = a7e9df7fde7997315ef0ea77c50bbf1d410a2d9d
-SHA1 (patch-services_vmtoolsd_Makefile.am) = 8a34599f5bd9722333de1ecf741a27a0636104c5
+SHA1 (patch-services_vmtoolsd_Makefile.am) = 558ed58e8fc6d933f0a9698c865b33f88a91c51c
 SHA1 (patch-vgauth_common_VGAuthLog.c) = 9beacc4665fb6133059279be2594892ebb6ba5d9
 SHA1 (patch-vgauth_lib_common.c) = 0d949bc3c4a00a92f89177e4f20ef2f848f78532
 SHA1 (patch-vgauth_lib_impersonateLinux.c) = 1c925eab81525df06e4ebf906f835170b4320768

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.5 pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.6
--- pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac:1.5        Thu Sep 20 21:41:16 2018
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-configure.ac    Tue Dec  7 18:25:46 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure.ac,v 1.5 2018/09/20 21:41:16 ryoon Exp $
+$NetBSD: patch-configure.ac,v 1.6 2021/12/07 18:25:46 adam Exp $
 
---- configure.ac.orig  2018-06-23 10:03:29.000000000 +0000
+--- configure.ac.orig  2021-08-31 09:02:50.000000000 +0000
 +++ configure.ac
-@@ -126,6 +126,9 @@ case "$host_os" in
+@@ -129,6 +129,9 @@ case "$host_os" in
     [solaris*])
        os="solaris"
        ;;
@@ -12,7 +12,7 @@ $NetBSD: patch-configure.ac,v 1.5 2018/0
     [*])
        AC_MSG_WARN([This is an untested and unsupported Operating System. Proceed at your own peril.])
        ;;
-@@ -477,7 +480,7 @@ AC_VMW_CHECK_LIB([fuse],
+@@ -525,7 +528,7 @@ AC_VMW_CHECK_LIB([fuse],
                   [],
                   [],
                   [fuse.h],
@@ -21,7 +21,7 @@ $NetBSD: patch-configure.ac,v 1.5 2018/0
                   [have_fuse=yes],
                   [have_fuse=no;
                    AC_MSG_WARN([Fuse is missing, vmblock-fuse/vmhgfs-fuse will be disabled.])])
-@@ -1136,7 +1139,7 @@ AC_PATH_PROG(
+@@ -1140,7 +1143,7 @@ AC_PATH_PROG(
     [RPCGEN],
     [rpcgen],
     [not_found])
@@ -30,7 +30,7 @@ $NetBSD: patch-configure.ac,v 1.5 2018/0
     AC_MSG_ERROR([rpcgen not found.])
  fi
  
-@@ -1363,6 +1366,15 @@ if test "$os" = "linux"; then
+@@ -1362,6 +1365,15 @@ if test "$os" = "linux"; then
     fi
  fi
  
@@ -46,8 +46,8 @@ $NetBSD: patch-configure.ac,v 1.5 2018/0
  if test "$os" = "freebsd" || test "$os" = "kfreebsd-gnu"; then
     LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
     MODULES_DIR="/boot/modules"
-@@ -1460,6 +1472,7 @@ fi
- AM_CONDITIONAL(BUILD_HGFSMOUNTER, test "$buildHgfsmounter" = "yes")
+@@ -1459,6 +1471,7 @@ fi
+ 
  AM_CONDITIONAL(LINUX, test "$os" = "linux")
  AM_CONDITIONAL(SOLARIS, test "$os" = "solaris")
 +AM_CONDITIONAL(NETBSD, test "$os" = "netbsd")

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_linuxDeployment.c
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_linuxDeployment.c:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_linuxDeployment.c:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_linuxDeployment.c:1.1      Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_linuxDeployment.c  Tue Dec  7 18:25:46 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-libDeployPkg_linuxDeployment.c,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-libDeployPkg_linuxDeployment.c,v 1.2 2021/12/07 18:25:46 adam Exp $
 
---- libDeployPkg/linuxDeployment.c.orig        2016-02-16 20:06:47.000000000 +0000
+--- libDeployPkg/linuxDeployment.c.orig        2021-08-31 09:03:13.000000000 +0000
 +++ libDeployPkg/linuxDeployment.c
-@@ -1058,7 +1058,7 @@ ExtractZipPackage(const char* pkgName,
+@@ -1583,7 +1583,7 @@ ExtractZipPackage(const char* pkgName,
  {
     ProcessHandle h;
     char* args[32];
@@ -11,16 +11,16 @@ $NetBSD: patch-libDeployPkg_linuxDeploym
  
     int pkgFd, zipFd;
     char zipName[1024];
-@@ -1106,9 +1106,9 @@ ExtractZipPackage(const char* pkgName,
-    sLog(log_info, "unzip output: %s\n", Process_GetStdout(h));
+@@ -1644,9 +1644,9 @@ ExtractZipPackage(const char* pkgName,
+    sLog(log_info, "unzip output: '%s'.", Process_GetStdout(h));
  
     // Assume zip failed if it wrote to stderr
 -   stderr = Process_GetStderr(h);
 -   if (strlen(stderr) > 0) {
--      sLog(log_error, "Package unzip failed: %s\n", stderr);
+-      sLog(log_error, "Package unzip failed: '%s'.", stderr);
 +   mystderr = Process_GetStderr(h);
 +   if (strlen(mystderr) > 0) {
-+      sLog(log_error, "Package unzip failed: %s\n", mystderr);
++      sLog(log_error, "Package unzip failed: '%s'.", mystderr);
        ret = FALSE;
     }
  
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c:1.1 Fri Dec 23 04:11:03 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-lib_rpcChannel_rpcChannel.c     Tue Dec  7 18:25:46 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_rpcChannel_rpcChannel.c,v 1.1 2016/12/23 04:11:03 ryoon Exp $
+$NetBSD: patch-lib_rpcChannel_rpcChannel.c,v 1.2 2021/12/07 18:25:46 adam Exp $
 
---- lib/rpcChannel/rpcChannel.c.orig   2016-09-29 10:07:22.000000000 +0000
+--- lib/rpcChannel/rpcChannel.c.orig   2021-08-31 09:03:11.000000000 +0000
 +++ lib/rpcChannel/rpcChannel.c
-@@ -272,7 +272,11 @@ RpcChannelXdrWrapper(RpcInData *data,
+@@ -308,7 +308,11 @@ RpcChannelXdrWrapper(RpcInData *data,
           goto exit;
        }
  
@@ -12,9 +12,9 @@ $NetBSD: patch-lib_rpcChannel_rpcChannel
        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
+ 
+          /*
+@@ -378,7 +382,11 @@ RpcChannel_BuildXdrCommand(const char *c
        goto exit;
     }
  
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-services_vmtoolsd_Makefile.am
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-services_vmtoolsd_Makefile.am:1.1 pkgsrc/sysutils/open-vm-tools/patches/patch-services_vmtoolsd_Makefile.am:1.2
--- pkgsrc/sysutils/open-vm-tools/patches/patch-services_vmtoolsd_Makefile.am:1.1       Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-services_vmtoolsd_Makefile.am   Tue Dec  7 18:25:46 2021
@@ -1,25 +1,25 @@
-$NetBSD: patch-services_vmtoolsd_Makefile.am,v 1.1 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-services_vmtoolsd_Makefile.am,v 1.2 2021/12/07 18:25:46 adam Exp $
 
---- services/vmtoolsd/Makefile.am.orig 2016-02-16 20:06:48.000000000 +0000
+--- services/vmtoolsd/Makefile.am.orig 2021-08-31 09:02:49.000000000 +0000
 +++ services/vmtoolsd/Makefile.am
-@@ -15,8 +15,10 @@
+@@ -15,6 +15,7 @@
  ### Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  ################################################################################
  
 +EGDIR = @datarootdir@/examples
-+
  bin_PROGRAMS = vmtoolsd
--pamdir = $(PAM_PREFIX)/pam.d
-+pamdir = $(EGDIR)/vmware-tools/pam.d
- 
  
  vmtoolsd_CPPFLAGS =
-@@ -83,7 +85,7 @@ install-data-hook:
+@@ -79,9 +80,9 @@ install-data-hook:
        @INSTVMSG@ vmtoolsd $(srcdir)/l10n $(DESTDIR)$(datadir)
  
  install-exec-hook:
 -      $(INSTALL) -d $(DESTDIR)/etc/vmware-tools
+-      $(INSTALL) -d $(DESTDIR)/$(PAM_PREFIX)/pam.d/
+-      $(INSTALL) $(top_srcdir)/pam/generic $(DESTDIR)/$(PAM_PREFIX)/pam.d/vmtoolsd
 +      $(INSTALL) -d $(DESTDIR)/${EGDIR}/vmware-tools
++      $(INSTALL) -d $(DESTDIR)/$(EGDIR)/vmware-tools/pam.d
++      $(INSTALL) $(top_srcdir)/pam/generic $(DESTDIR)/$(EGDIR)/vmware-tools/pam.d/vmtoolsd
  
  uninstall-hook:
-       rm -rf $(DESTDIR)/etc/vmware-tools
+       rm -f $(DESTDIR)/$(PAM_PREFIX)/pam.d/vmtoolsd

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c:1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c:1.3
--- pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c:1.2 Fri Dec 23 04:11:03 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-libDeployPkg_processPosix.c     Tue Dec  7 18:25:46 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-libDeployPkg_processPosix.c,v 1.2 2016/12/23 04:11:03 ryoon Exp $
+$NetBSD: patch-libDeployPkg_processPosix.c,v 1.3 2021/12/07 18:25:46 adam Exp $
 
---- libDeployPkg/processPosix.c.orig   2016-09-29 10:05:27.000000000 +0000
+--- libDeployPkg/processPosix.c.orig   2021-08-31 09:03:13.000000000 +0000
 +++ libDeployPkg/processPosix.c
-@@ -28,6 +28,7 @@
- #include <unistd.h>
+@@ -29,6 +29,7 @@
  #include <fcntl.h>
  #include <sys/wait.h>
+ #include <stdlib.h>
 +#include <signal.h>
  
  #include "util.h"
Index: pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am
diff -u pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.2 pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.3
--- pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am:1.2 Sun Oct  9 03:41:56 2016
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-scripts_Makefile.am     Tue Dec  7 18:25:46 2021
@@ -1,8 +1,8 @@
-$NetBSD: patch-scripts_Makefile.am,v 1.2 2016/10/09 03:41:56 ryoon Exp $
+$NetBSD: patch-scripts_Makefile.am,v 1.3 2021/12/07 18:25:46 adam Exp $
 
---- scripts/Makefile.am.orig   2016-02-16 20:06:47.000000000 +0000
+--- scripts/Makefile.am.orig   2021-08-31 09:02:49.000000000 +0000
 +++ scripts/Makefile.am
-@@ -3,10 +3,10 @@ defaultscripts += poweroff-vm-default
+@@ -20,7 +20,8 @@ defaultscripts += poweroff-vm-default
  defaultscripts += suspend-vm-default
  defaultscripts += resume-vm-default
  
@@ -10,9 +10,5 @@ $NetBSD: patch-scripts_Makefile.am,v 1.2
 +EGDIR = @datarootdir@/examples
 +confdir = ${EGDIR}/vmware-tools
  
--conf_SCRIPTS = ./common/vm-support
--conf_SCRIPTS += ./common/statechange.subr
-+conf_SCRIPTS = ./common/statechange.subr
- if ENABLE_GRABBITMQPROXY
-    conf_SCRIPTS += ./common/guestproxy-ssl.conf
- endif
+ conf_SCRIPTS = ./common/statechange.subr
+ conf_SCRIPTS += $(defaultscripts)

Added files:

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am:1.3
--- /dev/null   Tue Dec  7 18:25:46 2021
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-libguestlib_Makefile.am Tue Dec  7 18:25:46 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-libguestlib_Makefile.am,v 1.3 2021/12/07 18:25:46 adam Exp $
+
+Do not link against dl.
+
+--- libguestlib/Makefile.am.orig       2021-12-07 13:10:18.901007820 +0000
++++ libguestlib/Makefile.am
+@@ -51,7 +51,6 @@ libguestlib_la_SOURCES += $(libguestlib_
+ endif
+ 
+ libguestlib_la_LDFLAGS =
+-libguestlib_la_LDFLAGS += -Wl,-ldl
+ libguestlib_la_LDFLAGS += -Wl,-lrt
+ # We require GCC, so we're fine passing compiler-specific flags.
+ # Needed for OS's that don't link shared libraries against libc by default, e.g. FreeBSD

Index: pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c
diff -u /dev/null pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c:1.1
--- /dev/null   Tue Dec  7 18:25:46 2021
+++ pkgsrc/sysutils/open-vm-tools/patches/patch-services_plugins_guestInfo_perfMonLinux.c       Tue Dec  7 18:25:46 2021
@@ -0,0 +1,24 @@
+$NetBSD: patch-services_plugins_guestInfo_perfMonLinux.c,v 1.1 2021/12/07 18:25:46 adam Exp $
+
+uselocale() is not available in NetBSD.
+
+--- services/plugins/guestInfo/perfMonLinux.c.orig     2021-12-07 13:15:52.237512911 +0000
++++ services/plugins/guestInfo/perfMonLinux.c
+@@ -1587,7 +1587,7 @@ GuestInfoTakeSample(DynBuf *statBuf)  //
+     */
+    newLoc = newlocale(LC_ALL_MASK, "C", (locale_t)0);
+    if (newLoc != (locale_t)0) {
+-      prevLoc = uselocale(newLoc);
++      prevLoc = setlocale(LC_ALL, newLoc);
+    } else {
+       g_warning("%s: newlocale failed, error=%d.\n", __FUNCTION__, errno);
+    }
+@@ -1600,7 +1600,7 @@ GuestInfoTakeSample(DynBuf *statBuf)  //
+ 
+    if (newLoc != (locale_t)0) {
+       /* Restore thread previous locale */
+-      uselocale(prevLoc);
++      setlocale(LC_ALL, prevLoc);
+       freelocale(newLoc);
+    }
+

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index