Merge ~paelzer/ubuntu/+source/open-vm-tools:bug-1844834-v11-eoan into ubuntu/+source/open-vm-tools:ubuntu/eoan-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1844834-open-vm-tools-11-sru

[Rafael David Tinoco (rafaeldtinoco)]

The way I see this, you're basically uploading the same source package (as focal) to eoan, with a single ubuntu changelog entry and maintainer change. All the delta is caused by the previous upstream version being compared to this new one, correct ? I'm +1 to this. I wonder where is the disco and bionic merges (as present in the PPA).

+1 on my side.

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks for the review.
Hmm, B+D should be open as well, looking for them ...

[Christian Ehrhardt  (paelzer)]

Ah now I know, I had identified issues in them as older GCC needed some minor tweaks.
But those are fixed now, B+D are now open for review as well.

[Christian Ehrhardt  (paelzer)]

Thanks for the review, Tags pushed and uploaded

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 3f754e0..3912c83 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -1,9 +1,6 @@
-open-vm-tools 10.3.10 Release Notes
-=================================
+**Updated on: 17 OCT 2019**
 
-**Updated on: 14 MAR 2019**
-
-open-vm-tools | 14 MAR 2019 | Build 12406962
+VMware Tools | 17 OCT 2019 | Build 14773994
 
 Check for additions and updates to these release notes.
 
@@ -15,32 +12,33 @@ The release notes cover the following topics:
 *   [What's New](#whatsnew)
 *   [Before You Begin](#beforeyoubegin)
 *   [Internationalization](#i18n)
+*   [Product Support Notice](#productsupport)
 *   [End of Feature Support Notice](#endoffeaturesupport)
+*   [Compatibility Notes](#compatibility)
 *   [Guest Operating System Customization Support](#guestop)
 *   [Interoperability Matrix](#interop)
-*   [Resolved Issues](#resolvedissues)
 *   [Known Issues](#knownissues)
 
 What's New
 ----------
 
-*   **Resolved Issues: **There are some issues that are resolved in this release of open-vm-tools which are documented in the [Resolved Issues](#resolvedissues) section of this release notes.
+*   It is highly recommended to upgrade to this version of VMware Tools, if you are using the native service discovery feature in vRealize Operations Manager 8.0, or using the vRealize Operations Service Discovery Management Pack with previous releases of vRealize Operations Manager (7.x or before). For more details, refer [KB 75122](https://kb.vmware.com/s/article/75122).
 
 Before You Begin
 ----------------
 
-**Important note about upgrading to ESXi 5.5 Update 3b or later**
+**Important note about upgrading to ESXi 6.0 or later**
 
-Resolution on incompatibility and general guidelines: While upgrading ESXi hosts to ESXi 5.5 Update 3b or ESXi 6.0 Update 1 or later, and using older versions of Horizon View Agent, refer to the knowledge base articles:
+Resolution on incompatibility and general guidelines: While upgrading ESXi hosts to ESXi 6.0 or later, and using older versions of Horizon View Agent, refer to the knowledge base articles:
 
-*   [Connecting to View desktops with Horizon View Agent 5.3.5 or earlier hosted on ESXi 5.5 Update 3b or later fails with a black screen.](http://kb.vmware.com/kb/2144438)
-*   [Connecting to View desktops with Horizon View Agent 6.0.x or 6.1.x hosted on ESXi 5.5 Update 3b or later fails with a black screen.](http://kb.vmware.com/kb/2144518)
-*   [Connecting to View desktops with Horizon View Agent 6.1.x hosted on ESXi 6.0 Update 1 or later fails with a black screen.](http://kb.vmware.com/kb/2144453)
+*   [Connecting to View desktops with Horizon View Agent 5.3.5 or earlier hosted on ESXi 6.0 or later fails with a black screen.](http://kb.vmware.com/kb/2144438)
+*   [Connecting to View desktops with Horizon View Agent 6.0.x or 6.1.x hosted on ESXi 6.0 or later fails with a black screen.](http://kb.vmware.com/kb/2144518)
+*   [Connecting to View desktops with Horizon View Agent 6.1.x hosted on ESXi 6.0 or later fails with a black screen.](http://kb.vmware.com/kb/2144453)
 
 Internationalization
 --------------------
 
-open-vm-tools 10.3.10 is available in the following languages:
+open-vm-tools 11.0.1 is available in the following languages:
 
 *   English
 *   French
@@ -55,9 +53,12 @@ open-vm-tools 10.3.10 is available in the following languages:
 End of Feature Support Notice
 -----------------------------
 
-*   Support for Common Agent Framework (CAF) will be removed in the next major release of open-vm-tools.
-*   VMware Tools 10.3.5 freezes feature support for tar tools and OSPs   
-    The tar tools (linux.iso) and OSPs shipped with open-vm-tools 10.3.5 release will continue to be supported. However, releases after VMware Tools 10.3.5 will only include critical and security fixes and no new feature support in these types of open-vm-tools (tar tools and OSP's). It is recommended that customers use open-vm-tools for those operating systems that support open-vm-tools. For more information on different types of open-vm-tools, see [https://blogs.vmware.com/vsphere/2016/02/understanding-the-three-types-of-vm-tools.html](https://blogs.vmware.com/vsphere/2016/02/understanding-the-three-types-of-vm-tools.html)
+*   The tar tools (linux.iso) and OSPs shipped with VMware Tools 10.3.5 release will continue to be supported. However, releases after VMware Tools 10.3.5 will only include critical and security fixes and no new feature support in these types of VMware Tools (tar tools and OSP's). It is recommended that customers use open-vm-tools for those operating systems that support open-vm-tools. For more information on different types of VMware Tools, see [https://blogs.vmware.com/vsphere/2016/02/understanding-the-three-types-of-vm-tools.html](https://blogs.vmware.com/vsphere/2016/02/understanding-the-three-types-of-vm-tools.html)
+
+Compatibility Notes
+-------------------
+
+*   Starting with VMware Tools version 10.2.0, Perl script-based VMware Tools installation for FreeBSD has been discontinued. 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.
 
 Guest Operating System Customization Support
 --------------------------------------------
@@ -72,35 +73,55 @@ The [VMware Product Interoperability Matrix](http://partnerweb.vmware.com/comp_
 Resolved Issues
 ---------------
 
-*   **In certain cases, quiesced snapshots on Linux guests do not include backup manifests.**
+*   **Memory leak in vmtoolsd.**
 
-    On a Linux guest, if VMware Tools 10.3.5 gets an error when notifying the ESXi host of a quiesced snapshot's backup manifest file, VMware Tools logs an error and does not notify the ESXi host of the backup manifest file on subsequent quiesced snapshots. As a result, some quiesced snapshots do not include the backup manifest file, that would otherwise be available on the ESXi host. Such snapshots are not identified as quiesced by vSphere clients.
+    vmtoolsd leaks memory when the vSphere APIs ListGuestAliases and ListGuestMappedAliasers are used.
 
     This issue is fixed in this release.
 
 Known Issues
 ------------
 
+*   **Suspend Guest of Linux VM using any version of open-vm-tools may fail with some versions of SELinux.**
+    
+    A "Suspend Guest" operation on a Linux guest running any version of open-vm-tools and with SELinux enabled may stall and ultimately fail.
+    
+    The failure may appear as:  
+      - a "Failed to suspend the virtual machine" message display.  
+      - nothing happened and the "Suspend Guest" button is reactivated. IPv4 connections may be closed.  
+      - a delayed suspend happens but the IPv4 addresses are lost when the VM is resumed.
+    
+    Even an apparent "stall" which exceeds 30 seconds is an indication of the problem.
+    
+    For more details, see [KB 74722](https://kb.vmware.com/s/article/74722).
+    
+    Workaround:
+    
+    Update the selinux-policy and selinux-policy-targeted packages to the latest version available from the Linux vendor.  If package updates are not available or if the issue persists, then consider the following workaround:
+    
+    Create an exemption for the vmtools/NetworkManager denied access by using the audit2allow command to generate a local loadable SELinux policy module as outlined in [KB 74722](https://kb.vmware.com/s/article/74722).
+    
 *   **Drag functionality fails to work in Ubuntu.**
     
     Drag functionality fails to work in Ubuntu 16.04.4 32-bit virtual machine installed using easy install. Also, failure of copy and paste functionality is observed in the same system.
     
+    Note: This issue is applicable for open-vm-tools running on Workstation and Fusion.
+    
     Workaround:
     
     *   Add the modprobe.blacklist=vmwgfx linux kernel boot option.
     *   To gain access to larger resolutions, remove svga.guestBackedPrimaryAware = "TRUE" option from the VMX file.
-
 *   **Shared Folders mount is unavailable on Linux VM.**
     
     If the **Shared Folders** feature is enabled on a Linux VM while it is powered off, shared folders mount is not available on restart.
     
-    Workaround:
+    Note: This issue is applicable for open-vm-tools running on Workstation and Fusion.
     
-    If the VM is powered on, disable and enable the **Shared Folders** feature from the interface.
-    
-    For resolving the issue permanently, edit **/etc/fstab** and add an entry to mount the Shared Folders automatically on boot.
-    
-    For example, add the line:
+    Workaround:
     
+    If the VM is powered on, disable and enable the **Shared Folders** feature from the interface.  
+    For resolving the issue permanently, edit **/etc/fstab** and add an entry to mount the Shared Folders automatically on boot.  
+    For example, add the line:  
     vmhgfs-fuse   /mnt/hgfs    fuse    defaults,allow\_other    0    0
     
+
diff --git a/debian/.gitlab-ci.yml b/debian/.gitlab-ci.yml
new file mode 100644
index 0000000..62767c1
--- /dev/null
+++ b/debian/.gitlab-ci.yml
@@ -0,0 +1,14 @@
+include:
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+ - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+variables:
+ RELEASE: 'unstable'
+ SALSA_CI_DISABLE_APTLY: 0
+ SALSA_CI_DISABLE_AUTOPKGTEST: 0
+ SALSA_CI_DISABLE_BLHC: 0
+ SALSA_CI_DISABLE_LINTIAN: 0
+ SALSA_CI_DISABLE_PIUPARTS: 0
+ SALSA_CI_DISABLE_REPROTEST: 0
+ SALSA_CI_DISABLE_BUILD_PACKAGE_ALL: 0
+ SALSA_CI_DISABLE_BUILD_PACKAGE_ANY: 0
diff --git a/debian/changelog b/debian/changelog
index a78baf1..2d5b6e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 open-vm-tools (2:10.3.10-3ubuntu1) eoan; urgency=medium
 
   * Fix memory leaks in vix plugin (LP: #1847157)
@@ -12,6 +13,56 @@ open-vm-tools (2:10.3.10-3build1) eoan; urgency=medium
   * No-change upload with strops.h and sys/strops.h removed in glibc.
 
  -- Matthias Klose <[e-mail]>  Thu, 05 Sep 2019 11:05:22 +0000
+=======
+open-vm-tools (2:11.0.1-2ubuntu0.19.10.1) eoan; urgency=medium
+
+  * Update to latest release v11 (LP: #1844834)
+
+ -- Christian Ehrhardt <[e-mail]>  Wed, 30 Oct 2019 09:58:25 +0100
+
+open-vm-tools (2:11.0.1-2) unstable; urgency=medium
+
+  * [76c600f] Fix segfault for fs devices without /
+    See https://github.com/vmware/open-vm-tools/issues/378 for details.
+    Thanks to Mo Zhou (Closes: #942692)
+
+ -- Bernd Zeimetz <[e-mail]>  Tue, 22 Oct 2019 15:48:48 +0200
+
+open-vm-tools (2:11.0.1-1) unstable; urgency=medium
+
+  * [bb36e10] Update upstream source from tag 'upstream/11.0.1'
+    Update to upstream version '11.0.1'
+    with Debian dir 60c0d512096774b9a2a7cc9e4e94556b2893ae8a
+
+ -- Bernd Zeimetz <[e-mail]>  Tue, 22 Oct 2019 09:40:50 +0200
+
+open-vm-tools (2:11.0.0-2) unstable; urgency=medium
+
+  * [4cfe383] Update Vcs-Git/Browser to point to salsa.
+  * [bc253ad] Remove .travis.yml, add debian/.gitlab-ci.yml
+  * [c92ca3a] Add add_patch.sh script to add patches from upstream.
+  * [1d9b491] Add patch to remove deprecated inline functions
+  * [3e2e307] Rename lintian-override file properly
+
+ -- Bernd Zeimetz <[e-mail]>  Tue, 15 Oct 2019 23:25:24 +0200
+
+open-vm-tools (2:11.0.0-1) unstable; urgency=medium
+
+  [ goldstar611 ]
+  * [c138871] Ensure VGAuthService starts after AppArmor
+    https://gitlab.com/apparmor/apparmor/issues/13
+
+  [ Bernd Zeimetz ]
+  * [28ef841] New upstream version 11.0.0~0
+  * [f78ed2d] New upstream version 11.0.0
+    Closes: #940853
+  * [19efc80] Revert "Revert "Removing libdumbnet-dev.""
+    This reverts commit 31177fab964d92687501ab81774440a9b8d09e39.
+  * [bc14a8b] snapshot changelog
+  * [1c5e9ea] Dropping patches that were picked from upstream
+
+ -- Bernd Zeimetz <[e-mail]>  Mon, 30 Sep 2019 14:37:27 +0200
+>>>>>>> debian/changelog
 
 open-vm-tools (2:10.3.10-3) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index c568dac..6477170 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Build-Depends:
  debhelper (>= 11~), doxygen, libcunit1-dev,
- libdumbnet-dev, libfuse-dev, libgtkmm-3.0-dev, libgtk-3-dev,
+ libfuse-dev, libgtkmm-3.0-dev, libgtk-3-dev,
  libicu-dev, libnotify-dev, libpam0g-dev, libprocps-dev, libx11-dev,
  libxinerama-dev, libxss-dev, libxtst-dev,
  libmspack-dev,
@@ -15,8 +15,8 @@ Build-Depends:
  libdrm-dev,
 Standards-Version: 4.4.0
 Homepage: https://github.com/vmware/open-vm-tools
-Vcs-Git: https://github.com/bzed/pkg-open-vm-tools.git
-Vcs-Browser: https://github.com/bzed/pkg-open-vm-tools
+Vcs-Git: https://salsa.debian.org/vmware-packaging-team/pkg-open-vm-tools.git
+Vcs-Browser: https://salsa.debian.org/vmware-packaging-team/pkg-open-vm-tools
 
 Package: open-vm-tools
 Architecture: amd64 i386
diff --git a/debian/open-vm-tools.lintian b/debian/open-vm-tools.lintian-overrides
similarity index 100%
rename from debian/open-vm-tools.lintian
rename to debian/open-vm-tools.lintian-overrides
diff --git a/debian/open-vm-tools.vgauth.service b/debian/open-vm-tools.vgauth.service
index 86f03f2..1b00ca1 100644
--- a/debian/open-vm-tools.vgauth.service
+++ b/debian/open-vm-tools.vgauth.service
@@ -4,6 +4,7 @@ Documentation=http://github.com/vmware/open-vm-tools
 ConditionVirtualization=vmware
 DefaultDependencies=no
 After=systemd-remount-fs.service systemd-tmpfiles-setup.service
+After=apparmor.service
 PartOf=open-vm-tools.service
 
 [Service]
diff --git a/debian/patches/gcc9-drop-obsolete-G_INLINE_FUNC.patch b/debian/patches/89c0d4445_GitHub-Issue-367.-Remove-references-to-deprecated-G_INLINE_FUNC
similarity index 60%
rename from debian/patches/gcc9-drop-obsolete-G_INLINE_FUNC.patch
rename to debian/patches/89c0d4445_GitHub-Issue-367.-Remove-references-to-deprecated-G_INLINE_FUNC
index 490f616..a28cf83 100644
--- a/debian/patches/gcc9-drop-obsolete-G_INLINE_FUNC.patch
+++ b/debian/patches/89c0d4445_GitHub-Issue-367.-Remove-references-to-deprecated-G_INLINE_FUNC
@@ -1,16 +1,22 @@
-Description: G_INLINE_FUNC macro is deprecated, remove it
- GCC-9 deprecated detection is much harder, and even error disables won't
- catch deprecated macros. Per [1] this can now be safely replaced
- with "static inline"
- [1]: https://developer.gnome.org/glib/stable/glib-Miscellaneous-Macros.html#G-INLINE-FUNC:CAPS
-Forwarded: yes (https://github.com/vmware/open-vm-tools/issues/367)
-Author: Christian Ehrhardt <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1842301
-Last-Update: 2019-09-03
+From 89c0d444567eb525e8d083fb564c46d68e96660c Mon Sep 17 00:00:00 2001
+From: Oliver Kurth <[e-mail]>
+Date: Mon, 30 Sep 2019 16:24:27 -0700
+Subject: [PATCH] GitHub Issue #367. Remove references to deprecated
+ G_INLINE_FUNC.
 
+G_INLINE_FUNC was a work-around for compilers that didn't support
+static inline.  Change uses of it to static inline.
+---
+ open-vm-tools/lib/include/vmware/tools/plugin.h     | 2 +-
+ open-vm-tools/lib/include/vmware/tools/threadPool.h | 8 ++++----
+ open-vm-tools/lib/include/vmware/tools/utils.h      | 9 ---------
+ 3 files changed, 5 insertions(+), 14 deletions(-)
+
+diff --git a/open-vm-tools/lib/include/vmware/tools/plugin.h b/open-vm-tools/lib/include/vmware/tools/plugin.h
+index f9acc6a29..deefd1f3d 100644
 --- a/open-vm-tools/lib/include/vmware/tools/plugin.h
 +++ b/open-vm-tools/lib/include/vmware/tools/plugin.h
-@@ -281,7 +281,7 @@ typedef struct ToolsAppCtx {
+@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx {
   *
   * @return TRUE if COM is initialized when the function returns.
   */
@@ -19,6 +25,8 @@ Last-Update: 2019-09-03
  ToolsCore_InitializeCOM(ToolsAppCtx *ctx)
  {
     if (!ctx->comInitialized) {
+diff --git a/open-vm-tools/lib/include/vmware/tools/threadPool.h b/open-vm-tools/lib/include/vmware/tools/threadPool.h
+index 3f2082b3e..5880fbcff 100644
 --- a/open-vm-tools/lib/include/vmware/tools/threadPool.h
 +++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h
 @@ -91,7 +91,7 @@ typedef struct ToolsCorePool {
@@ -39,7 +47,7 @@ Last-Update: 2019-09-03
  ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
                           ToolsCorePoolCb cb,
                           gpointer data,
-@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ct
+@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
   *******************************************************************************
   */
  
@@ -48,7 +56,7 @@ Last-Update: 2019-09-03
  ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
                           guint taskId)
  {
-@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ct
+@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
   *******************************************************************************
   */
  
@@ -57,3 +65,26 @@ Last-Update: 2019-09-03
  ToolsCorePool_StartThread(ToolsAppCtx *ctx,
                            const gchar *threadName,
                            ToolsCorePoolCb cb,
+diff --git a/open-vm-tools/lib/include/vmware/tools/utils.h b/open-vm-tools/lib/include/vmware/tools/utils.h
+index f65745906..a3292d5c0 100644
+--- a/open-vm-tools/lib/include/vmware/tools/utils.h
++++ b/open-vm-tools/lib/include/vmware/tools/utils.h
+@@ -51,15 +51,6 @@
+ #  include <sys/time.h>
+ #endif
+ 
+-
+-/* Work around a glib limitation: it doesn't set G_INLINE_FUNC on Win32. */
+-#if defined(G_PLATFORM_WIN32)
+-#  if defined(G_INLINE_FUNC)
+-#     undef G_INLINE_FUNC
+-#  endif
+-#  define G_INLINE_FUNC static __inline
+-#endif
+-
+ #ifndef ABS
+ #  define ABS(x) (((x) >= 0) ? (x) : -(x))
+ #endif
+-- 
+2.23.0
+
diff --git a/debian/patches/add_patch.sh b/debian/patches/add_patch.sh
new file mode 100755
index 0000000..2085269
--- /dev/null
+++ b/debian/patches/add_patch.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+patchpath=`dirname ${0}`
+
+for hash in $@; do
+    fname=`git log -1 --pretty=format:'%h_%f' ${hash}`
+    git format-patch --stdout -N -1 ${hash} > "${fname}"
+    if ! grep -q ${fname} series; then
+        echo "${fname}" >> series
+    fi
+done
+
diff --git a/debian/patches/fix-buster-OS-reporting b/debian/patches/fix-buster-OS-reporting
deleted file mode 100644
index eb9b215..0000000
--- a/debian/patches/fix-buster-OS-reporting
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/open-vm-tools/lib/misc/hostinfoPosix.c
-+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
-@@ -814,7 +814,7 @@ HostinfoGetOSShortName(char *distro,
-          Str_Strcpy(distroShort, STR_OS_DEBIAN_8, distroShortSize);
-       } else if (strstr(distroLower, "9.")) {
-          Str_Strcpy(distroShort, STR_OS_DEBIAN_9, distroShortSize);
--      } else if (strstr(distroLower, "10.")) {
-+      } else if (strstr(distroLower, "10")) {
-          Str_Strcpy(distroShort, STR_OS_DEBIAN_10, distroShortSize);
-       }
-    } else if (StrUtil_StartsWith(distroLower, "enterprise linux") ||
diff --git a/debian/patches/fix_zfs_fs_detection b/debian/patches/fix_zfs_fs_detection
new file mode 100644
index 0000000..4fed620
--- /dev/null
+++ b/debian/patches/fix_zfs_fs_detection
@@ -0,0 +1,13 @@
+--- a/open-vm-tools/services/plugins/guestInfo/diskInfo.c
++++ b/open-vm-tools/services/plugins/guestInfo/diskInfo.c
+@@ -826,8 +826,9 @@ GuestInfoGetDiskDevice(const char *fsNam
+       /* Not an LVM; check if a basic block device. */
+       char blockDevPath[PATH_MAX];
+ 
++         char* x = strrchr(fsName, '/');
+       Str_Snprintf(blockDevPath, PATH_MAX,  "%s/%s", LINUX_SYS_BLOCK_DIR,
+-                   strrchr(fsName, '/') + 1);
++                   x != NULL ? x+1 : "");
+       GuestInfoLinuxBlockDevice(blockDevPath, partEntry, 1 /* first and only*/);
+    }
+ 
diff --git a/debian/patches/gcc9 b/debian/patches/gcc9
deleted file mode 100644
index 5499f44..0000000
--- a/debian/patches/gcc9
+++ /dev/null
@@ -1,1212 +0,0 @@
-commit c68172ef7f2d4f116078e2aba82986a8cab0b16e
-Author: Oliver Kurth <[e-mail]>
-Date:   Wed Feb 27 14:39:55 2019 -0800
-
-    GCC 9 caught several misaligned accesses and a format overflow.
-    
-    GCC 9 generated several instances of "Werror=address-of-packed-member"
-    in HGFS Fuse support code and hgfsmounter. There is also one instance of
-    "Werror=format-overflow" generated in util_misc.c.
-    
-    According to stackoverflow discussion -
-    https://stackoverflow.com/questions/8568432/is-gccs-attribute-packed-pragma-pack-unsafe,
-    x86 hardware handles misaligned access and does not exhibit any real
-    issues. However, GCC 9 generates misaligned access warning
-    ("Werror=address-of-packed-member) for all architectures. In case of
-    open-vm-tools build we treat warnings as errors and also we want code
-    to be as portable as possible in general unless there is a reason not
-    to do so.
-
---- a/open-vm-tools/hgfsmounter/hgfsmounter.c
-+++ b/open-vm-tools/hgfsmounter/hgfsmounter.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2006-2019 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
-@@ -514,11 +514,13 @@
-            HgfsMountInfo *mountInfo,   // OUT: mount data
-            int *flags)                 // OUT: mount flags
- {
-+   unsigned short fmask = 0;
-    ASSERT(option);
-    ASSERT(mountInfo);
- 
--   if (ParseMask(option, &mountInfo->fmask)) {
--      LOG("Setting mount fmask to %o\n", mountInfo->fmask);
-+   if (ParseMask(option, &fmask)) {
-+      LOG("Setting mount fmask to %o\n", fmask);
-+      mountInfo->fmask = fmask;
-       return TRUE;
-    }
- 
-@@ -548,11 +550,13 @@
-            HgfsMountInfo *mountInfo,   // OUT: mount data
-            int *flags)                 // OUT: mount flags
- {
-+   unsigned short dmask = 0;
-    ASSERT(option);
-    ASSERT(mountInfo);
- 
--   if (ParseMask(option, &mountInfo->dmask)) {
--      LOG("Setting mount dmask to %o\n", mountInfo->dmask);
-+   if (ParseMask(option, &dmask)) {
-+      LOG("Setting mount dmask to %o\n", dmask);
-+      mountInfo->dmask = dmask;
-       return TRUE;
-    }
- 
---- a/open-vm-tools/lib/hgfsServer/hgfsServer.c
-+++ b/open-vm-tools/lib/hgfsServer/hgfsServer.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
-+ * Copyright (C) 1998-2019 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
-@@ -6536,11 +6536,13 @@
-             payload = &reply->payload[0];
-          }
-          if (payload) {
-+            uint32 actualSize = 0;
-             status = HgfsPlatformReadFile(readFd, input->session, offset,
-                                           requiredSize, payload,
--                                          &reply->actualSize);
-+                                          &actualSize);
-             if (HGFS_ERROR_SUCCESS == status) {
-                reply->reserved = 0;
-+               reply->actualSize = actualSize;
-                replyPayloadSize = sizeof *reply;
- 
-                if (readUseDataBuffer) {
-@@ -6556,11 +6558,13 @@
-          break;
-       }
-    case HGFS_OP_READ: {
-+         uint32 actualSize = 0;
-          HgfsReplyRead *reply = replyRead;
- 
-          status = HgfsPlatformReadFile(readFd, input->session, offset, requiredSize,
--                                       reply->payload, &reply->actualSize);
-+                                       reply->payload, &actualSize);
-          if (HGFS_ERROR_SUCCESS == status) {
-+            reply->actualSize = actualSize;
-             replyPayloadSize = sizeof *reply + reply->actualSize;
-          } else {
-             LOG(4, ("%s: V1 Failed to read-> %d.\n", __FUNCTION__, status));
---- a/open-vm-tools/lib/misc/util_misc.c
-+++ b/open-vm-tools/lib/misc/util_misc.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 1998-2018 VMware, Inc. All rights reserved.
-+ * Copyright (C) 1998-2019 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
-@@ -719,8 +719,8 @@
-       ASSERT(!freeChunk[i]);
-       chunks[i] = expand;
-       if (chunks[i] == NULL) {
--	 Log("%s: Cannot allocate memory to expand \"%s\" in \"%s\".\n",
--             __FUNCTION__, expand, fileName);
-+	 Log("%s: Cannot allocate memory to expand $ in \"%s\".\n",
-+             __FUNCTION__, fileName);
- 	 goto out;
-       }
-       chunkSize[i] = strlen(expand);
---- a/open-vm-tools/vmhgfs-fuse/dir.c
-+++ b/open-vm-tools/vmhgfs-fuse/dir.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2013 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2013,2019 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
-@@ -54,38 +54,53 @@
-                        HgfsOp opUsed,       // IN: Op to be used
-                        HgfsReq *req)        // IN/OUT: Packet to write into
- {
--   char *name;
--   unsigned int *nameLength = NULL;
-    size_t reqSize;
--   int result;
- 
-    ASSERT(path);
-    ASSERT(req);
-    LOG(4, ("Path = %s \n", path));
-    switch (opUsed) {
-    case HGFS_OP_SEARCH_OPEN_V3: {
-+      int result;
-       HgfsRequestSearchOpenV3 *requestV3 = HgfsGetRequestPayload(req);
- 
--      /* We'll use these later. */
--      name = requestV3->dirName.name;
--      nameLength = &requestV3->dirName.length;
-       requestV3->dirName.flags = 0;
-       requestV3->dirName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-       requestV3->dirName.fid = HGFS_INVALID_HANDLE;
-       requestV3->reserved = 0;
-       reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                requestV3->dirName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed\n"));
-+         return -EINVAL;
-+      }
-+      LOG(4, ("After conversion = %s\n", requestV3->dirName.name));
-+      requestV3->dirName.length = result;
-+      reqSize += result;
-       break;
-    }
- 
-    case HGFS_OP_SEARCH_OPEN: {
-+      int result;
-       HgfsRequestSearchOpen *request;
- 
-       request = (HgfsRequestSearchOpen *)(HGFS_REQ_PAYLOAD(req));
- 
--      /* We'll use these later. */
--      name = request->dirName.name;
--      nameLength = &request->dirName.length;
-       reqSize = sizeof *request;
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                request->dirName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed\n"));
-+         return -EINVAL;
-+      }
-+      LOG(4, ("After conversion = %s\n", request->dirName.name));
-+      request->dirName.length = result;
-+      reqSize += result;
-       break;
-    }
- 
-@@ -94,21 +109,7 @@
-       return -EPROTO;
-    }
- 
--   /* Convert to CP name. */
--
--   LOG(4, ("After buildPath = %s\n", path));
--   result = CPName_ConvertTo(path,
--                             HGFS_LARGE_PACKET_MAX - (reqSize - 1),
--                             name);
--   if (result < 0) {
--      LOG(4, ("CP conversion failed\n"));
--      return -EINVAL;
--   }
--
--   LOG(4, ("After conversion = %s\n", name));
--
--   *nameLength = (uint32) result;
--   req->payloadSize = reqSize + result;
-+   req->payloadSize = reqSize;
- 
-    /* Fill in header here as payloadSize needs to be there. */
-    HgfsPackHeader(req, opUsed);
-@@ -149,7 +150,6 @@
-    int result;
-    HgfsOp opUsed;
-    HgfsStatus replyStatus;
--   HgfsHandle *replySearch;
- 
-    ASSERT(path);
-    req = HgfsGetNewRequest();
-@@ -161,16 +161,6 @@
- 
- retry:
-    opUsed = hgfsVersionSearchOpen;
--   if (opUsed == HGFS_OP_SEARCH_OPEN_V3) {
--      HgfsReplySearchOpenV3 *requestV3 = HgfsGetReplyPayload(req);
--
--     replySearch = &requestV3->search;
--
--   } else {
--      HgfsReplySearchOpen *request = (HgfsReplySearchOpen *)HGFS_REQ_PAYLOAD(req);
--
--      replySearch = &request->search;
--   }
- 
-    result = HgfsPackDirOpenRequest(path, opUsed, req);
-    if (result != 0) {
-@@ -187,8 +177,14 @@
- 
-       switch (result) {
-       case 0:
--         *handle = *replySearch;
--         LOG(6, ("Set handle to %u\n", *replySearch));
-+         if (opUsed == HGFS_OP_SEARCH_OPEN_V3) {
-+            HgfsReplySearchOpenV3 *requestV3 = HgfsGetReplyPayload(req);
-+            *handle = requestV3->search;
-+         } else {
-+            HgfsReplySearchOpen *request = (HgfsReplySearchOpen *)HGFS_REQ_PAYLOAD(req);
-+            *handle = request->search;
-+         }
-+         LOG(6, ("Set handle to %u\n", *handle));
-          break;
-       case -EPROTO:
-          /* Retry with older version(s). Set globally. */
-@@ -626,25 +622,30 @@
-                          HgfsOp opUsed,         // IN: Op to be used.
-                          HgfsReq *req)          // IN/OUT: Packet to write into
- {
--   char *fileName = NULL;
--   uint32 *fileNameLength;
-    size_t reqSize;
--   int result;
-+
- 
-    ASSERT(req);
- 
-    switch (opUsed) {
-    case HGFS_OP_CREATE_DIR_V3: {
-+      int result;
-       HgfsRequestCreateDirV3 *requestV3 = HgfsGetRequestPayload(req);
- 
-       reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
--      /* We'll use these later. */
--      fileName = requestV3->fileName.name;
--      fileNameLength = &requestV3->fileName.length;
-       requestV3->fileName.flags = 0;
-       requestV3->fileName.fid = HGFS_INVALID_HANDLE;
-       requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
--
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                requestV3->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      requestV3->fileName.length = result;
-+      reqSize += result;
-       requestV3->mask = HGFS_CREATE_DIR_MASK;
- 
-       /* Set permissions. */
-@@ -656,15 +657,23 @@
-       break;
-    }
-    case HGFS_OP_CREATE_DIR_V2: {
-+      int result;
-       HgfsRequestCreateDirV2 *requestV2;
- 
-       requestV2 = (HgfsRequestCreateDirV2 *)(HGFS_REQ_PAYLOAD(req));
- 
--      /* We'll use these later. */
--      fileName = requestV2->fileName.name;
--      fileNameLength = &requestV2->fileName.length;
-       reqSize = sizeof *requestV2;
- 
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                requestV2->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      requestV2->fileName.length = result;
-+      reqSize += result;
-       requestV2->mask = HGFS_CREATE_DIR_MASK;
- 
-       /* Set permissions. */
-@@ -675,15 +684,22 @@
-       break;
-    }
-    case HGFS_OP_CREATE_DIR: {
-+      int result;
-       HgfsRequestCreateDir *request;
- 
-       request = (HgfsRequestCreateDir *)(HGFS_REQ_PAYLOAD(req));
- 
--      /* We'll use these later. */
--      fileName = request->fileName.name;
--      fileNameLength = &request->fileName.length;
-       reqSize = sizeof *request;
--
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                request->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      request->fileName.length = result;
-+      reqSize += result;
-       /* Set permissions. */
-       request->permissions = (permsMode & S_IRWXU) >> 6;
-       break;
-@@ -693,18 +709,7 @@
-       return -EPROTO;
-    }
- 
--
--   /* Convert to CP name. */
--   result = CPName_ConvertTo(path,
--                             HGFS_LARGE_PACKET_MAX - (reqSize - 1),
--                             fileName);
--   if (result < 0) {
--      LOG(4, ("CP conversion failed.\n"));
--      return -EINVAL;
--   }
--
--   *fileNameLength = result;
--   req->payloadSize = reqSize + result;
-+   req->payloadSize = reqSize;
- 
-    /* Fill in header here as payloadSize needs to be there. */
-    HgfsPackHeader(req, opUsed);
-@@ -827,8 +832,6 @@
-    HgfsReq *req = NULL;
-    int result = 0;
-    HgfsStatus replyStatus;
--   char *fileName = NULL;
--   uint32 *fileNameLength;
-    uint32 reqSize;
-    HgfsOp opUsed;
-    HgfsAttrInfo newAttr = {0};
-@@ -862,8 +865,17 @@
- 
-       reqSize = sizeof(*request) + HgfsGetRequestHeaderSize();
-       request->hints = 0;
--      fileName = request->fileName.name;
--      fileNameLength = &request->fileName.length;
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize),
-+                                request->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         result = -EINVAL;
-+         goto out;
-+      }
-+      request->fileName.length = result;
-+      reqSize += result;
-       request->fileName.fid = HGFS_INVALID_HANDLE;
-       request->fileName.flags = 0;
-       request->fileName.caseType = HGFS_FILE_NAME_DEFAULT_CASE;
-@@ -874,24 +886,21 @@
- 
-       request = (HgfsRequestDelete *)(HGFS_REQ_PAYLOAD(req));
-       /* Fill out the request packet. */
--      fileName = request->fileName.name;
--      fileNameLength = &request->fileName.length;
-       reqSize = sizeof *request;
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize),
-+                                request->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         result = -EINVAL;
-+         goto out;
-+      }
-+      request->fileName.length = result;
-+      reqSize += result;
-    }
- 
--
--   /* Convert to CP name. */
--   result = CPName_ConvertTo(path,
--                             HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize),
--                             fileName);
--   if (result < 0) {
--      LOG(4, ("CP conversion failed.\n"));
--      result = -EINVAL;
--      goto out;
--   }
--
--   *fileNameLength = result;
--   req->payloadSize = reqSize + result;
-+   req->payloadSize = reqSize;
- 
-    /* Fill in header here as payloadSize needs to be there. */
-    HgfsPackHeader(req, opUsed);
---- a/open-vm-tools/vmhgfs-fuse/file.c
-+++ b/open-vm-tools/vmhgfs-fuse/file.c
-@@ -66,10 +66,7 @@
-                     HgfsOp opUsed,             // IN: Op to use
-                     HgfsReq *req)              // IN/OUT: Packet to write into
- {
--   char *name;
--   uint32 *nameLength;
-    size_t reqSize;
--   int result;
-    int openMode, openFlags;
- 
-    ASSERT(path);
-@@ -88,14 +85,22 @@
- 
-    switch (opUsed) {
-     case HGFS_OP_OPEN_V3: {
-+      int result;
-       HgfsRequestOpenV3 *requestV3 = HgfsGetRequestPayload(req);
- 
-       reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
- 
--      /* We'll use these later. */
--      name = requestV3->fileName.name;
--      nameLength = &requestV3->fileName.length;
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                requestV3->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
- 
-+      requestV3->fileName.length = result;
-+      reqSize += result;
-       /* Linux clients need case-sensitive lookups. */
-       requestV3->fileName.flags = 0;
-       requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-@@ -122,15 +127,24 @@
-    }
- 
-    case HGFS_OP_OPEN_V2: {
-+      int result;
-       HgfsRequestOpenV2 *requestV2;
- 
-       requestV2 = (HgfsRequestOpenV2 *)(HGFS_REQ_PAYLOAD(req));
- 
--      /* We'll use these later. */
--      name = requestV2->fileName.name;
--      nameLength = &requestV2->fileName.length;
-       reqSize = sizeof *requestV2;
- 
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                requestV2->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+
-+      requestV2->fileName.length = result;
-+      reqSize += result;
-       requestV2->mask = mask;
-       requestV2->mode = openMode;
-       requestV2->flags = openFlags;
-@@ -148,14 +162,23 @@
-       break;
-    }
-    case HGFS_OP_OPEN: {
-+      int result;
-       HgfsRequestOpen *request;
- 
-       request = (HgfsRequestOpen *)(HGFS_REQ_PAYLOAD(req));
--      /* We'll use these later. */
--      name = request->fileName.name;
--      nameLength = &request->fileName.length;
-       reqSize = sizeof *request;
- 
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (reqSize - 1),
-+                                request->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+
-+      request->fileName.length = result;
-+      reqSize += result;
-       request->mode = openMode;
-       request->flags = openFlags;
- 
-@@ -168,18 +191,7 @@
-       return -EPROTO;
-    }
- 
--
--   /* Convert to CP name. */
--   result = CPName_ConvertTo(path,
--                             HGFS_LARGE_PACKET_MAX - (reqSize - 1),
--                             name);
--   if (result < 0) {
--      LOG(4, ("CP conversion failed.\n"));
--      return -EINVAL;
--   }
--
--   *nameLength = (uint32) result;
--   req->payloadSize = reqSize + result;
-+   req->payloadSize = reqSize;
- 
-    /* Fill in header here as payloadSize needs to be there. */
-    HgfsPackHeader(req, opUsed);
-@@ -915,10 +927,6 @@
- HgfsRename(const char* from, const char* to)
- {
-    HgfsReq *req = NULL;
--   char *oldName;
--   char *newName;
--   uint32 *oldNameLength;
--   uint32 *newNameLength;
-    int result = 0;
-    uint32 reqSize;
-    HgfsOp opUsed;
-@@ -942,33 +950,41 @@
-    if (opUsed == HGFS_OP_RENAME_V3) {
-       HgfsRequestRenameV3 *requestV3 = HgfsGetRequestPayload(req);
- 
--      oldName = requestV3->oldName.name;
--      oldNameLength = &requestV3->oldName.length;
-       requestV3->hints = 0;
-       requestV3->oldName.flags = 0;
-       requestV3->oldName.fid = HGFS_INVALID_HANDLE;
-       requestV3->oldName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-       requestV3->reserved = 0;
-       reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
-+      /* Convert old name to CP format. */
-+      result = CPName_ConvertTo(from,
-+                                HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize),
-+                                requestV3->oldName.name);
-+      if (result < 0) {
-+         LOG(4, ("oldName CP conversion failed\n"));
-+         result = -EINVAL;
-+         goto out;
-+      }
-+
-+      requestV3->oldName.length = result;
-+      reqSize += result;
-    } else {
-       HgfsRequestRename *request = (HgfsRequestRename *)HGFS_REQ_PAYLOAD(req);
- 
--      oldName = request->oldName.name;
--      oldNameLength = &request->oldName.length;
-       reqSize = sizeof *request;
--   }
--   /* Convert old name to CP format. */
--   result = CPName_ConvertTo(from,
--                             HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize),
--                             oldName);
--   if (result < 0) {
--      LOG(4, ("oldName CP conversion failed\n"));
--      result = -EINVAL;
--      goto out;
--   }
-+      /* Convert old name to CP format. */
-+      result = CPName_ConvertTo(from,
-+                                HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize),
-+                                request->oldName.name);
-+      if (result < 0) {
-+         LOG(4, ("oldName CP conversion failed\n"));
-+         result = -EINVAL;
-+         goto out;
-+      }
- 
--   *oldNameLength = result;
--   reqSize += result;
-+      request->oldName.length = result;
-+      reqSize += result;
-+   }
- 
-    /*
-     * Build full new name to send to server.
-@@ -983,8 +999,20 @@
- 
-       newNameP = (HgfsFileNameV3 *)((char *)&requestV3->oldName +
-                                     sizeof requestV3->oldName + result);
--      newName = newNameP->name;
--      newNameLength = &newNameP->length;
-+
-+      LOG(6, ("New name: \"%s\"\n", newNameP->name));
-+
-+      /* Convert new name to CP format. */
-+      result = CPName_ConvertTo(to,
-+                                HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize) - result,
-+                                newNameP->name);
-+      if (result < 0) {
-+         LOG(4, ("newName CP conversion failed\n"));
-+         result = -EINVAL;
-+         goto out;
-+      }
-+      newNameP->length = result;
-+      reqSize += result;
-       newNameP->flags = 0;
-       newNameP->fid = HGFS_INVALID_HANDLE;
-       newNameP->caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-@@ -993,24 +1021,22 @@
-       HgfsFileName *newNameP;
-       newNameP = (HgfsFileName *)((char *)&request->oldName +
-                                   sizeof request->oldName + result);
--      newName = newNameP->name;
--      newNameLength = &newNameP->length;
--   }
- 
--   LOG(6, ("New name: \"%s\"\n", newName));
-+      LOG(6, ("New name: \"%s\"\n", newNameP->name));
- 
--   /* Convert new name to CP format. */
--   result = CPName_ConvertTo(to,
--                             HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize) - result,
--                             newName);
--   if (result < 0) {
--      LOG(4, ("newName CP conversion failed\n"));
--      result = -EINVAL;
--      goto out;
-+      /* Convert new name to CP format. */
-+      result = CPName_ConvertTo(to,
-+                                HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize) - result,
-+                                newNameP->name);
-+      if (result < 0) {
-+         LOG(4, ("newName CP conversion failed\n"));
-+         result = -EINVAL;
-+         goto out;
-+      }
-+      newNameP->length = result;
-+      reqSize += result;
-    }
- 
--   *newNameLength = result;
--   reqSize += result;
-    req->payloadSize = reqSize;
- 
-    /* Fill in header here as payloadSize needs to be there. */
-@@ -1109,21 +1135,17 @@
- {
-    HgfsAttrV2 *attrV2;
-    HgfsAttr *attrV1;
--   HgfsAttrHint *hints;
-    HgfsAttrChanges *update;
--   char *fileName = NULL;
--   uint32 *fileNameLength = NULL;
-    size_t reqBufferSize;
-    size_t reqSize;
--   int result = 0;
-    ASSERT(req);
- 
-    switch (opUsed) {
-    case HGFS_OP_SETATTR_V3: {
-+      int result;
-       HgfsRequestSetattrV3 *requestV3 = HgfsGetRequestPayload(req);
- 
-       attrV2 = &requestV3->attr;
--      hints = &requestV3->hints;
- 
-       /*
-        * Clear attributes, mask, and hints before touching them.
-@@ -1131,7 +1153,7 @@
-        * make sure to zero them all here.
-        */
-       memset(attrV2, 0, sizeof *attrV2);
--      memset(hints, 0, sizeof *hints);
-+      requestV3->hints = 0;
- 
-       /*
-        * When possible, issue a setattr using an existing handle. This will
-@@ -1143,14 +1165,21 @@
-        * the times also requires write permissions on Windows, so we require it
-        * here too. Otherwise, any handle will do.
-        */
--      fileName = requestV3->fileName.name;
--      fileNameLength = &requestV3->fileName.length;
-       requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-       requestV3->fileName.fid = HGFS_INVALID_HANDLE;
-       requestV3->fileName.flags = 0;
-       requestV3->reserved = 0;
-       reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
-       reqBufferSize = HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize);
-+      result = CPName_ConvertTo(path,
-+                                reqBufferSize,
-+                                requestV3->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      requestV3->fileName.length = result;
-+      reqSize += result;
- 
-       attrV2->mask = attr->mask;
-       if (attr->mask & (HGFS_ATTR_VALID_SPECIAL_PERMS |
-@@ -1173,22 +1202,22 @@
-       }
-       if (attr->mask & HGFS_ATTR_VALID_ACCESS_TIME) {
-          attrV2->accessTime = attr->accessTime;
--         *hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME;
-+         requestV3->hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME;
-       }
-       if (attr->mask & HGFS_ATTR_VALID_WRITE_TIME) {
-          attrV2->writeTime = attr->writeTime;
--         *hints |= HGFS_ATTR_HINT_SET_WRITE_TIME;
-+         requestV3->hints |= HGFS_ATTR_HINT_SET_WRITE_TIME;
-       }
- 
-       break;
-    }
-    case HGFS_OP_SETATTR_V2: {
-+      int result;
-       HgfsRequestSetattrV2 *requestV2;
- 
-       requestV2 = (HgfsRequestSetattrV2 *)(HGFS_REQ_PAYLOAD(req));
- 
-       attrV2 = &requestV2->attr;
--      hints = &requestV2->hints;
- 
-       /*
-        * Clear attributes, mask, and hints before touching them.
-@@ -1196,13 +1225,19 @@
-        * make sure to zero them all here.
-        */
-       memset(attrV2, 0, sizeof *attrV2);
--      memset(hints, 0, sizeof *hints);
--
--      fileName = requestV2->fileName.name;
--      fileNameLength = &requestV2->fileName.length;
-+      requestV2->hints = 0;
- 
-       reqSize = sizeof *requestV2;
-       reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV2);
-+      result = CPName_ConvertTo(path,
-+                                reqBufferSize,
-+                                requestV2->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      requestV2->fileName.length = result;
-+      reqSize += result;
- 
-       if (attr->mask & (HGFS_ATTR_VALID_SPECIAL_PERMS |
-                           HGFS_ATTR_VALID_OWNER_PERMS |
-@@ -1224,16 +1259,17 @@
-       }
-       if (attr->mask & HGFS_ATTR_VALID_ACCESS_TIME) {
-          attrV2->accessTime = attr->accessTime;
--         *hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME;
-+         requestV2->hints |= HGFS_ATTR_HINT_SET_ACCESS_TIME;
-       }
-       if (attr->mask & HGFS_ATTR_VALID_WRITE_TIME) {
-          attrV2->writeTime = attr->writeTime;
--         *hints |= HGFS_ATTR_HINT_SET_WRITE_TIME;
-+         requestV2->hints |= HGFS_ATTR_HINT_SET_WRITE_TIME;
-       }
- 
-       break;
-    }
-    case HGFS_OP_SETATTR: {
-+      int result;
-       HgfsRequestSetattr *request;
- 
-       request = (HgfsRequestSetattr *)(HGFS_REQ_PAYLOAD(req));
-@@ -1241,11 +1277,17 @@
-       attrV1 = &request->attr;
-       update = &request->update;
- 
--      /* We'll use these later. */
--      fileName = request->fileName.name;
--      fileNameLength = &request->fileName.length;
-       reqSize = sizeof *request;
-       reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, request);
-+      result = CPName_ConvertTo(path,
-+                                reqBufferSize,
-+                                request->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      request->fileName.length = result;
-+      reqSize += result;
- 
-       /*
-        * Clear attributes before touching them.
-@@ -1284,16 +1326,7 @@
-       return -EPROTO;
-    }
- 
--   result = CPName_ConvertTo(path,
--                             reqBufferSize,
--                             fileName);
--      if (result < 0) {
--         LOG(4, ("CP conversion failed.\n"));
--         return -EINVAL;
--   }
--
--   *fileNameLength = result;
--   req->payloadSize = reqSize + result;
-+   req->payloadSize = reqSize;
- 
-    /* Fill in header here as payloadSize needs to be there. */
-    HgfsPackHeader(req, opUsed);
---- a/open-vm-tools/vmhgfs-fuse/filesystem.c
-+++ b/open-vm-tools/vmhgfs-fuse/filesystem.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2013 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2013,2019 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
-@@ -123,36 +123,50 @@
-                            HgfsOp opUsed,           // IN: Op to be used.
-                            HgfsReq *req)            // IN/OUT: Packet to write into
- {
--   char *name;
--   uint32 *nameLength;
-    size_t requestSize;
--   int result;
-+
- 
-    ASSERT(req);
- 
-    switch (opUsed) {
-    case HGFS_OP_QUERY_VOLUME_INFO_V3: {
-+      int result;
-       HgfsRequestQueryVolumeV3 *requestV3 = HgfsGetRequestPayload(req);
- 
--      /* We'll use these later. */
--      name = requestV3->fileName.name;
--      nameLength = &requestV3->fileName.length;
-       requestV3->fileName.flags = 0;
-       requestV3->fileName.fid = HGFS_INVALID_HANDLE;
-       requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-       requestV3->reserved = 0;
-       requestSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (requestSize - 1),
-+                                requestV3->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      requestV3->fileName.length = result;
-+      requestSize += result;
-       break;
-    }
-    case HGFS_OP_QUERY_VOLUME_INFO: {
-+      int result;
-       HgfsRequestQueryVolume *request;
- 
-       request = (HgfsRequestQueryVolume *)(HGFS_REQ_PAYLOAD(req));
- 
--      /* We'll use these later. */
--      name = request->fileName.name;
--      nameLength = &request->fileName.length;
-       requestSize = sizeof *request;
-+      /* Convert to CP name. */
-+      result = CPName_ConvertTo(path,
-+                                HGFS_LARGE_PACKET_MAX - (requestSize - 1),
-+                                request->fileName.name);
-+      if (result < 0) {
-+         LOG(4, ("CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      request->fileName.length = result;
-+      requestSize += result;
-       break;
-    }
-    default:
-@@ -160,17 +174,7 @@
-       return -EPROTO;
-    }
- 
--   /* Convert to CP name. */
--   result = CPName_ConvertTo(path,
--                             HGFS_LARGE_PACKET_MAX - (requestSize - 1),
--                             name);
--   if (result < 0) {
--      LOG(4, ("CP conversion failed.\n"));
--      return -EINVAL;
--   }
--
--   *nameLength = (uint32) result;
--   req->payloadSize = requestSize + result;
-+   req->payloadSize = requestSize;
- 
-    /* Fill in header here as payloadSize needs to be there. */
-    HgfsPackHeader(req, opUsed);
---- a/open-vm-tools/vmhgfs-fuse/fsutil.c
-+++ b/open-vm-tools/vmhgfs-fuse/fsutil.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2013 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2013,2019 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
-@@ -189,8 +189,6 @@
-    size_t reqBufferSize;
-    size_t reqSize;
-    int result = 0;
--   char *fileName = NULL;
--   uint32 *fileNameLength = NULL;
-    ASSERT(attr);
-    ASSERT(req);
-    ASSERT(path);
-@@ -204,8 +202,6 @@
- 
-       /* Fill out the request packet. */
-       requestV3->hints = 0;
--      fileName = requestV3->fileName.name;
--      fileNameLength = &requestV3->fileName.length;
-       requestV3->fileName.flags = 0;
-       requestV3->fileName.fid = HGFS_INVALID_HANDLE;
-       requestV3->fileName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-@@ -213,6 +209,19 @@
-       requestV3->reserved = 0;
-       reqSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
-       reqBufferSize = HGFS_NAME_BUFFER_SIZET(HGFS_LARGE_PACKET_MAX, reqSize);
-+      if (requestV3->fileName.name != NULL) {
-+         /* Convert to CP name. */
-+         result = CPName_ConvertTo(path,
-+                                   reqBufferSize,
-+                                   requestV3->fileName.name);
-+         LOG(8, ("Converted path %s\n", requestV3->fileName.name));
-+         if (result < 0) {
-+            LOG(8, ("CP conversion failed.\n"));
-+            result = -EINVAL;
-+            goto out;
-+         }
-+         requestV3->fileName.length = result;
-+      }
-       break;
-    }
- 
-@@ -223,20 +232,42 @@
- 
-       requestV2 = (HgfsRequestGetattrV2 *)(HGFS_REQ_PAYLOAD(req));
-       requestV2->hints = 0;
--      fileName = requestV2->fileName.name;
--      fileNameLength = &requestV2->fileName.length;
-       reqSize = sizeof *requestV2;
-       reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV2);
-+      if (requestV2->fileName.name != NULL) {
-+         /* Convert to CP name. */
-+         result = CPName_ConvertTo(path,
-+                                   reqBufferSize,
-+                                   requestV2->fileName.name);
-+         LOG(8, ("Converted path %s\n", requestV2->fileName.name));
-+         if (result < 0) {
-+            LOG(8, ("CP conversion failed.\n"));
-+            result = -EINVAL;
-+            goto out;
-+         }
-+         requestV2->fileName.length = result;
-+      }
-       break;
-    }
- 
-    case HGFS_OP_GETATTR: {
-       HgfsRequestGetattr *requestV1;
-       requestV1 = (HgfsRequestGetattr *)(HGFS_REQ_PAYLOAD(req));
--      fileName = requestV1->fileName.name;
--      fileNameLength = &requestV1->fileName.length;
-       reqSize = sizeof *requestV1;
-       reqBufferSize = HGFS_NAME_BUFFER_SIZE(HGFS_LARGE_PACKET_MAX, requestV1);
-+      if (requestV1->fileName.name != NULL) {
-+         /* Convert to CP name. */
-+         result = CPName_ConvertTo(path,
-+                                   reqBufferSize,
-+                                   requestV1->fileName.name);
-+         LOG(8, ("Converted path %s\n", requestV1->fileName.name));
-+         if (result < 0) {
-+            LOG(8, ("CP conversion failed.\n"));
-+            result = -EINVAL;
-+            goto out;
-+         }
-+         requestV1->fileName.length = result;
-+      }
-       break;
-    }
- 
-@@ -246,20 +277,6 @@
-       goto out;
-    }
- 
--   if (fileName != NULL) {
--      /* Convert to CP name. */
--      result = CPName_ConvertTo(path,
--                                reqBufferSize,
--                                fileName);
--      LOG(8, ("Converted path %s\n", fileName));
--      if (result < 0) {
--         LOG(8, ("CP conversion failed.\n"));
--         result = -EINVAL;
--         goto out;
--      }
--      *fileNameLength = result;
--   }
--
-    req->payloadSize = reqSize + result;
- 
-    /* Fill in header here as payloadSize needs to be there. */
---- a/open-vm-tools/vmhgfs-fuse/link.c
-+++ b/open-vm-tools/vmhgfs-fuse/link.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2013 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2013,2019 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
-@@ -51,36 +51,81 @@
- {
-    HgfsRequestSymlinkCreateV3 *requestV3 = NULL;
-    HgfsRequestSymlinkCreate *request = NULL;
--   char *symlinkName;
--   uint32 *symlinkNameLength;
--   char *targetName;
--   uint32 *targetNameLength;
-    size_t targetNameBytes;
--
-    size_t requestSize;
--   int result;
-+
-+   targetNameBytes = strlen(symname) + 1;
- 
-    switch (opUsed) {
-    case HGFS_OP_CREATE_SYMLINK_V3: {
-+      int result;
-+      HgfsFileNameV3 *fileNameP;
-       requestV3 = HgfsGetRequestPayload(req);
- 
--      /* We'll use these later. */
--      symlinkName = requestV3->symlinkName.name;
--      symlinkNameLength = &requestV3->symlinkName.length;
-       requestV3->symlinkName.flags = 0;
-       requestV3->symlinkName.fid = HGFS_INVALID_HANDLE;
-       requestV3->symlinkName.caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-       requestV3->reserved = 0;
-       requestSize = sizeof(*requestV3) + HgfsGetRequestHeaderSize();
-+      /* Convert symlink name to CP format. */
-+      result = CPName_ConvertTo(symlink,
-+                                HGFS_LARGE_PACKET_MAX - (requestSize - 1),
-+                                requestV3->symlinkName.name);
-+      if (result < 0) {
-+         LOG(4, ("SymlinkName CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      requestV3->symlinkName.length = result;
-+      requestSize += result;
-+
-+      /* Copy target name into request packet. */
-+      if (targetNameBytes > HGFS_LARGE_PACKET_MAX - (requestSize - 1)) {
-+         LOG(4, ("Target name is too long.\n"));
-+         return -EINVAL;
-+      }
-+
-+      fileNameP = (HgfsFileNameV3 *)((char *)&requestV3->symlinkName +
-+                                     sizeof requestV3->symlinkName + result);
-+      memcpy(fileNameP->name, symname, targetNameBytes);
-+      LOG(6, ("Target name: \"%s\"\n", fileNameP->name));
-+      /* Convert target name to CPName-lite format. */
-+      CPNameLite_ConvertTo(fileNameP->name, targetNameBytes - 1, '/');
-+      fileNameP->length = targetNameBytes - 1;
-+      fileNameP->flags = 0;
-+      fileNameP->fid = HGFS_INVALID_HANDLE;
-+      fileNameP->caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
-       break;
-    }
-    case HGFS_OP_CREATE_SYMLINK: {
-+      int result;
-+      HgfsFileName *fileNameP;
-       request = (HgfsRequestSymlinkCreate *)(HGFS_REQ_PAYLOAD(req));
- 
--      /* We'll use these later. */
--      symlinkName = request->symlinkName.name;
--      symlinkNameLength = &request->symlinkName.length;
-       requestSize = sizeof *request;
-+      /* Convert symlink name to CP format. */
-+      result = CPName_ConvertTo(symlink,
-+                                HGFS_LARGE_PACKET_MAX - (requestSize - 1),
-+                                request->symlinkName.name);
-+      if (result < 0) {
-+         LOG(4, ("SymlinkName CP conversion failed.\n"));
-+         return -EINVAL;
-+      }
-+      request->symlinkName.length = result;
-+      requestSize += result;
-+
-+      /* Copy target name into request packet. */
-+      if (targetNameBytes > HGFS_LARGE_PACKET_MAX - (requestSize - 1)) {
-+         LOG(4, ("Target name is too long.\n"));
-+         return -EINVAL;
-+      }
-+
-+      fileNameP = (HgfsFileName *)((char *)&request->symlinkName +
-+                                   sizeof request->symlinkName + result);
-+      memcpy(fileNameP->name, symname, targetNameBytes);
-+      LOG(6, ("Target name: \"%s\"\n", fileNameP->name));
-+      /* Convert target name to CPName-lite format. */
-+      CPNameLite_ConvertTo(fileNameP->name, targetNameBytes - 1, '/');
-+      fileNameP->length = targetNameBytes - 1;
-       break;
-    }
-    default:
-@@ -88,59 +133,13 @@
-       return -EPROTO;
-    }
- 
--
--   /* Convert symlink name to CP format. */
--   result = CPName_ConvertTo(symlink,
--                             HGFS_LARGE_PACKET_MAX - (requestSize - 1),
--                             symlinkName);
--   if (result < 0) {
--      LOG(4, ("SymlinkName CP conversion failed.\n"));
--      return -EINVAL;
--   }
--
--   *symlinkNameLength = result;
--   req->payloadSize = requestSize + result;
-+   req->payloadSize = requestSize;
- 
-    /*
--    * Note the different buffer length. This is because HgfsRequestSymlink
--    * contains two filenames, and once we place the first into the packet we
--    * must account for it when determining the amount of buffer available for
--    * the second.
--    *
--    * Also note that targetNameBytes accounts for the NUL character. Once
--    * we've converted it to CP name, it won't be NUL-terminated and the length
--    * of the string in the packet itself won't account for it.
-+    * targetNameBytes accounts for the NUL character. Once we've converted
-+    * it to CP name, it won't be NUL-terminated and the length of the string
-+    * in the packet itself won't account for it.
-     */
--   if (opUsed == HGFS_OP_CREATE_SYMLINK_V3) {
--      HgfsFileNameV3 *fileNameP;
--      fileNameP = (HgfsFileNameV3 *)((char *)&requestV3->symlinkName +
--                                     sizeof requestV3->symlinkName + result);
--      targetName = fileNameP->name;
--      targetNameLength = &fileNameP->length;
--      fileNameP->flags = 0;
--      fileNameP->fid = HGFS_INVALID_HANDLE;
--      fileNameP->caseType = HGFS_FILE_NAME_CASE_SENSITIVE;
--   } else {
--      HgfsFileName *fileNameP;
--      fileNameP = (HgfsFileName *)((char *)&request->symlinkName +
--                                   sizeof request->symlinkName + result);
--      targetName = fileNameP->name;
--      targetNameLength = &fileNameP->length;
--   }
--   targetNameBytes = strlen(symname) + 1;
--
--   /* Copy target name into request packet. */
--   if (targetNameBytes > HGFS_LARGE_PACKET_MAX - (requestSize - 1)) {
--      LOG(4, ("Target name is too long.\n"));
--      return -EINVAL;
--   }
--   memcpy(targetName, symname, targetNameBytes);
--   LOG(6, ("Target name: \"%s\"\n", targetName));
--
--   /* Convert target name to CPName-lite format. */
--   CPNameLite_ConvertTo(targetName, targetNameBytes - 1, '/');
--
--   *targetNameLength = targetNameBytes - 1;
-    req->payloadSize += targetNameBytes - 1;
- 
-    /* Fill in header here as payloadSize needs to be there. */
diff --git a/debian/patches/gcc9-GStaticRecMutex.patch b/debian/patches/gcc9-GStaticRecMutex.patch
deleted file mode 100644
index 09224a3..0000000
--- a/debian/patches/gcc9-GStaticRecMutex.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Author: Christian Ehrhardt <[e-mail]>
-Original-Author: Oliver Kurth <[e-mail]>
-Origin: backport, https://github.com/vmware/open-vm-tools/commit/19ca3e36
-X-Backport-Note: only took the GStaticMutex changes from the mcuh bigger rework
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1842301
-Applied-Upstream: 11.0
-Last-Update: 2019-09-03
-
---- a/open-vm-tools/libvmtools/vmtoolsLog.c
-+++ b/open-vm-tools/libvmtools/vmtoolsLog.c
-@@ -155,7 +155,7 @@ static LogHandler *gErrorData;
- static LogHandler *gErrorSyslog;
- static GPtrArray *gDomains = NULL;
- static gboolean gLogInitialized = FALSE;
--static GStaticRecMutex gLogStateMutex = G_STATIC_REC_MUTEX_INIT;
-+static GRecMutex gLogStateMutex;
- static gboolean gLoggingStopped = FALSE;
- static gboolean gLogIOSuspended = FALSE;
- 
-@@ -1046,7 +1046,7 @@ VMTools_ConfigLogToStdio(const gchar *do
- 
-    if (!gLogInitialized) {
-       gLogInitialized = TRUE;
--      g_static_rec_mutex_init(&gLogStateMutex);
-+      g_rec_mutex_init(&gLogStateMutex);
-    }
- 
-    gLogEnabled = TRUE;
-@@ -1157,7 +1157,7 @@ VMTools_ConfigLogging(const gchar *defau
-    gLogEnabled |= force;
-    if (!gLogInitialized) {
-       gLogInitialized = TRUE;
--      g_static_rec_mutex_init(&gLogStateMutex);
-+      g_rec_mutex_init(&gLogStateMutex);
-    }
- 
-    gMaxCacheEntries = g_key_file_get_integer(cfg, LOGGING_GROUP,
-@@ -1323,7 +1323,7 @@ VMToolsLogWrapper(GLogLevelFlags level,
- void
- VMTools_AcquireLogStateLock(void)
- {
--   g_static_rec_mutex_lock(&gLogStateMutex);
-+   g_rec_mutex_lock(&gLogStateMutex);
- }
- 
- 
-@@ -1334,7 +1334,7 @@ VMTools_AcquireLogStateLock(void)
- void
- VMTools_ReleaseLogStateLock(void)
- {
--   g_static_rec_mutex_unlock(&gLogStateMutex);
-+   g_rec_mutex_unlock(&gLogStateMutex);
- }
- 
- 
diff --git a/debian/patches/gcc9-Remove-GLib-2.32-deprecated-APIs-from-tools.patch b/debian/patches/gcc9-Remove-GLib-2.32-deprecated-APIs-from-tools.patch
deleted file mode 100644
index cacaeb0..0000000
--- a/debian/patches/gcc9-Remove-GLib-2.32-deprecated-APIs-from-tools.patch
+++ /dev/null
@@ -1,827 +0,0 @@
-From a7c141fc5278146b86c71502f60767962b752af7 Mon Sep 17 00:00:00 2001
-From: Oliver Kurth <[e-mail]>
-Date: Tue, 18 Dec 2018 13:19:46 -0800
-Subject: [PATCH] Remove GLib 2.32 deprecated APIs from tools
-
-Replace the GThread, GCond and GMutex APIs deprecated in GLib version
-2.32 in the VMware Tools source.
-
-Backport Notes:
-- open-vm-tools/lib/rpcChannel/rpcChannel.c context changes, still search/replace
-- open-vm-tools/services/plugins/vmbackup/stateMachine.c.rej context changes, still search/replace
-- open-vm-tools/services/vmtoolsd/toolsHangDetector.c - didn't exist in 10.3.10
-- open-vm-tools/lib/rpcChannel/glib_stubs.c - didn't exist in 10.3.10
-
-Origin: backport, https://github.com/vmware/open-vm-tools/commit/a7c141fc
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1842301
-Last-Update: 2019-09-03
-
----
- open-vm-tools/configure.ac                    |  2 +-
- open-vm-tools/lib/glibUtils/fileLogger.c      | 10 ++--
- open-vm-tools/lib/glibUtils/stdLogger.c       | 12 ++---
- open-vm-tools/lib/glibUtils/sysLogger.c       | 12 ++---
- .../lib/include/vmware/tools/threadPool.h     |  7 ++-
- open-vm-tools/lib/rpcChannel/glib_stubs.c     |  6 +--
- open-vm-tools/lib/rpcChannel/rpcChannel.c     | 20 +++----
- open-vm-tools/lib/rpcChannel/rpcChannelInt.h  |  2 +-
- open-vm-tools/libvmtools/i18n.c               | 16 +++---
- open-vm-tools/libvmtools/vmtoolsConfig.c      |  6 +--
- .../services/plugins/vmbackup/stateMachine.c  | 16 +++---
- .../services/plugins/vmbackup/vmBackupInt.h   |  6 +--
- open-vm-tools/services/vmtoolsd/cmdLine.c     |  2 -
- open-vm-tools/services/vmtoolsd/mainLoop.c    |  4 --
- open-vm-tools/services/vmtoolsd/serviceObj.c  | 16 +++---
- open-vm-tools/services/vmtoolsd/serviceObj.h  |  4 +-
- open-vm-tools/services/vmtoolsd/threadPool.c  | 52 +++++++++----------
- .../services/vmtoolsd/toolsHangDetector.c     |  1 +
- open-vm-tools/vgauth/service/fileLogger.c     |  4 --
- 19 files changed, 93 insertions(+), 105 deletions(-)
-
---- a/open-vm-tools/configure.ac
-+++ b/open-vm-tools/configure.ac
-@@ -420,7 +420,7 @@ AC_ARG_ENABLE([grabbitmqproxy],
-    ])
- 
- #
--# Check for glib 2.6.14 or greater.
-+# Check for glib 2.34.0 or greater.
- #
- AC_VMW_CHECK_LIB([glib-2.0],
-                  [GLIB2],
---- a/open-vm-tools/lib/glibUtils/fileLogger.c
-+++ b/open-vm-tools/lib/glibUtils/fileLogger.c
-@@ -44,7 +44,7 @@ typedef struct FileLogger {
-    guint          maxFiles;
-    gboolean       append;
-    gboolean       error;
--   GStaticMutex   lock;
-+   GMutex         lock;
- } FileLogger;
- 
- 
-@@ -348,7 +348,7 @@ FileLoggerLog(const gchar *domain,
-    FileLogger *logger = data;
-    gsize written;
- 
--   g_static_mutex_lock(&logger->lock);
-+   g_mutex_lock(&logger->lock);
- 
-    if (logger->error) {
-       goto exit;
-@@ -387,7 +387,7 @@ FileLoggerLog(const gchar *domain,
-    }
- 
- exit:
--   g_static_mutex_unlock(&logger->lock);
-+   g_mutex_unlock(&logger->lock);
- }
- 
- 
-@@ -409,7 +409,7 @@ FileLoggerDestroy(gpointer data)
-    if (logger->file != NULL) {
-       g_io_channel_unref(logger->file);
-    }
--   g_static_mutex_free(&logger->lock);
-+   g_mutex_clear(&logger->lock);
-    g_free(logger->path);
-    g_free(logger);
- }
-@@ -456,7 +456,7 @@ GlibUtils_CreateFileLogger(const char *p
-    data->append = append;
-    data->maxSize = maxSize * 1024 * 1024;
-    data->maxFiles = maxFiles + 1; /* To account for the active log file. */
--   g_static_mutex_init(&data->lock);
-+   g_mutex_init(&data->lock);
- 
-    return &data->handler;
- }
---- a/open-vm-tools/lib/glibUtils/stdLogger.c
-+++ b/open-vm-tools/lib/glibUtils/stdLogger.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2010-2018 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
-@@ -27,7 +27,7 @@
- #include <stdio.h>
- 
- #if defined(_WIN32)
--static GStaticMutex gConsoleLock = G_STATIC_MUTEX_INIT;
-+static GMutex gConsoleLock;
- static gint gRefCount = 0;
- #endif
- 
-@@ -66,12 +66,12 @@ StdLoggerLog(const gchar *domain,
-    StdLogger *sdata = data;
- 
-    if (!sdata->attached) {
--      g_static_mutex_lock(&gConsoleLock);
-+      g_mutex_lock(&gConsoleLock);
-       if (gRefCount != 0 || GlibUtils_AttachConsole()) {
-          gRefCount++;
-          sdata->attached = TRUE;
-       }
--      g_static_mutex_unlock(&gConsoleLock);
-+      g_mutex_unlock(&gConsoleLock);
-    }
- 
-    if (!sdata->attached) {
-@@ -105,11 +105,11 @@ StdLoggerDestroy(gpointer data)
- {
- #if defined(_WIN32)
-    StdLogger *sdata = data;
--   g_static_mutex_lock(&gConsoleLock);
-+   g_mutex_lock(&gConsoleLock);
-    if (sdata->attached && --gRefCount == 0) {
-       FreeConsole();
-    }
--   g_static_mutex_unlock(&gConsoleLock);
-+   g_mutex_unlock(&gConsoleLock);
- #endif
-    g_free(data);
- }
---- a/open-vm-tools/lib/glibUtils/sysLogger.c
-+++ b/open-vm-tools/lib/glibUtils/sysLogger.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2010-2018 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
-@@ -38,7 +38,7 @@ typedef struct SysLogger {
- 
- 
- static SysLogger *gSysLogger;
--static GStaticMutex gSysLoggerLock = G_STATIC_MUTEX_INIT;
-+static GMutex gSysLoggerLock;
- 
- 
- /*
-@@ -105,7 +105,7 @@ SysLoggerUnref(gpointer data)
- {
-    g_return_if_fail(data == gSysLogger);
-    g_return_if_fail(gSysLogger->refcount > 0);
--   g_static_mutex_lock(&gSysLoggerLock);
-+   g_mutex_lock(&gSysLoggerLock);
-    gSysLogger->refcount -= 1;
-    if (gSysLogger->refcount == 0) {
-       closelog();
-@@ -113,7 +113,7 @@ SysLoggerUnref(gpointer data)
-       g_free(gSysLogger);
-       gSysLogger = NULL;
-    }
--   g_static_mutex_unlock(&gSysLoggerLock);
-+   g_mutex_unlock(&gSysLoggerLock);
- }
- 
- 
-@@ -140,7 +140,7 @@ GlibLogger *
- GlibUtils_CreateSysLogger(const char *domain,
-                           const char *facility)
- {
--   g_static_mutex_lock(&gSysLoggerLock);
-+   g_mutex_lock(&gSysLoggerLock);
-    if (gSysLogger == NULL) {
-       int facid = LOG_USER;
- 
-@@ -203,7 +203,7 @@ GlibUtils_CreateSysLogger(const char *do
-    } else {
-       gSysLogger->refcount += 1;
-    }
--   g_static_mutex_unlock(&gSysLoggerLock);
-+   g_mutex_unlock(&gSysLoggerLock);
-    return &gSysLogger->handler;
- }
- 
---- a/open-vm-tools/lib/include/vmware/tools/threadPool.h
-+++ b/open-vm-tools/lib/include/vmware/tools/threadPool.h
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2010-2018 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
-@@ -70,6 +70,7 @@ typedef struct ToolsCorePool {
-                    GDestroyNotify dtor);
-    void (*cancel)(guint id);
-    gboolean (*start)(ToolsAppCtx *ctx,
-+                     const gchar *threadName,
-                      ToolsCorePoolCb cb,
-                      ToolsCorePoolCb interrupt,
-                      gpointer data,
-@@ -179,6 +180,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ct
-  * some other method of communicating with the thread.
-  *
-  * @param[in] ctx          Application context.
-+ * @param[in] threadName   Name for the new thread.
-  * @param[in] cb           Function that implements the task to execute.
-  * @param[in] interrupt    A function that will request the task to be
-  *                         interrupted. This will be called when the pool
-@@ -197,6 +199,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ct
- 
- G_INLINE_FUNC gboolean
- ToolsCorePool_StartThread(ToolsAppCtx *ctx,
-+                          const gchar *threadName,
-                           ToolsCorePoolCb cb,
-                           ToolsCorePoolCb interrupt,
-                           gpointer data,
-@@ -204,7 +207,7 @@ ToolsCorePool_StartThread(ToolsAppCtx *c
- {
-    ToolsCorePool *pool = ToolsCorePool_GetPool(ctx);
-    if (pool != NULL) {
--      return pool->start(ctx, cb, interrupt, data, dtor);
-+      return pool->start(ctx, threadName, cb, interrupt, data, dtor);
-    }
-    return FALSE;
- }
---- a/open-vm-tools/lib/rpcChannel/rpcChannel.c
-+++ b/open-vm-tools/lib/rpcChannel/rpcChannel.c
-@@ -119,7 +119,7 @@ RpcChannelRestart(gpointer _chan)
-    gboolean chanStarted;
- 
-    /* Synchronize with any RpcChannel_Send calls by other threads. */
--   g_static_mutex_lock(&chan->impl.outLock);
-+   g_mutex_lock(&chan->impl.outLock);
- 
-    RpcChannelStopNoLock(&chan->impl);
- 
-@@ -128,7 +128,7 @@ RpcChannelRestart(gpointer _chan)
-    gVSocketFailed = FALSE;
- 
-    chanStarted = RpcChannel_Start(&chan->impl);
--   g_static_mutex_unlock(&chan->impl.outLock);
-+   g_mutex_unlock(&chan->impl.outLock);
-    if (!chanStarted) {
-       Warning("Channel restart failed [%d]\n", chan->rpcResetErrorCount);
-       if (chan->resetCb != NULL) {
-@@ -750,7 +750,7 @@ RpcChannel_New(void)
-    chan = BackdoorChannel_New();
- #endif
-    if (chan) {
--      g_static_mutex_init(&chan->outLock);
-+      g_mutex_init(&chan->outLock);
-    }
-    return chan;
- }
-@@ -766,7 +766,7 @@ void
- RpcChannel_Shutdown(RpcChannel *chan)
- {
-    if (chan != NULL) {
--      g_static_mutex_free(&chan->outLock);
-+      g_mutex_free(&chan->outLock);
-    }
- 
-    if (chan != NULL && chan->funcs != NULL && chan->funcs->shutdown != NULL) {
-@@ -883,9 +883,9 @@ RpcChannelStopNoLock(RpcChannel *chan)
- void
- RpcChannel_Stop(RpcChannel *chan)
- {
--   g_static_mutex_lock(&chan->outLock);
-+   g_mutex_lock(&chan->outLock);
-    RpcChannelStopNoLock(chan);
--   g_static_mutex_unlock(&chan->outLock);
-+   g_mutex_unlock(&chan->outLock);
- }
- 
- 
-@@ -952,7 +952,7 @@ RpcChannel_Send(RpcChannel *chan,
- 
-    ASSERT(chan && chan->funcs);
- 
--   g_static_mutex_lock(&chan->outLock);
-+   g_mutex_lock(&chan->outLock);
- 
-    funcs = chan->funcs;
-    ASSERT(funcs->send);
-@@ -1003,7 +1003,7 @@ done:
-    }
- 
- exit:
--   g_static_mutex_unlock(&chan->outLock);
-+   g_mutex_unlock(&chan->outLock);
-    return ok && rpcStatus;
- }
- 
---- a/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
-+++ b/open-vm-tools/lib/rpcChannel/rpcChannelInt.h
-@@ -69,7 +69,7 @@ struct _RpcChannel {
-    const char                *appName;
-    gpointer                  appCtx;
- #endif
--   GStaticMutex              outLock;
-+   GMutex                    outLock;
- #if defined(NEED_RPCIN)
-    struct RpcIn              *in;
-    gboolean                  inStarted;
---- a/open-vm-tools/libvmtools/i18n.c
-+++ b/open-vm-tools/libvmtools/i18n.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2010-2018 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
-@@ -54,7 +54,7 @@ typedef struct MsgCatalog {
- 
- typedef struct MsgState {
-    HashTable     *domains; /* List of text domains. */
--   GStaticMutex   lock;    /* Mutex to protect shared state. */
-+   GMutex         lock;    /* Mutex to protect shared state. */
- } MsgState;
- 
- 
-@@ -133,7 +133,7 @@ MsgInitState(gpointer unused)
- {
-    ASSERT(gMsgState == NULL);
-    gMsgState = g_new0(MsgState, 1);
--   g_static_mutex_init(&gMsgState->lock);
-+   g_mutex_init(&gMsgState->lock);
-    return NULL;
- }
- 
-@@ -344,7 +344,7 @@ MsgGetString(const char *domain,
-     * This lock is pretty coarse-grained, but a lot of the code below just runs
-     * in exceptional situations, so it should be OK.
-     */
--   g_static_mutex_lock(&state->lock);
-+   g_mutex_lock(&state->lock);
- 
-    catalog = MsgGetCatalog(domain);
-    if (catalog != NULL) {
-@@ -415,7 +415,7 @@ MsgGetString(const char *domain,
-       }
-    }
- 
--   g_static_mutex_unlock(&state->lock);
-+   g_mutex_unlock(&state->lock);
- 
-    return strp;
- }
-@@ -682,7 +682,7 @@ VMToolsMsgCleanup(void)
-       if (gMsgState->domains != NULL) {
-          HashTable_Free(gMsgState->domains);
-       }
--      g_static_mutex_free(&gMsgState->lock);
-+      g_mutex_clear(&gMsgState->lock);
-       g_free(gMsgState);
-    }
- }
-@@ -775,9 +775,9 @@ VMTools_BindTextDomain(const char *domai
-                    "catalog dir '%s'.\n", domain, lang, catdir);
-       }
-    } else {
--      g_static_mutex_lock(&state->lock);
-+      g_mutex_lock(&state->lock);
-       MsgSetCatalog(domain, catalog);
--      g_static_mutex_unlock(&state->lock);
-+      g_mutex_unlock(&state->lock);
-    }
-    g_free(file);
-    free(dfltdir);
---- a/open-vm-tools/libvmtools/vmtoolsConfig.c
-+++ b/open-vm-tools/libvmtools/vmtoolsConfig.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2008-2017 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2008-2018 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
-@@ -330,11 +330,7 @@ VMTools_LoadConfig(const gchar *path,
-    gchar *defaultPath = NULL;
-    gchar *localPath = NULL;
-    /* GStatBuf was added in 2.26. */
--#if GLIB_CHECK_VERSION(2, 26, 0)
-    GStatBuf confStat;
--#else
--   struct stat confStat;
--#endif
-    GHashTable *old = NULL;
-    GError *err = NULL;
-    GKeyFile *cfg = NULL;
---- a/open-vm-tools/services/plugins/vmbackup/stateMachine.c
-+++ b/open-vm-tools/services/plugins/vmbackup/stateMachine.c
-@@ -335,12 +335,12 @@ VmBackupFinalize(void)
-       g_source_unref(gBackupState->abortTimer);
-    }
- 
--   g_static_mutex_lock(&gBackupState->opLock);
-+   g_mutex_lock(&gBackupState->opLock);
-    if (gBackupState->currentOp != NULL) {
-       VmBackup_Cancel(gBackupState->currentOp);
-       VmBackup_Release(gBackupState->currentOp);
-    }
--   g_static_mutex_unlock(&gBackupState->opLock);
-+   g_mutex_unlock(&gBackupState->opLock);
- 
-    VmBackup_SendEvent(VMBACKUP_EVENT_REQUESTOR_DONE, VMBACKUP_SUCCESS, "");
- 
-@@ -358,7 +358,7 @@ VmBackupFinalize(void)
-    if (gBackupState->completer != NULL) {
-       gBackupState->completer->release(gBackupState->completer);
-    }
--   g_static_mutex_free(&gBackupState->opLock);
-+   g_mutex_clear(&gBackupState->opLock);
-    g_free(gBackupState->scriptArg);
-    g_free(gBackupState->volumes);
-    g_free(gBackupState->snapshots);
-@@ -486,13 +486,13 @@ VmBackupDoAbort(void)
-        gBackupState->machineState != VMBACKUP_MSTATE_SYNC_ERROR) {
-       const char *eventMsg = "Quiesce aborted.";
-       /* Mark the current operation as cancelled. */
--      g_static_mutex_lock(&gBackupState->opLock);
-+      g_mutex_lock(&gBackupState->opLock);
-       if (gBackupState->currentOp != NULL) {
-          VmBackup_Cancel(gBackupState->currentOp);
-          VmBackup_Release(gBackupState->currentOp);
-          gBackupState->currentOp = NULL;
-       }
--      g_static_mutex_unlock(&gBackupState->opLock);
-+      g_mutex_unlock(&gBackupState->opLock);
- 
- #ifdef __linux__
-       /* If quiescing has been completed, then undo it.  */
-@@ -559,7 +559,7 @@ VmBackupPostProcessCurrentOp(gboolean *p
- 
-    *pending = FALSE;
- 
--   g_static_mutex_lock(&gBackupState->opLock);
-+   g_mutex_lock(&gBackupState->opLock);
- 
-    if (gBackupState->currentOp != NULL) {
-       g_debug("%s: checking %s\n", __FUNCTION__, gBackupState->currentOpName);
-@@ -626,7 +626,7 @@ VmBackupPostProcessCurrentOp(gboolean *p
-    }
- 
- exit:
--   g_static_mutex_unlock(&gBackupState->opLock);
-+   g_mutex_unlock(&gBackupState->opLock);
-    return retVal;
- }
- 
-@@ -1007,7 +1007,7 @@ VmBackupStartCommon(RpcInData *data,
-    gBackupState->provider = provider;
-    gBackupState->completer = completer;
-    gBackupState->needsPriv = FALSE;
--   g_static_mutex_init(&gBackupState->opLock);
-+   g_mutex_init(&gBackupState->opLock);
-    gBackupState->enableNullDriver = VMBACKUP_CONFIG_GET_BOOL(ctx->config,
-                                                              "enableNullDriver",
-                                                              TRUE);
---- a/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
-+++ b/open-vm-tools/services/plugins/vmbackup/vmBackupInt.h
-@@ -111,7 +111,7 @@ typedef struct VmBackupState {
-    ToolsAppCtx   *ctx;
-    VmBackupOp    *currentOp;
-    const char    *currentOpName;
--   GStaticMutex   opLock; // See note above
-+   GMutex         opLock;          // See note above
-    char          *volumes;
-    char          *snapshots;
-    guint          pollPeriod;
-@@ -207,14 +207,14 @@ VmBackup_SetCurrentOp(VmBackupState *sta
-    ASSERT(state->currentOp == NULL);
-    ASSERT(currentOpName != NULL);
- 
--   g_static_mutex_lock(&state->opLock);
-+   g_mutex_lock(&state->opLock);
- 
-    state->currentOp = op;
-    state->callback = callback;
-    state->currentOpName = currentOpName;
-    state->forceRequeue = (callback != NULL && op == NULL);
- 
--   g_static_mutex_unlock(&state->opLock);
-+   g_mutex_unlock(&state->opLock);
- 
-    return (op != NULL);
- }
---- a/open-vm-tools/services/vmtoolsd/cmdLine.c
-+++ b/open-vm-tools/services/vmtoolsd/cmdLine.c
-@@ -304,9 +304,7 @@ ToolsCore_ParseCommandLine(ToolsServiceS
-    }
- 
-    context = g_option_context_new(NULL);
--#if GLIB_CHECK_VERSION(2, 12, 0)
-    g_option_context_set_summary(context, N_("Runs the VMware Tools daemon."));
--#endif
-    g_option_context_add_main_entries(context, clOptions, NULL);
-    g_option_group_set_error_hook(g_option_context_get_main_group(context),
-                                  ToolsCoreCmdLineError);
---- a/open-vm-tools/services/vmtoolsd/mainLoop.c
-+++ b/open-vm-tools/services/vmtoolsd/mainLoop.c
-@@ -550,10 +550,6 @@ ToolsCore_Setup(ToolsServiceState *state
-    GMainContext *gctx;
-    ToolsServiceProperty ctxProp = { TOOLS_CORE_PROP_CTX };
- 
--   if (!g_thread_supported()) {
--      g_thread_init(NULL);
--   }
--
-    /*
-     * Useful for debugging purposes. Log the vesion and build information.
-     */
---- a/open-vm-tools/services/vmtoolsd/serviceObj.c
-+++ b/open-vm-tools/services/vmtoolsd/serviceObj.c
-@@ -180,14 +180,14 @@ ToolsCoreServiceGetProperty(GObject *obj
- 
-    id -= 1;
- 
--   g_mutex_lock(self->lock);
-+   g_mutex_lock(&self->lock);
- 
-    if (id < self->props->len) {
-       ServiceProperty *p = &g_array_index(self->props, ServiceProperty, id);
-       g_value_set_pointer(value, p->value);
-    }
- 
--   g_mutex_unlock(self->lock);
-+   g_mutex_unlock(&self->lock);
- }
- 
- 
-@@ -217,14 +217,14 @@ ToolsCoreServiceSetProperty(GObject *obj
- 
-    id -= 1;
- 
--   g_mutex_lock(self->lock);
-+   g_mutex_lock(&self->lock);
- 
-    if (id < self->props->len) {
-       p = &g_array_index(self->props, ServiceProperty, id);
-       p->value = g_value_get_pointer(value);
-    }
- 
--   g_mutex_unlock(self->lock);
-+   g_mutex_unlock(&self->lock);
- 
-    if (p != NULL) {
-       g_object_notify(object, p->name);
-@@ -260,7 +260,7 @@ ToolsCoreServiceCtor(GType type,
-                                                                       params);
- 
-    self = TOOLSCORE_SERVICE(object);
--   self->lock = g_mutex_new();
-+   g_mutex_init(&self->lock);
-    self->props = g_array_new(FALSE, FALSE, sizeof (ServiceProperty));
- 
-    return object;
-@@ -296,7 +296,7 @@ ToolsCoreServiceDtor(GObject *object)
-    }
- 
-    g_array_free(self->props, TRUE);
--   g_mutex_free(self->lock);
-+   g_mutex_clear(&self->lock);
- }
- 
- 
-@@ -459,7 +459,7 @@ ToolsCoreService_RegisterProperty(ToolsC
-                                             prop->name,
-                                             G_PARAM_READWRITE);
- 
--   g_mutex_lock(obj->lock);
-+   g_mutex_lock(&obj->lock);
- 
-    sprop.id = ++PROP_ID_SEQ;
-    sprop.name = g_strdup(prop->name);
-@@ -467,6 +467,6 @@ ToolsCoreService_RegisterProperty(ToolsC
-    g_array_append_val(obj->props, sprop);
-    g_object_class_install_property(G_OBJECT_CLASS(klass), sprop.id, pspec);
- 
--   g_mutex_unlock(obj->lock);
-+   g_mutex_unlock(&obj->lock);
- }
- 
---- a/open-vm-tools/services/vmtoolsd/serviceObj.h
-+++ b/open-vm-tools/services/vmtoolsd/serviceObj.h
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2009-2016 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2009-2018 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
-@@ -39,7 +39,7 @@
- 
- typedef struct ToolsCoreService {
-    GObject        parent;
--   GMutex        *lock;
-+   GMutex         lock;
-    GArray        *props;
- } ToolsCoreService;
- 
---- a/open-vm-tools/services/vmtoolsd/threadPool.c
-+++ b/open-vm-tools/services/vmtoolsd/threadPool.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2010-2016 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2010-2018 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
-@@ -40,7 +40,7 @@ typedef struct ThreadPoolState {
-    GThreadPool   *pool;
-    GQueue        *workQueue;
-    GPtrArray     *threads;
--   GMutex        *lock;
-+   GMutex         lock;
-    guint          nextWorkId;
- } ThreadPoolState;
- 
-@@ -170,9 +170,9 @@ ToolsCorePoolDoWork(gpointer data)
-     * In multi-threaded mode, the thread pool callback already did this.
-     */
-    if (gState.pool == NULL) {
--      g_mutex_lock(gState.lock);
-+      g_mutex_lock(&gState.lock);
-       g_queue_remove(gState.workQueue, work);
--      g_mutex_unlock(gState.lock);
-+      g_mutex_unlock(&gState.lock);
-    }
- 
-    work->cb(gState.ctx, work->data);
-@@ -223,7 +223,7 @@ ToolsCorePoolRunThread(gpointer data)
-    task->cb(gState.ctx, task->data);
-    task->active = FALSE;
- 
--   g_mutex_lock(gState.lock);
-+   g_mutex_lock(&gState.lock);
-    /* If not active, the shutdown function will clean things up. */
-    if (gState.active) {
-       g_ptr_array_remove(gState.threads, task);
-@@ -232,7 +232,7 @@ ToolsCorePoolRunThread(gpointer data)
-                       task,
-                       ToolsCorePoolDestroyThread);
-    }
--   g_mutex_unlock(gState.lock);
-+   g_mutex_unlock(&gState.lock);
- 
-    return NULL;
- }
-@@ -257,9 +257,9 @@ ToolsCorePoolRunWorker(gpointer state,
- {
-    WorkerTask *work;
- 
--   g_mutex_lock(gState.lock);
-+   g_mutex_lock(&gState.lock);
-    work = g_queue_pop_tail(gState.workQueue);
--   g_mutex_unlock(gState.lock);
-+   g_mutex_unlock(&gState.lock);
- 
-    ASSERT(work != NULL);
- 
-@@ -300,7 +300,7 @@ ToolsCorePoolSubmit(ToolsAppCtx *ctx,
-    task->data = data;
-    task->dtor = dtor;
- 
--   g_mutex_lock(gState.lock);
-+   g_mutex_lock(&gState.lock);
- 
-    if (!gState.active) {
-       g_free(task);
-@@ -351,7 +351,7 @@ ToolsCorePoolSubmit(ToolsAppCtx *ctx,
-                                  ToolsCorePoolDestroyTask);
- 
- exit:
--   g_mutex_unlock(gState.lock);
-+   g_mutex_unlock(&gState.lock);
-    return id;
- }
- 
-@@ -378,7 +378,7 @@ ToolsCorePoolCancel(guint id)
- 
-    g_return_if_fail(id != 0);
- 
--   g_mutex_lock(gState.lock);
-+   g_mutex_lock(&gState.lock);
-    if (!gState.active) {
-       goto exit;
-    }
-@@ -390,7 +390,7 @@ ToolsCorePoolCancel(guint id)
-    }
- 
- exit:
--   g_mutex_unlock(gState.lock);
-+   g_mutex_unlock(&gState.lock);
- 
-    if (task != NULL) {
-       if (task->srcId > 0) {
-@@ -410,11 +410,12 @@ exit:
-  *
-  * @see ToolsCorePool_StartThread()
-  *
-- * @param[in] ctx       Application context.
-- * @param[in] cb        Callback that executes the task.
-- * @param[in] interrupt Callback that interrupts the task.
-- * @param[in] data      Opaque data.
-- * @param[in] dtor      Destructor for the task data.
-+ * @param[in] ctx        Application context.
-+ * @param[in] threadName Name for the new thread.
-+ * @param[in] cb         Callback that executes the task.
-+ * @param[in] interrupt  Callback that interrupts the task.
-+ * @param[in] data       Opaque data.
-+ * @param[in] dtor       Destructor for the task data.
-  *
-  * @return TRUE iff thread was successfully started.
-  *
-@@ -423,6 +424,7 @@ exit:
- 
- static gboolean
- ToolsCorePoolStart(ToolsAppCtx *ctx,
-+                   const gchar *threadName,
-                    ToolsCorePoolCb cb,
-                    ToolsCorePoolCb interrupt,
-                    gpointer data,
-@@ -431,7 +433,7 @@ ToolsCorePoolStart(ToolsAppCtx *ctx,
-    GError *err = NULL;
-    StandaloneTask *task = NULL;
- 
--   g_mutex_lock(gState.lock);
-+   g_mutex_lock(&gState.lock);
-    if (!gState.active) {
-       goto exit;
-    }
-@@ -442,7 +444,7 @@ ToolsCorePoolStart(ToolsAppCtx *ctx,
-    task->interrupt = interrupt;
-    task->data = data;
-    task->dtor = dtor;
--   task->thread = g_thread_create(ToolsCorePoolRunThread, task, TRUE, &err);
-+   task->thread = g_thread_try_new(threadName, ToolsCorePoolRunThread, task, &err);
- 
-    if (err == NULL) {
-       g_ptr_array_add(gState.threads, task);
-@@ -454,7 +456,7 @@ ToolsCorePoolStart(ToolsAppCtx *ctx,
-    }
- 
- exit:
--   g_mutex_unlock(gState.lock);
-+   g_mutex_unlock(&gState.lock);
-    return task != NULL;
- }
- 
-@@ -497,7 +499,6 @@ ToolsCorePool_Init(ToolsAppCtx *ctx)
-       gState.pool = g_thread_pool_new(ToolsCorePoolRunWorker,
-                                       NULL, maxThreads, FALSE, &err);
-       if (err == NULL) {
--#if GLIB_CHECK_VERSION(2, 10, 0)
-          gint maxIdleTime;
-          gint maxUnused;
- 
-@@ -517,7 +518,6 @@ ToolsCorePool_Init(ToolsAppCtx *ctx)
- 
-          g_thread_pool_set_max_idle_time(maxIdleTime);
-          g_thread_pool_set_max_unused_threads(maxUnused);
--#endif
-       } else {
-          g_warning("error initializing thread pool, running single threaded: %s",
-                    err->message);
-@@ -526,7 +526,7 @@ ToolsCorePool_Init(ToolsAppCtx *ctx)
-    }
- 
-    gState.active = TRUE;
--   gState.lock = g_mutex_new();
-+   g_mutex_init(&gState.lock);
-    gState.threads = g_ptr_array_new();
-    gState.workQueue = g_queue_new();
- 
-@@ -553,9 +553,9 @@ ToolsCorePool_Shutdown(ToolsAppCtx *ctx)
- {
-    guint i;
- 
--   g_mutex_lock(gState.lock);
-+   g_mutex_lock(&gState.lock);
-    gState.active = FALSE;
--   g_mutex_unlock(gState.lock);
-+   g_mutex_unlock(&gState.lock);
- 
-    /* Notify all spawned threads to stop. */
-    for (i = 0; i < gState.threads->len; i++) {
-@@ -589,7 +589,7 @@ ToolsCorePool_Shutdown(ToolsAppCtx *ctx)
-    /* Cleanup. */
-    g_ptr_array_free(gState.threads, TRUE);
-    g_queue_free(gState.workQueue);
--   g_mutex_free(gState.lock);
-+   g_mutex_clear(&gState.lock);
-    memset(&gState, 0, sizeof gState);
-    g_object_set(ctx->serviceObj, TOOLS_CORE_PROP_TPOOL, NULL, NULL);
- }
---- a/open-vm-tools/vgauth/service/fileLogger.c
-+++ b/open-vm-tools/vgauth/service/fileLogger.c
-@@ -74,11 +74,7 @@ ServiceFileLoggerOpen(FileLoggerData *da
- 
-    if (g_file_test(path, G_FILE_TEST_EXISTS)) {
-       /* GStatBuf was added in 2.26. */
--#if GLIB_CHECK_VERSION(2, 26, 0)
-       GStatBuf fstats;
--#else
--      struct stat fstats;
--#endif
- 
-       if (g_stat(path, &fstats) > -1) {
-          g_atomic_int_set(&data->logSize, (gint) fstats.st_size);
diff --git a/debian/patches/gcc9-build-error-in-vmblocktest.c.patch b/debian/patches/gcc9-build-error-in-vmblocktest.c.patch
deleted file mode 100644
index bbc9e51..0000000
--- a/debian/patches/gcc9-build-error-in-vmblocktest.c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 553d128348f311080e156519e9ac26a518c8579d Mon Sep 17 00:00:00 2001
-From: Oliver Kurth <[e-mail]>
-Date: Fri, 2 Aug 2019 11:07:19 -0700
-Subject: [PATCH] Fix gcc 9.1 build error in vmblocktest.c
-
-GCC 9.1 in Ubuntu eoan (19.10) failed to build open-vm-tools:
-error: '__builtin_strncpy' specified bound 4096 equals destination
-size [-Werror=stringop-truncation]
-
-Origin: upstream, https://github.com/vmware/open-vm-tools/commit/553d1283
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1842301
-Last-Update: 2019-09-03
-
----
- open-vm-tools/tests/testVmblock/vmblocktest.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/open-vm-tools/tests/testVmblock/vmblocktest.c b/open-vm-tools/tests/testVmblock/vmblocktest.c
-index b018301a9..c45f1b550 100644
---- a/open-vm-tools/tests/testVmblock/vmblocktest.c
-+++ b/open-vm-tools/tests/testVmblock/vmblocktest.c
-@@ -1,5 +1,5 @@
- /*********************************************************
-- * Copyright (C) 2006-2017 VMware, Inc. All rights reserved.
-+ * Copyright (C) 2006-2017,2019 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
-@@ -233,7 +233,8 @@ main(int argc,
-       }
- 
- create_file:
--      strncpy(buf, files[i].blockerName, sizeof buf);
-+      strncpy(buf, files[i].blockerName, sizeof buf - 1);
-+      buf[sizeof buf - 1] = '\0';
-       strncat(buf, FILENAME, sizeof buf - strlen(files[i].blockerName));
-       err = stat(buf, &statbuf);
-       if (!err) {
--- 
-2.23.0
-
diff --git a/debian/patches/series b/debian/patches/series
index 68482d7..92cb923 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
 debian/pam-use-common-auth-account
 debian/max_nic_count
 debian/scsi-udev-rule
+<<<<<<< debian/patches/series
 fix-buster-OS-reporting
 gcc9
 gcc9-Remove-GLib-2.32-deprecated-APIs-from-tools.patch
@@ -10,3 +11,7 @@ gcc9-build-error-in-vmblocktest.c.patch
 lp-1847157-Fix-memory-leaks-in-vix-tools-plugin.patch
 lp-1847157-End-VGAuth-impersonation-in-the-case-of-error.patch
 lp-1847157-Fix-leaks-in-ListAliases-and-ListMappedAliases-9bc72.patch
+=======
+89c0d4445_GitHub-Issue-367.-Remove-references-to-deprecated-G_INLINE_FUNC
+fix_zfs_fs_detection
+>>>>>>> debian/patches/series
diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
index ff87a57..08cc28e 100644
--- a/open-vm-tools/AUTHORS
+++ b/open-vm-tools/AUTHORS
@@ -37,6 +37,15 @@ Ed Schouten     Use standard SYSCTL_ADD_OID() macro to access the
 Steve Wills     Fix vmmemctl.ko driver build for supported FreeBSD releases.
                 - https://github.com/vmware/open-vm-tools/pull/140
 
+John Eismeier   Propose fix some spelling.
+                - https://github.com/vmware/open-vm-tools/pull/264
+
+Josh Paetzel    Additional changes to vmmemctl.ko for FreeBSD 12.0 API changes.
+                - https://github.com/vmware/open-vm-tools/pull/286
+
 [Code]Ai        Highlighted a potential NULL pointer dereference and four
                 pieces of dead code.
                 - https://github.com/vmware/open-vm-tools/pull/247
+
+Haruki Tsurumoto        Fix Asianux identification
+                - https://github.com/vmware/open-vm-tools/pull/325
diff --git a/open-vm-tools/ChangeLog b/open-vm-tools/ChangeLog
index 2e5317f..bcbdaeb 100644
--- a/open-vm-tools/ChangeLog
+++ b/open-vm-tools/ChangeLog
@@ -1,40768 +1,20078 @@
-commit 4826a76513b6f8254132f664e07fa70ed18f22c4
+commit 94abb05ae948eae31091a5bdcdd5d78e5e0192d1
 Author: Oliver Kurth <[e-mail]>
-Date:   Sat Mar 16 10:40:23 2019 -0700
+Date:   Wed Oct 2 17:48:35 2019 -0700
 
-    update version and build number
+    Fix leaks in ListAliases and ListMappedAliases.
 
-commit 990cc40de10f257d1d3c01b69fe476c233afb950
+    The 'record' for each alias was being leaked.
+
+commit 87589da5255d84efad0c50446246b2788eeab582
 Author: Oliver Kurth <[e-mail]>
-Date:   Sat Mar 16 10:39:48 2019 -0700
+Date:   Fri Sep 20 13:11:24 2019 -0700
 
-    correct verson numbers
+    release notes for 11.0.0
 
-commit f6a274cf64eebfd574e8cf587b4ebaf1c579267f
+commit 3c03fd5446ddd23979380fd2518f1f5c7c116dbd
 Author: Oliver Kurth <[e-mail]>
-Date:   Sat Mar 16 10:27:03 2019 -0700
+Date:   Fri Sep 20 11:08:35 2019 -0700
 
-    Update release notes for 10.3.10
+    update copyright header for lib/include/vmware/guestrpc/tclodefs.h
 
-commit 640bd4f9c012b201ad1d45a131dad2e804f53766
+commit 99145edb39cc1e08b0848ea464fd17dca2ef2541
 Author: Oliver Kurth <[e-mail]>
-Date:   Wed Feb 6 16:47:22 2019 -0800
+Date:   Fri Sep 20 11:07:16 2019 -0700
 
-    sync deploypkg files
+    update build number for release
 
-commit 182eda3bc5f371339114241f0581f446e72def6d
+commit 570ec94ccfc5bcf2a55d891ae8af2a24bb4e9caf
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Feb 5 17:36:53 2019 -0800
+Date:   Thu Aug 29 17:14:39 2019 -0700
 
-    Update copyright year to 2019 for OVT 10.3.10 files.
-    
-    * Few dnd related files have been modified since 10.3.5 OVT and
-    we just missed updating the copyright year to 2019.
-    
-    * Updated the copyright year accordingly.
+    Due to a quirk the way patches were generated, the 'coomon-agent' directory was not removed as intended, but just contained empty files
 
-commit ba83c29fcd703ecb6a13a7767bad180033234aea
+commit ae791f849d0e49d968a3ba068d6f421de936754d
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 17:24:44 2019 -0800
+Date:   Fri Aug 23 13:33:55 2019 -0700
 
-    Fix CentOS 7.6 detection
-    
-    The version information in /etc/centos-release has 3 parts,
-    in particular for CentOS 7.6:
-    
-    CentOS Linux release 7.6.1810 (Core)
-    
-    This was misidentified as CentOS 6 because the substring "6."
-    was matched before matching "7.". This change fixes this by
-    requiring a space before the major version.
+    tools.conf example: add vss.disableAppQuiescing
 
-commit f4708f4b5a9d24b122237875ce6a542f267caab3
+commit 867f9cf4fd9903e1e10e4d7f70fef3b7fdb2a5d3
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 17:24:44 2019 -0800
+Date:   Mon Aug 5 11:22:01 2019 -0700
 
-    Include vmware/tools/log.h to define g_info.
-    
-    A recent change added a call to g_info from syncManifest.c.  This
-    in turn is causing open-vm-tools builds to fail because g_info is
-    not available on SLES 12sp1.
+    Enable the guest OS disk mapping feature as default.
     
-    To fix the problem, include vmware/tools/log.h in syncManifest.c.
-    log.h defines g_info as a macro.
+    Enabling the OS disk mapping feature in VMware Tools 11.0.0 for
+    Windows and Linux guests.
 
-commit 139a21cab79d971e9fe3ea5b8e993646b2e6cb48
+commit 782b42a5248cd01d37f0002aa7e30df4cc787129
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 17:24:44 2019 -0800
+Date:   Mon Aug 5 11:22:01 2019 -0700
 
-    Always send VMBACKUP_EVENT_GENERIC_MANIFEST during quiesced snapshots.
-    
-    vSphere 6.7 added a host-side interface that allows VMTools to send
-    a "generic" backup manifest during a quiesced snapshot on Linux guests.
-    VMTools 10.2.0 or later tries to notify the host of the backup manifest
-    file through a vmbackup event message VMBACKUP_EVENT_GENERIC_MANIFEST.
-    If the host is unable to field the message, then VMTools logs the
-    failure and then continues with the quiesced snapshot in the older
-    fashion, without the backup manifest.
-    
-    An earlier change attempted to reduce the amount of logging done when
-    running on older hosts that don't support VMBACKUP_EVENT_GENERIC_MANIFEST
-    by detecting when sending VMBACKUP_EVENT_GENERIC_MANIFEST fails and
-    not sending the message again for subsequent quiesced snapshots.
-    However, subsequent stress testing has uncovered problems with this
-    approach when running on newer hosts; specifically, errors may sometimes
-    be encountered on newer hosts when sending VMBACKUP_EVENT_GENERIC_MANIFEST.
-    Therefore this change backs out that earlier change.
-    
-    Note that the need to solve the problem that that earlier change was
-    intended to solve has been reduced because support for
-    VMBACKUP_EVENT_GENERIC_MANIFEST has been backported to vSphere 6.5
-    P03, which is available, and vSphere 6.0 P08, which is scheduled for
-    release later this year.  ESXi 5.5 is out of general support.
-    
-    This change also addresses an issue that surfaced when testing on a
-    host without support for VMBACKUP_EVENT_GENERIC_MANIFEST.
-    If VMTools fails to send VMBACKUP_EVENT_GENERIC_MANIFEST, the quiesced
-    snapshot operation will be aborted rather than continuing as it should.
-    To address this, create a new function, VmBackup_SendEventNoAbort,
-    which does not abort the quiesced snapshot on failure, and call that
-    function rather than VmBackup_SendEvent when sending
-    VMBACKUP_EVENT_GENERIC_MANIFEST.
+    Fix broken command: vmtoolsd --cmd info-get | info-set
 
-commit f9a93010ac532ab8eaaeba7f1de5c0c3e732554a
+commit d4922cad5f627b1dd3315f59ed8a5ce2f4767e83
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 17:24:43 2019 -0800
+Date:   Mon Aug 5 11:22:01 2019 -0700
 
-    Update copyright year to 2019.
+    [OVT] Update copyright year to 2019.
+    
+    A new version of VMware Tools 11.0.0 will be released in 2019.  All
+    applicable files need to stamped with 2019 copyright year.
 
-commit 74d165bab17132b50d909b7f2e5cb19f3f140a01
+commit 5cb75e0a93b9531875e9e29515a0ea912ca3aca7
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:19 2019 -0800
+Date:   Mon Aug 5 11:22:00 2019 -0700
 
-    Fix some bad derefs in primary NIC gather code
+    Avoid freezing mount points for same device.
     
-    Found by user in https://github.com/vmware/open-vm-tools/issues/272
+    Loopback device setup could cause a cyclic dependency
+    between 2 mount points. In order to break the cycle,
+    avoid freezing the mount points to the same device.
     
-    Debug code tries to access a struct field that may not be init'd.
-    Pointer deref'd without a sanity check.
+    This change also skips some system mount points for 'tmpfs'
+    and 'cgroup' etc as those share the same device/FS name.
+    This is fine because we can't quiese those mount points
+    anyway (system mount points don't support quiescing).
 
-commit e88f91b00a715b79255de6576506d80ecfdb064c
+commit 385dc97f645ccaa4a0550b53949715394a009fb6
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:19 2019 -0800
+Date:   Mon Aug 5 11:21:59 2019 -0700
 
-    Fix possible security issue with the permissions of the intermediate
-    staging directory and path
-    
-    /tmp/VMwareDnD is a staging directory used for DnD and CnP.  It should be
-    a regular directory, but malicious code or user may create the /tmp/VMwareDnD
-    as a symbolic link which points elsewhere on the system.  This may provide
-    user access to user B's files.
+    Add RpcChannel_SendOneRawPriv()
     
-    Do not set the permission of the root directory if the root directory
-    already exists and has the wrong permission.  The permission of the directory
-    must be 1777 if it is created by the VMToolsi.  If not, then the directory
-    has been created or modified by malicious code or user, so just cancel the
-    host to guest DnD or CnP operation.
+    Send privileged guest RPC "guestStore.connect" with it after the
+    vmsvc RPC channel falls back to backdoor.
 
-commit bfa5e5d27a8a96a9c71fbe581f3fe32dcd2e55fd
+commit e385c90808d527bce41259796badba094ad62a77
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:19 2019 -0800
+Date:   Mon Aug 5 11:21:59 2019 -0700
 
-    CONSTANT_EXPRESSION_RESULT in TimeUtil_StringToDate().
+    Add an example configuration tools.conf file for tools
     
-    Red Hat ran coverity scan on open-vm-tools and found an occurrence
-    of CONSTANT_EXPRESSION_RESULT in TimeUtil_StringToDate().
+    This adds an example tools.conf file. Settings are shown in the
+    file with default values, but commented out with documentation.
 
-commit 4bba1dcd28806eff0cb3795cbfeea32f91fb1c40
+commit decb8769e31e88f23b16b7a6ff3a1545a6259abe
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:19 2019 -0800
+Date:   Mon Aug 5 11:21:59 2019 -0700
 
-    Bail out vmtoolsd early when there are RPC errors.
+    [TOOLS] Fix dnd text from Linux guest
     
-    VMX state machine could give up quiescing operation for various
-    reasons when vmtoolsd is busy performing necessary state transitions.
-    Once VMX gives up quiescing operation, there is no point in
-    vmtoolsd continuing with it. vmtoolsd should also give up the
-    operation asap. vmtoolsd can detect VMX state machine change
-    when it gets errors sending VMBACKUP_PROTOCOL_EVENT_SET RPC.
+    Gtk::Widget::drag_dest_find_target() returns different values from GDK_NONE
+    on Gtk2 and Gtk3.
     
-    RPC errors are only used as a trigger to abort the operation.
-    We ignore the RPC errors that might occur after aborting the
-    operation.
+    On Gtk2, it returns an empty string. It matches the existing code.
+    On Gtk3, it returns "NONE". The current logic breaks.
+    
+    To overcome this issue, use Gdk::AtomString::to_cpp_type(GDK_NONE) to
+    replace the current empty string. This works on both Gtk2 and Gtk3.
 
-commit 0cb7f7a903015e5e711fa6eb5b41748f797ce794
+commit 8d299b17ba81d47f7f561479a688ab1843f904c8
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:19 2019 -0800
+Date:   Mon Aug 5 11:21:59 2019 -0700
 
-    [10.3.10] Update copyright year to 2019.
+    Fix gcc 9.1 build error in vmblocktest.c
     
-    Update the copyright year to 2019 for ALL open-vm-tools destined files
-    modified since the release of 10.3.5.
+    GCC 9.1 in Ubuntu eoan (19.10) failed to build open-vm-tools:
+    error: '__builtin_strncpy' specified bound 4096 equals destination
+    size [-Werror=stringop-truncation]
 
-commit e569c47f85fa8520f0834148d6774c1cb66df68c
+commit e8d08518353295527e635f666c0d3146dcc698cb
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:19 2019 -0800
+Date:   Sat Jul 20 17:10:07 2019 -0700
 
-    Don't send a backup manifest when aborting a Linux quiesced snapshot.
-    
-    When taking a Linux quiesced snapshot, communication failures between
-    VMX and VMTools may result in VMTools sending a genericManifest event
-    message after the quiesced snapshot operation has been aborted.  If
-    this happens, VMX will send an error back to VMTools, which in turn
-    causes VMTools not to send genericManifest messages on subsequent
-    quiesced snapshots even if the host supports such messages.
+    version 11.0.0
+
+commit 82ef6f896c99212c9366e3e52d7767e86d9677c3
+Author: Oliver Kurth <[e-mail]>
+Date:   Sat Jul 20 17:03:42 2019 -0700
+
+    Fix the memory leak in procMgr library.
     
-    One aspect of the implementation that gives rise to this behavior is
-    the use of the sync provider's snapshotDone function to undo a
-    quiescing operation.  Specifically, if VMTools aborts a quiesced
-    snapshot when the file system is quiesced, the quiescing must be
-    undone.  Currently, this is handled by calling the sync provider's
-    snapshotDone function.  This is the same function that is called to
-    complete the quiescing snapshot protocol when it is successful.  In
-    some respects this makes sense, since in either case snapshotDone
-    unquiesces the file system.  However, architecturally and conceptually,
-    it seems useful to distinguish between the action to be taken in the
-    successful case versus the aborting case.  It's also useful to do so
-    in practice, because the successful case sends the genericManifest
-    event to notify the host there is a backup manifest file, while the
-    aborting case should not do that.
+    In a specific code path, procCmdAbsPath attribute is ovewritten
+    with the new memory. This leads to a memory leak for the previously
+    allocated memory.
+
+commit 003ed9e082dd10c67aa022514ad0c662c7e1a6a4
+Author: Oliver Kurth <[e-mail]>
+Date:   Sat Jul 20 17:03:42 2019 -0700
+
+    GuestInfo: fix memory leak in GuestInfoGetPrimaryIP()
     
-    To address the issue, add an "undo" function for the Linux sync
-    provider.  The undo function is called instead of snapshotDone as
-    part of aborting a quiesced snapshot in which the file system is
-    quiesced at the time of the abort.
+    "ipstr" was not free'ed when it was not being used.
 
-commit 81835cd72369b5b75fc5b0bed761f3b75cb7146b
+commit 3d60252dc25705841c4afb49e766be2bd7815acd
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:18 2019 -0800
+Date:   Sat Jul 20 17:03:42 2019 -0700
 
-    Special-case profile loading for StartProgram
+    Avoid emitting a trailing comma in the GuestInfoSendDiskInfoV1 JSON RPC
     
-    Keep the user's profile loaded for the life of the
-    program, to avoid races where its unloaded too quickly.
+    Although currently accepted by the JSON library that we are using
+    in VMX, that superfluous comma is strictly invalid according to the
+    JSON standard - ECMA-404.
 
-commit d3515adb2a1617dcde4b65a6a9ab72ee8624454b
+commit f65edaec32d2e1c7c14d69f4f2af669805cfd4b4
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:18 2019 -0800
+Date:   Sat Jul 20 17:03:42 2019 -0700
 
-    Changes to common source files not applicable to open-vm-tools.
+    [Tools/dndcp] Fix two coverity issues reported by a customer.
 
-commit 4d3e3183bc04517cf75ab590a12e14224207eb6d
+commit 74fe39c2abac9da4d45188eec8b389be421f7c8f
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:18 2019 -0800
+Date:   Sat Jul 20 17:03:42 2019 -0700
 
-    Bump up the SYSIMAGE_VERSION for VMware tools 10.3.10
-    
-    The last released deploypkg version for 'VMware Tools' 10.3.5 is 8.4.1.
-    Bumping up the CBS version to 8.4.10.
+    Add the SLEDGEHAMMER code name to the 11.0.0 release version defines.
 
-commit 8f3630e77bcf647c22c40093bb37500f3032e578
+commit 0c6ad5edceca60dc05eb9f3b1ee6ac42dc0455ef
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:18 2019 -0800
+Date:   Wed Jul 3 14:28:56 2019 -0700
 
-    Deploypkg log files of linux should not be world readable.
+    Fix a Coverity issue reported in vgauth/serviceImpl/verify.c
 
-commit 4470d99e5eaf19cea741e6fa6f46c72acd57b3e1
+commit 47c8f75e4516552615c070c6920633f7e8e572a0
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:18 2019 -0800
+Date:   Wed Jul 3 14:28:56 2019 -0700
 
-    General code clean-up.
+    Fix process command name for special linux processes.
     
-    bora/lib/misc/posixPosix.c:
-      Treat local variables "len" consistently as "size_t" type in
-      Posix_Getmntent_r()
+    While listing down the processes in a linux guest, the existing
+    procMgr library reads /proc/<PID>/cmdline file and parses the
+    content.  While reading this, an assumption is made that there is
+    a null terminating character at the end of the file content.
+    This holds true for most of the processes.  But for few special processes,
+    the cmdline file doesn't have the terminating null character.
     
-    bora-vmsoft/apps/toolbox-cmd/toolboxcmd-shrink.c:
-      Improve readability of error handling logic in ShrinkDoWipeAndShrink()
-      and remove another line of dead code.
+    Proper content from cmdline file:
     
-    bora-vmsoft/lib/procMgr/procMgrPosix.c:
-      Recent discussions about setting "errno" to ENOENT when either
-      getpwuid_r() or getpwnam_r() return 0 (success) if there is no passwd
-      entry for the user have vacillated.
+    /usr/lib/systemd/systemd\0--switched-root\0--system\0--deserialize\021\0
+    /usr/sbin/vmtoolsd\0
+    sshd: root@pts/2\0\0\0
+    
+    Example cmdline file where NUL terminator is missing:
     
-      Since none of the current callers of the routines in procMgrPosix.c
-      query the contents of "errno", the current consensus is to simply log
-      a warning message along with reason for the failure.
+    avahi-daemon: running [linux.local]
+    avahi-daemon: chroot helper
 
-commit 5f3f6ccd3ad143d64f2927bd19791a6148e1e2ba
+commit 2660d40ca4f5beca0ba3a4c68a66f8c7dcf77a67
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:18 2019 -0800
+Date:   Wed Jul 3 14:28:56 2019 -0700
 
-    Fix NULL pointer dereference and remove three lines of dead code.
+    Fix the command name for few linux processes.
     
-    QbitLogic has run [Code]Ai on the open-vm-tools source code and
-    and notified VMware of a potential NULL pointer reference and four
-    pieces of dead code.
+    ProcMgr library publishes the 'command name' attribute for
+    each process while listing down all the processes.  For doing this,
+    the commandline is first parsed from /proc/<PID>/cmdline file
+    and the part starting from the right-most '/' is considered as the
+    command name.  This is OK only if we have an absolute path for the
+    command binary.  Other wise, this may result in incorrect results.
     
-    See https://github.com/vmware/open-vm-tools/pull/247
+    For example:
+    sshd: root@pts/1
+    gdm-session-worker [pam/gdm-autologin]
     
-    bora-vmsoft/services/vmtoolsd/pluginMgr.c
-      The proposed fix conditionally emitted a log message.  That fix has
-      been reworked to consistently emit a log message with conditional
-      content.
+    Fixed the code to ignore the parsing if we do not have an absolute
+    path.
     
-    bora/lib/misc/posixPosix.c
-    bora-vmsoft/apps/toolbox-cmd/toolboxcmd-shrink.c
-      Remove one line of dead code from each source file.
+    Note: There are two ways how the command name is retrieved for each
+    process.
     
-    bora-vmsoft/lib/procMgr/procMgrPosix.c:
-      Suggested dead code fix actually pointed to a bug where errno
-      was not getting updated as intended.
+    1. /proc/<PID>/cmdline is parsed.
     
-    bora-vmsoft/services/plugins/guestInfo/perfMonLinux.c:
-      Suggested dead code is no longer dead; change not applicable.
+    If (1) fails for some reason, then
+    
+    2. /proc/<PID>/status is parsed.
+    
+    There is no issue with (2). This changeset fixes the parsing issue only
+    with (1) approach mentioned above.
 
-commit f10780bc3d7119d90bf72c0cf2f07066955d7d98
+commit 7aaf580b14f44a994100ede098e0ced5d60ba484
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jan 29 14:03:18 2019 -0800
+Date:   Wed Jul 3 14:28:56 2019 -0700
 
-    Bump VMware Tools version to 10.3.10 for the next scheduled update release
+    Add support for NVMe disks; IDE and SATA disk devices in 3.x Linux kernels
     
-    Set the VMware Tools version as TOOLS_VERSION_JACKHAMMER_UPDATE2 = 10.3.10
+    Support has been added for virtual disks attached to an NVMe
+    controller.  The device "label" will provide the "nvme<n>" for the
+    controller.  The disk unit is provided in the device "nsid" file.
+    An earlier implementation (Linux 2.6 kernels) provided the unit
+    number as the final digit group in the device node name.
+    
+    The Linux 3.x kernel has some differences in the layout of IDE and
+    SATA disk devices in the sysfs filesystem.  The differences from the
+    sysfs in a 2.6 Linux kernel are:
+     - The IDE "class" file and SATA "class" and "label" files are in a
+       different directory.
+     - IDE controller and SATA device nodes begin with "ata" where "host"
+       was used in earlier kernel sysfs filesystems.
+    
+    GuestInfoGetDevClass() has been modfied to check in two possible
+    locations for the "class" file.   The directory located will also
+    contain the "label" file for SCSI, SAS, and SATA disk devices.
+    
+    GuestInfoGetIdeSataDev() has been modified to search for either
+    ata<n> or host<n> directories in the sysfs tree for the disk device.
 
-commit f2ff192717375b95a6b7e278fb47dbb3d3bc56d1
+commit 193a5f93d6678b2ebfec1cf365a84bfd8533650d
 Author: Oliver Kurth <[e-mail]>
-Date:   Wed Nov 7 15:00:09 2018 -0800
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    release notes for 10.3.5
+    Common header file change not applicable to open-vm-tools.
 
-commit 8f98dbc87304546cbb75756bbad8ba0dbc0221a4
+commit 2657373a9321ad4090af75d84beac00836170e27
 Author: Oliver Kurth <[e-mail]>
-Date:   Wed Nov 7 14:13:03 2018 -0800
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    add 10.3.5 changes to ChangeLog
-commit 583fc02dbee4ba88a20c67a0f5e5a9b023b551ea
+    Truncate oversize partition names
+    
+    Truncate disk partition names if they are too large, rather than just
+    skipping all the disk information for the guest. Closes
+    https://github.com/vmware/open-vm-tools/issues/346 .
+
+commit 6b8ffb7199159ab3a306646bc572f6a83a8ce7f6
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Nov 6 17:14:40 2018 -0800
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    bump version and build number
+    Common header file change not applicable to open-vm-tools.
 
-commit d51ec15038c43472e9bc48de7081b0954a122f97
+commit fe04b4263ae90af524fe51e124e206df737e974b
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Nov 6 17:13:04 2018 -0800
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    sync deploypkg files
+    Suppress possible NULL pointer deref in a debug message.
 
-commit b4b07f53c71a83beed8fdc11f2dfeeb43aa20fda
+commit 130334ca6f1cf6d696b0fe36d54b83f1f7d7bc2e
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Oct 5 13:55:27 2018 -0700
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    Use bitwise AND operation while fetching current IOPL.
-    
-    Iopl_Get() was using logical AND operation which could result
-    in wrong IOPL value. We should be using bitwise AND instead.
+    Common header file change not applicable to open-vm-tools.
 
-commit 87593b29e5c337141be65e4430fb95a4f1741afb
+commit ace8b9e3c13a0b320835d36f569d2c7e5c6513a7
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Oct 5 13:55:27 2018 -0700
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    Optional override for short and long OS names sent from Tools
-    
-    Added support for customers to override the returned long and short OS
-    names through the tools config file. If the setting is present, then names
-    gathered by hostinfo will be ignored. The user is responsible for setting
-    the appropriate names.
-    
-    The override will be ignored if the short-name setting is not present in
-    tools.conf.
-    
-    An empty string will be sent for the long OS name if only the short-name
-    setting is present.
-    
-    Appropriate warning msg will be generated in both cases.
-    
-    Example of the conf setting:
-    
-    [guestosinfo]
-    short-name = centos6-64
-    long-name = some long name
+    Changes to common header files not applicable to open-vm-tools.
 
-commit b08cd0da457263f80e84ca95348c2a97cb7e22a5
+commit eda7db540bb048ac406e6624786c300cb17968c2
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:19 2018 -0700
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    Hgfs Server Linux: fix the share permissions on a file rename or delete
-    
-    Coverity found that the argumeents to obtain the share permissions
-    on a file rename were swapped. Even though they are tested together
-    in an if statement which is not an issue, it could be in the future.
-    
-    Reverse arguments so the share read and write permissions are correct.
+    Common header file change not applicable to open-vm-tools.
 
-commit bdde701699212ca7fb118f3a49a9bbc7fb06df68
+commit 7b17b7265ad31f2ed3dc6d6d28c5a4caf4c12e5c
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:18 2018 -0700
+Date:   Wed Jul 3 14:26:55 2019 -0700
 
-    Hgfs FUSE Client: fix missing pthread_mutex_unlock call
-    
-    Fix missing pthread_mutex_unlock call in HgfsSetAttrCache when
-    updating the cached attributes on a file and a memory allocation
-    fails.
+    Common header file change not applicable to open-vm-tools.
 
-commit 01376aca4d4bee5efed9b4b2597d141722a7feb5
+commit 59d4eda2fc89e43ac092d82866c42c9692ebca68
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:18 2018 -0700
+Date:   Wed Jul 3 14:26:54 2019 -0700
 
-    Bump up the SYSIMAGE_VERSION for VMware Tools 10.3.5
+    Common header file change not applicable to open-vm-tools.
 
-commit 7fc13e2b58dc91627d4ff78fd532b77898adf2d2
+commit 8fe237da4894488e9cb0fccdec1f0d8180998a24
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:18 2018 -0700
+Date:   Wed Jul 3 14:26:54 2019 -0700
 
-    Update the copyright year for OVT bundled files modified since 10.3.2
+    Common header file change not directly applicable to open-vm-tools.
 
-commit c7a186e204cdff46b5e02bcb5208ef8979eaf261
+commit e266c0bb1879792f24b29d38af9f9f833475f228
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:18 2018 -0700
+Date:   Wed Jul 3 14:26:54 2019 -0700
 
-    Handle Linux kernel /proc FS uint32 type stat overflow when calculating
-    tools rate stats.
+    Changes to common source files not directly applicable to open-vm-tools.
     
-    On both 32-bit and 64-bit Linux, tools always parses Linux kernel /proc
-    FS stats as uint64 values.  For rate stats, current - previous can handle
-    uint64 type stat overflow, but not uint32 type.
+    Reduce malloc/free overheads in the VMX for HGFS over VMCI
 
-commit 064d0a3458991f0c34a397664b6b5cd8cc00e5b3
+commit 9c30be3448c743e51718480543142bf833ea553a
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:18 2018 -0700
+Date:   Mon Jun 17 11:41:38 2019 -0700
 
-    nicinfo: skip loopback devices
+    copyPasteCompatX11.c code generating unnecessary Coverity warning
     
-    When libdnet isn't used, loopback devices were reported. This change
-    skips these interfaces. Also skip interfaces that are down.
+    This patch aims to fix an issue found by Coverity Scan.
     
-    The interface was visible with vim-cmd, but not in the VC or
-    ESX UI. It did not contain any IP addresses.
+    This issue is a False Positive, the outBuf is only freed in specific
+    scenario, so there is no 'BAD FREE'.  But it's better to reconstruct the
+    related code to clear the SCA error.
 
-commit 8979f11f78ef7fdbb51afa298896e06b4d874e5b
+commit a72b4c2513b8faf4e5b08b085583a43b1b6149a1
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:18 2018 -0700
+Date:   Mon Jun 17 11:41:38 2019 -0700
 
-    Allow only a single instance of vmusr when multiple users are logged into a VM
-    
-    When a vmusr process gets the "channel conflict" error while attempting
-    to open the toolbox-dnd channel, a channel reset is triggered.  That
-    reset results in the channel being restarted and a subsequent conflict
-    and reset occurs - every second until the channel becomes available.
-    
-    For *nix guests:
-    The fix is making use of the repetitive channel resets where the only
-    RpcIn message received is a "reset" to catch this channel "permanently"
-    unavailable state.  If other RpcIn messages are received, a channel
-    is considered to be working and the cumulative error count is cleared..
-    
-    lib/rpcin/rpcin.c:
-    - struct RpcIn: Added error status boolean and callback function to
-                    notify the dependent layer that a channel error has been
-                    resolved.
-    - RpcInLoop(): If a non "reset" message is received, clear any channel
-                   error status.  This will also notify the dependent layer
-                   that the channel is functioning.
-    - RpcIn_start(): Added additional argument for new callback; NULL if
-                     not needed.
-    
-    lib/rpcChannel/rpcChannel.c:
-    - struct rpcChannelInt:
-      - Renamed "rpcErrorCount" to "rpcResetErrorCount" since it is actually
-        a count of the consecutive channel reset failures and not a count
-        of RpcChannel errors.
-      - Added counter "rpcFailureCount" for the cumulative channel errors.
-      - Added "rpcFailureCb" for optional callback to notify the app of a
-        "permanent" channel failure.
-    - New function RpcChannelClearError() for RpcIn to notify when the
-      channel is working; to clear the rpcFailureCount .
-    - RpcChannel_Setup() - added two arguments for (1) an optional function
-                           to be called when there is a channel failure
-                           and (2) a failure count threshold.
-                           These optional values are stored in the
-                           RpcChannel structure being created.
-    - RpcChannelError(): Added logic to notify the calling app if the error
-                         threshold has been reached and notify the app if a
-                         callback was provided. A zero threshold signifies
-                         the single vmusr limit should not be enforced.
-                         (fix disable switch).
-    
-    services/vmtoolsd/mainLoop.c:
-    - New function ToolsCore_GetVmusrLimit() to retrieve the channel error
-      threshold default or over-ride from tools.conf.
+    Common header file change not applicable to open-vm-tools.
+
+commit 680c9d4a412a099efde6382a0a4e5f300bc4fc4e
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Jun 17 11:41:38 2019 -0700
+
+    linuxDeployment.c: Suppress the telinit error if the first telinit commands
+                       has made VM reboot.
     
-    services/vmtoolsd/toolsRpc.c:
-    - Added ToolsCoreAppChannelFail(): Callback for "permanent" channel
-      connection failure.  A warning is logged based on whether another
-      "vmtoolsd -n vmusr" is running or not and the process is terminated.
-      On Mac OS, the process is terminated with exit(1) as an indication
-      to launchd that the vmusr process should not automatically be
-      restarted.
+    The code executes '/sbin/telinit 6' repeatedly to reboot VM.  VM will be
+    rebooting if the telinit command executed successfully(exitcode==0).
+    Observed the repeated telinit command might get error(exitcode==1) on some
+    GOSes, ex: Ubuntu18.04, RHEL7.4/7.5 and Fedora 29.
+    Observed no such error on older GOSes, ex: Ubuntu14.04, RHEL6.6
     
-    The current implementation uses the error callback only for the vmusr
-    server on Linux (*nix).
-    The default channel error limit is 5 (approx. 5 second), but is user
-    configurable in tools.conf.
+    The error telinit log is confusing, actually it does NOT mean customization
+    failed.
     
-       [vmusr]
-       maxChannelAttempts = n    # where allowed n = 0, 3-15
+    This change does NOT log telinit error, and returns deployPkg status to
+    make sure the log is consistent with customization result when the first
+    'telinit 6' succeeded but one of the following 'telinit 6' command failed.
     
-    When "maxChannelAttempts = 0" is used, the restriction to a single
-    running vmusr process is not enforced.   The existing behavior is
-    restored with all the accompanying VMX log spew.  This is essentially
-    a user configurable feature disablement switch.
+    The following actions are unchanged with or without this change:
+    1. log telinit error, stop loop and exit 127 if the first 'telinit 6' fails.
+    2. repeatedly execute 'telinit 6' if previous one executed successfully
+       (exitcode==0).
 
-commit 0c34a86b232a9904941f825ce8b16320cadaace1
+commit 37d8b16e2cc1a21919cb6974c2a87071a345e232
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Sep 17 16:41:17 2018 -0700
+Date:   Mon Jun 17 11:41:37 2019 -0700
 
-    Changes to common header files not directly applicable to open-vm-tools
-    
-    VGAuth Windows: fix file properties product version and file version
-    
-    Product name of the VGAuth binaries are set to VMware Workstation and
-    the Product version set to experimental (e.x.p).
-    
-    Experimental version has the e.x.p build number in the Product Version
-    field of each of the shipped binaries. Now that we are WHQL signing a DLL too
-    for security it does make sense for the feature to use an official version.
+    Common header file change not applicable to open-vm-tools.
+
+commit 8c87c985179a7a152c9a36aa83edd2b02fc7894d
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Jun 17 11:41:37 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 9e1d3be7c075e8ca4c7ff07b8dadeab8a14953b3
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Jun 17 11:41:37 2019 -0700
+
+    HgfsServer: Fix coverity issue - uninitialized variable "requestId"
     
-    This changes the Product name and version fields from
-    Product name -> VMware Workstation
-    Product version -> e.x.p build-4013326
+    Fix coverity uninitialized variable "requestId" by zeroing it
+    in HgfsServerGetRequest before passing to the request packet
+    HgfsUnpackPacketParams extraction function which will use it
+    in a log message.
     
-    to
-    Product name -> VMware Guest Authentication
-    Product version -> 1.0.0 build-4013326
+    Also moved an assert useful for testing protocol changes which was
+    incorrect in its placement.
 
-commit 5f5a7f4a0984ee35ce79d736426a5335c91da332
+commit d2213fb32a1357305e72cbd6856f5e5ea9e151da
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:28 2018 -0700
+Date:   Mon Jun 17 11:41:37 2019 -0700
 
-    Remove vmxnet and vmxnet3 drivers from FreeBSD builds and open-vm-tools
-    
-    The vmxnet (version 1) network driver is not supported by any currently
-    supported VMware virtualization platform. Removing the FreeBSD
-    specific vmxnet source and deleting the vmxnet.ko driver build from
-    the tools and the open-vm-tools builds.
+    Changes to common header files not applicable to open-vm-tools.
     
-    FreeBSD has their own vmxnet3 network driver based on community source
-    and has never made use of the vmxnet3 source code or drivers from
-    VMware.  Removing the unneeded FreeBSD vmxnet3 source and builds
+    Remove checks for GCC 4.1 in xsave, xrstor, etc. instructions
 
-commit 1a413064fee53ac3e334e96c546886e60724d07a
+commit 83dbe8ed5bf6f9e770e22c670c5617bc93e48e55
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:37 2019 -0700
 
-    Update SSL configuration with more secure settings.
+    Determine Linux OS disk devices associated with mounted filesystems.
     
-    Due to SSL issues in the past, The preference is to have default
-    settings to be more secure than compatible.  This change mainly
-    inherits the default settings from ssl.c.
+    For each filesystem for which disk guestInfo is currently collected,
+    determine the virtual hardware device being used.   This is currently
+    represented as <cntrl class><cntrl #>:<device #>, eg. scsi0:0,
+    scsi1:0, ide0:0 or sata1:4 and matches the virtual device label seen
+    in VMX.
+    
+    A Linux logical volume based filesystem can reside on multiple disks.
+    In order to handle LVMs, the disk devices for each filesystem are
+    maintained as a variable array of disk device names.
+    For Linux guests, disk device names are passed as a json array.
 
-commit 450aca9f244b5e56bcef130df1a06137fd1f07e0
+commit 9bfd01b26e7d22aa847d6282e9b814b05a41e80e
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:37 2019 -0700
 
-    Add virbr* interfaces on RHEL to the default exclude-nics.
+    Common header file change not applicable to open-vm-tools.
 
-commit 5a6e8bc0ef8af2eedbbc4dc1973cb7fe18afa939
+commit f456a5938662175b914ffcb53c6284835476268f
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:37 2019 -0700
 
-    Fix a gcc-8 compiler warning in lib/misc/vthreadBase.c
+    Fix 'Using uninitialized value' issue reported by Coverity.
     
-    gcc-8 generates a stringop-truncation warning when it's possible
-    for strncpy to exclude the trailing nul.  The code was fine, we never
-    touch the last byte in the buffer and it's a static, but explicitly
-    set a nul at the end of the buffer so gcc sees it.
+    * In a error code path, 'exitCode' variable is used without
+      any initialization.  This issue was reported by the Coverity.
+      Fixed it by initializing the 'exitCode' to -1.
     
-    This is needed for open-vm-tools to build on Suse Tumbleweed.
+    * While fixing this, moved the variables to the if block where
+      they are acutally used.
 
-commit 5200ba3a770463e5c6a9e9d7e7a6a949857332ec
+commit 2b3de798522314545b00297f1ece86b223dbeb6f
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:36 2019 -0700
 
-    Return proper vix error code when guest op VIX_COMMAND_DELETE_GUEST_DIRECTORY_EX fails.
+    Common header file change not applicable to open-vm-tools.
 
-commit 8ffda7dbae4b916b28e3f903554bc37db1d5f974
+commit 7cf4c83d4a0b580209184bb4d5ac6c26cd5734f4
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:36 2019 -0700
 
-    Make Tools logfiles readable only by owner and root
+    Fix leak in error path reported by Coverity.
 
-commit b0e2fab2787fbc511d240c4ce0f52a74b55152fe
+commit 1b32002d84c1dbb6dbe34586c04b84d26224c5ee
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:36 2019 -0700
 
-    Reduce quiesced snapshot warning messages when running on older hosts.
-    
-    vSphere 6.7 added a new interface on the host side that allows tools
-    to send a "generic" backup manifest during a quiesced snapshot on
-    Linux guests. VMTools 10.2.0 or later will try to send the manifest
-    file and if the host is unable to field it, then VMTools logs this
-    information and continues with the quiesced snapshot in the older
-    fashion.  This change reduces the logging that is done in this case.
+    Common source file change not directly applicable to open-vm-tools.
 
-commit a4b4c338f1202d161e8cad2eb7cf78d44f2fd302
+commit 5260daab25ee9afdd5267531516b45f5006d57d1
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:36 2019 -0700
 
-    Common source file change not directly applicable to open-vm-tools
+    Improvements for ProcMgr library.
     
-    Verify existence of the returned path, retry the guest OP
-    CreateTemporaryFileInGuest/CreateTemporaryDirectoryInGuest using system
-    temp folder if the path disappears.
+    * This changeset fixes various issues related to ProcMgr library.
+    
+    == Retrieve the absolute path of the image for each process ==
+    * When listing down the processes, it is useful to retrieve the
+      absolute path of the process binary.
+    
+    === For Linux ===:
+    * In /proc filesystem, /proc/{PID}/exe is a symlink to the binary
+      and we can make use of it to figure out the absolute path.
+    
+    * If /proc/{PID}/exe is not a valid symlink, then the 'cmdline'
+      is parsed and aboslute path is calculated accordingly.
+    
+    * Note: This changeset tries its best to figure out the absolute path.
+      If it can't, then the attribute is set to NULL.
+    
+    == Misc issues fixed. ==
+    === Linux ===
+    * Fixed a memory leak with 'procCmdName' while looping through the
+      /proc/ directory entries.
+    
+    * Fixed another memory leak with cmdLineTemp and cmdStatTemp variables
+      while listing down the processes in linux guests.
+    
+    * In few cases, /proc/{PID}/cmdline file contains multiple NUL
+      characters at the end.  In that case, the existing code converts them
+      into 'whitespaces'. Fixed the code to chop of all the trailing
+      whitespaces in the command line.
 
-commit b6c450d123141a752bd4805263b7d476f5b1f26b
+commit ffdf5a69fa3654dc3a16bf9951171290f48561b8
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:35 2019 -0700
 
-    Fix coverity complaint; not a real bug
+    Skip loading/unloading user profile for VMXI_HGFS_SEND_PACKET_COMMAND.
+    
+    This command is used repeatedly to transfer file to/from the guest.
 
-commit 23bd37544bb9ae4069002d73cb1c1b40e221d36a
+commit e858e40d2beb08880e62ccac3f9dcf3661f3e093
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:27 2018 -0700
+Date:   Mon Jun 17 11:41:35 2019 -0700
 
-    Common source file change not directly applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit c2dd430ea5c8c9309700d25548513469dae68c9b
+commit 653248aaff38309a1660f84a347b7eff70e64701
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:26 2018 -0700
+Date:   Mon Jun 17 11:41:35 2019 -0700
 
-    Disable hgfsServer plugin when not running in a VMware VM.
-    
-    VmCheck_GetVersion() accesses Backdoor in an unsafe manner
-    which is not expected to work on non-VMware environments
-    including physical machines. So, we need to make sure that
-    VmCheck_GetVersion() is called only when we are running in
-    a VMware VM.
+    Common header file change not applicable to open-vm-tools.
 
-commit 31a60ab3529a8dad8d602a524d194013d90abeec
+commit 2ca144aceda2bae479f3b67eb0d60e4ef7e439dc
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:26 2018 -0700
+Date:   Mon Jun 17 11:41:35 2019 -0700
 
-    Expose more guest stats for vROPS to report the exact physical memory
-    stats as the guest OS UI does.
-    
-    Windows:
-    guest.mem.modifiedPages (Win32_PerfRawData_PerfOS_Memory#ModifiedPageListBytes)
-    guest.mem.standby.core (Win32_PerfRawData_PerfOS_Memory#StandbyCacheCoreBytes)
-    guest.mem.standby.normal (Win32_PerfRawData_PerfOS_Memory#StandbyCacheNormalPriorityBytes)
-    guest.mem.standby.reserve (Win32_PerfRawData_PerfOS_Memory#StandbyCacheReserveBytes)
-    
-    Linux:
-    guest.mem.total (/proc/meminfo#MemTotal)
-    guest.mem.buffers (/proc/meminfo#Buffers)
-    guest.mem.cached (/proc/meminfo#Cached)
-    guest.mem.slabReclaim (/proc/meminfo#SReclaimable)
-    guest.mem.available (/proc/meminfo#MemAvailable since Linux 3.14, emulated by VMTools for kernels 2.6.27+)
+    Common header file change not applicable to open-vm-tools.
 
-commit 0b01aefe3ee960c6035863bcf4fd7e2ff654b99b
+commit 3583ad84072c618064dfea742faa763b5f8207f0
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Sep 7 15:53:26 2018 -0700
+Date:   Mon Jun 17 11:41:35 2019 -0700
 
-    Update the tools version to 10.3.5
-    
-    Set the tools version in vm_tools_version.h to be
-    TOOLS_VERSION_JACKHAMMER_UPDATE1 = 10.3.5.
+    Common header file change not applicable to open-vm-tools.
+
+commit 4e06bc447106be090fefdb6ea057482152390d73
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Jun 17 11:41:33 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
 
-commit 2147df6aabe639fc5ff423ed791a8e7f02bf8d0a
+commit be8b98cda2d3149966b73d91cc76e77bf19d8228
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Jul 13 11:54:23 2018 -0700
+Date:   Mon Jun 3 13:39:45 2019 -0700
+
+    Common source file change not applicable to open-vm-tools.
 
-    prepare for 10.3.0 release
-commit a30d7aaa4d10fbce4b7d262487fffaf1dc32d949
+commit 61c51b4e4ac091f066e5e0efa22cc39d00b05d6d
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Jul 6 14:31:55 2018 -0700
+Date:   Mon Jun 3 13:39:45 2019 -0700
 
-    Common source file change, not directly applicable to open-vm-tools.
+    Fix memory leak in SNEBuildHash function.
     
-    Enforce monotonic behavior for the value returned by times() on Mac.
+    In a specific code path, if a key already exists in the hashtable,
+    the memory allocated for 'value' variable is not being freed.  This
+    leads to a memory leak.  Fixed.
 
-commit 12e5559e4dcf3968dd45131077b68364578f3bef
+commit 0d5e8c618131e3899f3c30c91722e1df4e1162e9
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Jul 6 14:31:55 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    Update the Tools-10.3.0 OSL.
+    Common header file change not applicable to open-vm-tools.
+
+commit f37292f0a8524783888d55f57fa30bb828e2408b
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Jun 3 13:39:44 2019 -0700
+
+    Crash during File_WalkDirectoryNext
     
-    Update the Tools-10.3.0 open source license files.
+    In the rewrite of File_WalkDirectoryNext, a bug was introduced in the
+    invalid Unicode path. Invalid Unicode occurs very rarely... and the
+    bug finally turned up. Fix this... the bug is rather obvious.
 
-commit c80bb3fc7960bc78a6d39c89b6952218a401b0cf
+commit 1749604dc3481d0cc670e97945b915821c1039d3
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Jul 6 14:31:55 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    [tools-plugin] Potential solution for reported desktopEvent crash
+    Fix asianux identification.
     
-    On several distros like RHEL, CentOS and Fedora, plugin desktopEvents.so
-    crashes have been reported.  However, neither development or QE can
-    reproduce this issue in local environments.
+    Add asianux to distroArray and change how asianux releases 7 and 8
+    are identified.
     
-    The XFetchName document states that it may generate BadWindow error.  That
-    means that the value for a Window argument does not name a defined Window.
-    X FAQ also suggests handling badwindow error after finding it.  Since
-    the window does not exist when XFetchName is run on it, the name is not
-    needed.  Suppress this error to avoid a crash.
+    This came in as a pull request on github for open-vm-tools:
+    https://github.com/vmware/open-vm-tools/pull/325 .  Apparently
+    the OS identification in /etc/asianux-release changed with Asianux
+    7, and as a result tools does not identify it correctly.
+
+commit 19969734d2a64e52cccf8f04669b55ad13f9c61c
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Jun 3 13:39:44 2019 -0700
+
+    Fallback to /proc/mounts.
     
-    After grabbing the X server, use XSetErrorHandler to temporarily define
-    a local error handler to intercept and cleanly handle any BadWindow
-    errors.  XSetErrorHandler returns the current error handler, so it is
-    straightforward to reinstate GDK's original handler.
+    Use /proc/mounts on systems where /etc/mtab may not be there.
+    This change is targeted for guestInfo reporting at the moment.
 
-commit 6172812c021469704c51817693c6c8f6bf226509
+commit f78a6801a8ec0f549fc3aa3817215f91cf6607af
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Jul 6 14:31:55 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    Remove the new guest metrics feature switch, permanently enabling the
-    collection of new guest metrics for vROps..
+    Common source file change not applicable to open-vm-tools.
 
-commit 6e6285ec690a13ff8ba894ee463a5aa0fd034269
+commit e3f8ffec4a1de47cb62e4d8b2ba175a03da13246
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:46 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    Previous change to configure.ac and vmtools.m4 caused a regression
-    
-    Backing out of 10.3.0.
+    Common source file change not directly applicable to open-vm-tools.
 
-commit 699cda01fab8b1ad8a1e912d650aa92f7ffdf0e6
+commit 70596395cf892d07321ddd9ee8f947c06973e565
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:46 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    [OVT] Update copyright year to 2018 for few files.
-    
-    Updated the copyright year to 2018 for few files changed in the last
-    few days.
+    Common header file change not applicable to open-vm-tools.
 
-commit cecbaf6b16f5fd1ecbfe4419310352353b047ba2
+commit a652f6e7c2c14310e2f6f030660b73e48aeeba80
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:46 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    open-vm-tools: use AC_CHECK_TOOL for pkg-config
+    Common source file change not directly applicable to open-vm-tools.
+
+commit c209a5619fa74f6b76171420c57fd65303331a0f
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Jun 3 13:39:44 2019 -0700
+
+    Update to common source code; does not affect open-vm-tools.
     
-    AC_CHECK_TOOL honors the --host setting to configure, and searches
-    for tools with the cross compile prefix thus allowing for cross
-    compile specific tools.
+    Allow an asyncWebSocket to connect through an existing socket descriptor
     
-    Fixes issue #26 in github.
+    Because Windows does not allow unprivileged processes to specify
+    DSCP (formerly ToS) values on TCP traffic, in order to support
+    DSCP for Blast WebSockets we must obtain a preconfigured socket
+    descriptor from a privileged process and then build the WebSocket
+    connection over that socket.
+    
+    This changeset extends the asyncWebSocket API by adding a Connect
+    function that can accept and use an existing socket descriptor in
+    addition to the usual collection of WebSocket Connect parameters.
+    
+    Because the asyncWebSocket is built over an asyncTCPSocket, this
+    change ripples down into the asyncTCPSocket API which also gets a
+    new Connect variant with a socket descriptor parameter.
+    
+    To avoid duplicating existing logic, the old Connect variants
+    are modified to do their work by invoking the new API with
+    a distinguished socket descriptor value of -1.        This value
+    indicates that no existing socket descriptor is provided and
+    that a new socket should be created and used for the connection.
+    
+    In this changeset, passing in an existing socket is supported
+    only on the Windows platform.  The feature is not required on
+    other platforms, where unprivileged processes are permitted to
+    define DSCP values for their connections.  Attempting to create
+    a connection over an existing socket on other platforms will
+    result in a Connect failure.
 
-commit f2c8d02161569c96ac452f9d1063756d133562ba
+commit 20e8a3d4213019202241d766ba3c7c660c4b74c2
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    open-vm-tools: build dndcp with thread libs
+    Round out Log functions to all levels
     
-    Recent changes in the dndcp plugin made it necessary to make sure that
-    it links against pthread libs.
+    Logs would be measurably more useful for debugging if the available
+    levels were used correctly and consistently. As a step towards
+    encouraging such use, define Log_Warning() and Log_Info() as synonyms
+    for Warning() and Log() (which, for historical reasons, are not
+    declared in log.h). Also remove all the conflicting private definitions.
 
-commit 99df5712ba7b8910c3db138c64aab6957f31c914
+commit e45c4e3da624187d83f25681cf25b67ae059b6ed
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    Clipboard content on the host gets loaded to tmp on Linux guest with a right click on Guest
-    
-    Root Cause:
-    Dndcp plugin creates a sub thread to monitor if there is other application
-    access the specific file.  The root cause for this bug is the main thread
-    doesn't update its field before wakeup the sub thread, this cause the sub
-    thread get a wrong value.
-    
-    Solution:
-    Main thread should update the field before wakeup the sub thread.
+    Common header file change not applicable to open-vm-tools.
 
-commit 99af79200f91c246580197b5698995fba4dc47af
+commit 94ffa684475ea998347b4c6e25626d099eb8315c
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    open-vm-tools: build for FreeBSD fails in fakeMouseWayland
-    
-    Root Cause:
-    In the file fakeMouseWayland.cpp, several Linux related header files
-    are included:
-      <linux/input.h>
-      <linux/ioctl.h>
-      <linux/uinput.h>
-    
-    These header files do not exist for FreeBSD and Solaris.
+    Linux DeployPkg configurable timeout.
     
-    Solution:
-    Lib fakeMouse is not needed by FreeBSD and Solaris, so update the makefile
-    to build the fakemouse related code only on Linux.
+    Update to descriptive comments for function DeployPkg_SetProcessTimeout().
 
-commit 104cab14e08b93a2525992e09f0d13ff26d52d9d
+commit 4bd043870ec94332aa8b3794449a2144847cad33
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Mon Jun 3 13:39:44 2019 -0700
 
-    Use "/var/run" or "/run" instead of "/tmp" in Linux guest for imc package copy
-    
-    1. check if /var/run is a directory in VM
-    2. if Yes, use /var/run/XXXXXX
-    3. check if /run is a directory in VM
-    4. if Yes, use /run/XXXXXX
-    5. if both No, use /tmp/XXXXXX as before
+    Common header file change not applicable to open-vm-tools.
 
-commit 8f93d803066032a738b9d9a6990e32ed17b589e1
+commit 46cb6aa361cc8b1d287e3b9b77bf86819b4b1fc5
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Wed May 22 13:09:37 2019 -0700
 
-    Build open-vm-tools with xmlsec1 by default.
-    
-    Build open-vm-tools with xmlsec1 by default, rather than with
-    xml-security-c as is done currently.  This requires modifications
-    to configure.ac to change the default for use_xmlsec1, plus
-    modifications to bora-vmsoft/install/Source/tools-pkg.make to
-    initialize flags for xmlsec1 and xml2 now needed by the OVT build
-    that is done during tools builds.
-    
-    Another change that surfaced during this was that the symbol that
-    configure checks for the xmlsec library was wrong.  It should be
-    xmlSecCheckVersionExt rather than xmlSecCheckVersion.  The latter
-    is a header-defined macro but not a library symbol.
+    Fix [RH Covscan] Coverity reported memory leaks in toolboxcmd-stat.c.
 
-commit 7313fdc5b2b14ac83340b2e59752b934494c2ae9
+commit d0f0af3e62d065492b29791556c39c27eb97c751
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Wed May 22 13:09:37 2019 -0700
 
-    [Wayland Copy & Paste] Part2: Uses VMBlock notification mechanism for Copy & Paste
-    
-    This patch is part of the new feature for Workstation 15: \[P0\] Wayland
-    support in Linux guest - Copy & Paste.
-    
-    In the first patch, the notification mechanism is added to the VMBlock module.
-    In this patch, the notification mechanism is used,
+    Common header file change not applicable to open-vm-tools.
 
-commit c04b9987786901f544c4df04f7701b48ac8f6475
+commit 873db0841a17a530cabe6b6e6e473647da685c17
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Wed May 22 13:09:37 2019 -0700
 
-    [Wayland Copy & Paste] Part1: Add notification mechanism to the VMBlock module
-    
-    This patch is part of the new feature for Workstation 15: [P0] Wayland support
-    in Linux guest - Copy & Paste.
-    
-    In the implementation of current VMTools, there is a restriction, in the first
-    second after grab into the guest, the CopyPasteUIX11::LocalGetFileRequestCB,
-    which is a callback from a file paste request from another guest application
-    and begins copying the files from host to guest and return the file list,
-    will return none directly.
-    
-    The Wayland file explorer will request the content in the clipboard after the
-    user clicks on the file explorer, and the request will get nothing since the
-    restriction in the VMTools, so the following ‘Paste’ operation will fail.
-    
-    Solution:
-    This solution is only used for the Linux guest with Wayland. The behavior
-    for Linux guest with X11 will not change.
-    
-    The restriction, the CopyPasteUIX11::LocalGetFileRequestCB returns directly
-    in the first second after grab into the guest, will be removed.
-    
-    And, the notification mechanism will be added into the VM block file system.
-    This mechanism is similar with the inotify module.
-    
-    Take the VMBlock Fuse File System as an example, currently, the mount point contains below contents:
-    
-    * /blockdir/
-    
-    * /dev
-    
-    /blockdir/ contains the symlinks to the contents of the target directory.
-    
-    /dev is the control file for VMBlock Fuse File System.
-    
-    In this new solution, a new folder /notifydir/ will be added, each file in this folder is a special file, read from this file will be blocked until any other process read from the corresponding file in target directory or the block on the target directory is removed.
-    
-    This patch only focus on the notification mechanism.
+    Common source file change not applicable to open-vm-tools.
 
-commit 6c0b2130e7ee103ece06eb674c5f5dfea66c26f1
+commit 403dc83d2040d386b2c6c04756b289f277657e41
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Wed May 22 13:09:37 2019 -0700
 
-    FreeBSD: clang compiler related changes to configure.ac
-    
-    On FreeBSD, the unwind.h header is available in the libunwind
-    package (/usr/ports/devel/libunwind) which may or may not be installed
-    on a system.  The libunwind functions to determine the call-chain in a
-    program are defined only if " __GNU_SOURCE" is defined to enable "all"
-    GCC extensions.  Avoid the unwind.h header if seen on FreeBSD.
-    
-    The "clang" compiler will issue warnings if the address of a member
-    of a packed structure is taken.  Since warnings are errors with -Wall,
-    add --Wno-address-of-packed-member to CFLAGS when compiling with
-    "clang".
+    Common header file change not applicable to open-vm-tools.
 
-commit bba52bfa5b29c8860f18200022db5b8b250d326b
+commit af0a4979c7bcaba6a913e686609f99c1245db384
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:45 2018 -0700
+Date:   Wed May 22 13:09:37 2019 -0700
 
-    open-vm-tools: build with tirpc
-    
-    Newer distros (Fedora, OpenSuSE Tumblweed) no longer ship rpcgen with glibc,
-    so we need to build with libtirpc (see
-    https://bugzilla.redhat.com/show_bug.cgi?id=1531540 and
-    https://bugzilla.suse.com/show_bug.cgi?id=1089181).
-    With this change, configure will check for the presence of libtirpc and
-    if found, sets flags to build with it. configure will also exit with an
-    error if rpcgen is not found.
+    Change to common header file not applicable to open-vm-tools.
 
-commit 5c0b9496db96af9ea5e4b3b1321f0612a3f62d99
+commit 7c1e69708bc3bbdbf9dc66b039ab40f9767b29c1
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:44 2018 -0700
+Date:   Wed May 22 13:09:37 2019 -0700
 
-    Changes to build CAF with VS 2015; not applicable to open-vm-tools.
+    Change to common header file not directly applicable to open-vm-tools.
 
-commit 3961588fcce58090c249f4a65ad8cc109efecc5c
+commit da3efa69411c5fe8897e6295927dc4b8eacaff04
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:44 2018 -0700
+Date:   Wed May 22 13:09:36 2019 -0700
 
-    Log full version of Tools in vmware.log.
-    
-    Currently, only the Tools build number is logged in vmware.log.
-    It will be very handy to have the full version logged in
-    there and avoid the need to manually lookup the build.
+    Changes to common source files not directly applicable to open-vm-tools.
 
-commit bf494fd02a77a4f34ff420c03c0c5a19e43218d3
+commit 8017efa7e941561274088d27e32883f6c1965abf
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:44 2018 -0700
+Date:   Wed May 22 13:09:36 2019 -0700
 
-    Tools 10.3.0 L10n drop2
+    Pick up filesystem (fsType) name for Linux disks.
     
-    This is to integrate the final L10n drop for VMware Tools 10.3.
+    Building upon the OS Volume Disk Mapping changes added for Windows
+    guests, pick up and propogate the filesystem type for Linux disks.
+    Move fsType related code and declaration out of the _WIN32 specific
+    source code.
+    
+    Diskwiper code (for Linux) modified to pass along filesystem type
+    obtained from the MNTINFO structure from the non-Windows guest.
+    Also passing along the mount point for device-based mapping to be done
+    in the guestInfo plugin.
 
-commit 065f09b94e09f1127901db29e73cc9b9f36df4fc
+commit 82d42ead6fc14eed2bc1670352f5fb8f62413230
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:44 2018 -0700
+Date:   Wed May 22 13:09:35 2019 -0700
 
-    Add two switches for max IPv4/6 routes to gather
+    Change to common header file not applicable to open-vm-tools.
+
+commit 744fe0bec43f7e242f1353c767c613180512000d
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed May 8 15:27:20 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 5b0e339cde98dce03ec5046c04ded329f61dc5ef
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed May 8 15:27:20 2019 -0700
+
+    Fix the 'procCmdName' attribute of process information.
     
-    Gathering nic info in a Linux guest OS which is configured with large
-    number(60000+) of ipv6 routes could result in vmtoolsd process taking a
-    long time and rock solid 100% CPU of a core.  Though tools only exports
-    at most NICINFO_MAX_ROUTES(100) routes, it tries to read all the contents
-    of /proc/net/ipv6_route which costs too much time because:
-    1. IPv6 route table is not efficient natively compared to ipv4 due to
-       its implementation.
-    2. The g_io library can aggravate the performance.
+    * When listing down the processes, /proc/{PID}/cmdline file is read
+    and parsed to figure out the command name.  While doing this parsing,
+    the terminating NUL character is not parsed.  Due to this, if any
+    process doesn't have any command line arguments, the 'command name' is
+    retrieved as NULL.
     
-    On the other hand, when gathering routes, IPv4 comes first, and IPv6 second.
-    And the routes reported to VMX has an overall limitation of serializing
-    (NICINFO_MAX_ROUTES).  If there's more than NICINFO_MAX_ROUTES IPv4 routes
-    in system, no IPv6 will get reported.
+    Note: This issue doesn't happen if the cmdLine has any arguments.
     
-    Added two switches "max-ipv4-routes" and "max-ipv6-routes"
-    (NICINFO_MAX_ROUTES by default) in tools.conf and let SlashProcNet_GetRoute*()
-    only read the first max ipv4/6 routes lines of /proc/net/[ipv6_]route to avoid
-    performance problem.  Users can disable ipv4/ipv6 routes gathering
-    separately if they want ipv6 or ipv4 only.
+    Ex:
+    /usr/bin/vmtoolsd -> 'cmdName' is retrieved as NULL
+    /usr/bin/vmtoolsd -n vmusr -> 'cmdName' is retrieved properly as 'vmtoolsd'
+    
+    * Fixed the code to include the trailing NUL character also while parsing.
 
-commit bf86c612a8ffe1d20b98c20b76f0c34840a7a2a3
+commit 7b096ae277428efd8f550c1bbb35e98bb0cdf565
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:44 2018 -0700
+Date:   Wed May 8 15:27:20 2019 -0700
 
-    Not checking symbols when building open-vm-tools
+    Hgfs fuse Client: fix max name length setting for statvfs
     
-    Using a hard-coded mangled name is not a good idea because C++ does not
-    have any standard for name mangling.  Remove these mangled names introduced
-    in an earlier fix.
+    Detected internally with Fedora 29 and reported in
+       https://github.com/vmware/open-vm-tools/issues/337,
+    the statvfs structure must provide a valid max name length field.  Setting
+    to NAME_MAX.  This allows the GUI Files application to create new folders
+    and rename existing ones correctly.
 
-commit d36ed6e5b4784a36cb93f50e05d6a49b5d76b86e
+commit 9876844113a4f6b538f131d61b61c994264f7caf
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:44 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    [OVT] Update copyright year to 2018 for files modified since 10.2.5 GA
+    Plumb through filesystemType
+    
+    Implement the filesystemType property in the vim.vm.guestInfo.DiskInfo.
 
-commit 8086ead225faf3a051952773c0b98b2c751b1e84
+commit 79c7f28781fc38eb2e2ec691c907822dd1259bc4
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:44 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    Hgfs Win Client: fix bad illegal character escaping; not applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit 7efc7b70a57cf734012a069fabab19e96f8cf16d
+commit 000856aea0bd78c581888c3e3771cf79c6fdb7e9
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:43 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    Add the JACKHAMMER code name to the 10.3.0 release version defines.
+    Fix copy/paste on Ubuntu 19.04 guest
     
-    Adding the code name JACKHAMMER to the 10.3.x series version notation
-    for the public source release and use by future 10.3.x patches or
-    updates.
+    Ubuntu 19.04 chooses Nautilus 3.32 as the default file browser.  From
+    3.30, Nautilus checks mime type when pasting files from the clipboard,
+    and the target type is also changed to UTF8_STRING instead of
+    x-special/gnome-copied-files.  To support Ubuntu 19.04, apply this
+    change into our guest code.
 
-commit d71381445f6c3b986e263435006428a44be0451a
+commit 7bbb1521360bd140a56d1fbf6a9663d297277901
 Author: Oliver Kurth <[e-mail]>
-Date:   Tue Jun 19 11:07:43 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    Hgfs Server Plugin: only handle the shared folders client in hosted products
+    Add a comment in vmci_sockets.h about why a file handle is "leaked"
     
-    Only initialize the Shared Folders client redirector in hosted product
-    environments.
+    Let's add a comment in vmci_sockets.h explaining why we intentionally "leak"
+    a file handle in VMCISock_GetAFValueFd.
     
-    Details: Check if the tools system service started in a non-hosted product
-    and if so do not start the shared folders client redirector.
-    Check if the tools user service started in a non-hosted product product and if
-    so then skip reconnecting any Shared Folders mapped drives.
+    fd is intentionally left open when outFd is NULL. Closing it
+    will break applications running on Linux without a fixed AF for
+    vSockets. In such cases, the fd will be closed during cleanup when
+    the application exits.
 
-commit ad7c68780a773d6d456687aff0d27f9cff808370
+commit a5823224051da0318facf10e0732baa9f55334fc
 Author: Oliver Kurth <[e-mail]>
-Date:   Thu May 10 16:47:16 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    update version number
+    Fix a trivial Coverity-reported memory leak.
+    
+    If AuthLoadPAM doesn't find all the needed symbols from the pam
+    library, then dlclose the library, as is already done for
+    the same-named funtion in bora/lib/auth/authPosix.c.
 
-commit cac0f086ffcc00da73dd7dd80fef6956962f4dd6
+commit 47766e511be85410f5afc0bf8b0f05776fb66ece
 Author: Oliver Kurth <[e-mail]>
-Date:   Thu May 10 16:38:11 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    Remove debug display of CPUID vendor string seen in VmCheck_IsVirtualWorld
+    Record Tools version 10.3.11 as Hot Patch for PR 2328829
+
+commit 801df14f0e2b32aea17771bbd33d65140ff2361c
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed May 8 15:27:19 2019 -0700
+
+    Fix Coverity-reported double memory free errors.
     
-    The "Debug" message containing vendor string returned by the CPUID
-    instruction will appear on STDERR for stand-alone programs such
-    as vmware-checkvm.  This unexpected output is at best noise and may
-    adversely affect existing scripts.
+    Similar double memory free errors were reported in each of two
+    functions, VixToolsListAuthAliases and VixToolsListMappedAliases.
+    The fixes for each function are similar: be consistent in using
+    tmpBuf2 (renamed tmpBuf) as the pointer to the overall buffer being
+    computed and tmpBuf (renamed nextBuf) as the "next" version of the
+    buffer.  Specifically, in the computation of recordBuf following exit
+    from the for loop, use the variable formerly known as tmpBuf2 rather
+    than the one formerly known as tmpBuf.
+    
+    The variables were renamed in an attempt to distinguish more clearly
+    between them and how they are used.  Also, with these changes in
+    place, it's evident that there's no need to free nextBuf in the abort
+    case and as a result its scope can be limited.
 
-commit 7ddbe3c9df400dfdf7d67d259ae3942d157dedb4
+commit 2031724154177a3f5ce28d3c608709c7ad6153dc
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 30 15:42:54 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    sync deploypkg files
+    Common header file change not applicable to open-vm-tools.
 
-commit 80a23d71a281493071668fd45b77d7f8248fad68
+commit 8634350c330318eaf8f333c49f405e20b71ca813
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 30 14:04:14 2018 -0700
+Date:   Wed May 8 15:27:19 2019 -0700
 
-    Changes to common header files:
-    - Add Amazon Linux 2 to the known guest OS list.
-    - Other change not application to open-vm-tools.
+    Common header file change not directly applicable to open-vm-tools.
 
-commit 48dc7a57ff3fe5cb1441040876f74b69772c1ea5
+commit 2bbd56da4314856dfc1a8fed2db5b55cd9ef8860
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 30 14:04:13 2018 -0700
+Date:   Wed May 8 15:27:18 2019 -0700
 
-    [DeployPkg] Replace Log() references with g_log()
+    Fixes for few leaks and improved error handling.
     
-    * Modified the code to replace a couple of Log() references with g_debug()
-    so that they are properly logged with 'deplogPkg' domain instead of the
-    generic 'vmsvc' domain in the tools log files.
+    Fix a memory leak detected by coverity scan. It is not critical,
+    but it is real in an error case when there is no end mark. While
+    fixing it, also enhanced code to handle different error cases
+    properly because we would want valid content to be decoded even
+    when there are invalid marks in the log file. Invalid log marks
+    are possible when vmware.log gets rotated in the middle of guest
+    logging.
+    
+    While verifying the fix using valgrind, found a couple of more
+    leaks in panic and warning stubs. Addressed those as well.
 
-commit 9cb12223b4da529df043d95ab025f22c6ee00c39
+commit 544cf1363c78d1d8c75e57d560b3650b5f667c64
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:18 2018 -0700
+Date:   Wed May 8 15:27:18 2019 -0700
 
-    [oss] Upgrade GTK+ and its dependent libraries for VMtools
+    Fix a trivial Coverity-reported memory leak in vgauth/cli/main.c.
     
-    GTK+ and its dependent libraries are upgraded to:
-    gtk+       2.24.32
-    atk        2.28.1
-    gdk-pixbuf 2.36.11
-    pango      1.40.13
-    cairo      1.14.12
-    fontconfig 2.13.0
-    freetype   2.9
+    Call Pref_Shutdown to close the PrefHandle.
 
-commit a5c03957c95ec78c92246b87cdf60a90b2eca7f7
+commit 4a2c4645a363c705e66cdb81847f579d8ff30e04
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:18 2018 -0700
+Date:   Tue Apr 30 13:24:25 2019 -0700
 
-    Common header file change not applicable to open-vm-tools.
+    Add garbage collection for vix process handles.
+    
+    This closely follows the model used for hgfs session cleanup.
 
-commit f87d177acab33f00229234ed51722504e2f7afc7
+commit ea2ee4789fd0db5451752ea98af55a3c6b47f1d2
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:18 2018 -0700
+Date:   Tue Apr 30 13:24:25 2019 -0700
 
-    Changes to common header files not directly applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit ba65905dfc7e6c07d1aeea37db885284e54b02fa
+commit 4ee0255f2f7a32a76095de8c02a869e78f7ec765
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:18 2018 -0700
+Date:   Tue Apr 30 13:24:25 2019 -0700
 
-    Set perms on Tools script logs.
-    
-    Make the network script logs secure; set log file perms to 0600.
+    Common header file change not applicable to open-vm-tools.
 
-commit aa59d16e0b5968efc298065ef50ece282d406265
+commit 9e6e3afa5b5c3dc11c7aa79454ca4c8184c87bdf
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:18 2018 -0700
+Date:   Tue Apr 30 13:24:25 2019 -0700
 
-    [Wayland DnD] Part2: Open the uinput device file with root permission.
+    Fix a memory leak in the unicode library.
     
-    The device file /dev/uinput (or /dev/input/uinput) can only be accessed
-    by root account, so the dndcp plugin may failed to open this device file
-    if the current user is not root account.
-    
-    A way to fix this issue is opening this device file with root account,
-    then pass the file descriptor to the sub task which is started with the
-    current account. An example for this solution is blockVM file system
-    device file.
+    Ensure that allocated strings are freed before returning a failure.
     
-    This patch is part of the new feature 'Wayland support in Linux guest'.
+    The ASSERTs have never been known to fire; a warning in a obj
+    build will help with debugging. The warning should "never" happen.
 
-commit b3899c91d348d23c2e6c22944b8ac1a06e4e3988
+commit d1de801b4b490aeecd982f19274e46485f156f79
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:18 2018 -0700
+Date:   Tue Apr 30 13:24:25 2019 -0700
 
-    [Wayland DnD] Part1: Add 'fakeMouse' module which is used to simulate the
-           mouse motion under Wayland
-    
-    For Linux guest with X11, the VMTools uses the X system APIs to simulate
-    the mouse motion, but these X11 System APIs do not work in Wayland. Need
-    to pick up another method to simulate the mouse motion.
+    Common header file change not applicable to open-vm-tools.
+
+commit b2a6fdafed0bef27a77d549e4ffbed9a09b9f0bd
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:25 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit a63fe3472895c9394ee8c3f2d0d2a496c3ccab6f
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:25 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 9bec96154c23462f2c6f80dd660f41bba38d4614
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:25 2019 -0700
+
+    Provide a shutdown function for users of the unicode library to free memory
+    allocated by Unicode_Init().
     
-    Another way to simulate the mouse motion is using uinput module.
+    Most applications using the unicode library do not free related memory
+    since they are about to terminate.  A Unicode_Shutdown() function is
+    provided which will explicitly free the memory allocated by Unicode_Init().
+
+commit 5614d61a2b8353cd48095210afbcc89f66228ae7
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:25 2019 -0700
+
+    Changes to common header files not applicable to open-vm-tools.
+
+commit 4ae954db584b7e3287a97f44d0eeb96d09ba2c68
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:25 2019 -0700
+
+    Common header file change not directly applicable to open-vm-tools.
+
+commit 35570e72d3833b73db653c89c84223c959856467
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:25 2019 -0700
+
+    Changes to common source files not directly applicable to open-vm-tools.
     
-    uinput is a kernel module that makes it possible to emulate input devices
-    from userspace. By writing to /dev/uinput (or /dev/input/uinput) device,
-     a process can create a virtual input device with specific capabilities.
-    Once this virtual device is created, the process can send events through
-    it, that will be delivered to userspace and in-kernel consumers.
+    Added the function Random_FastStream64() to provide a 64-bit random number
+    if needed.
+
+commit e89c751f0045f163c468c49b71db70478581c85c
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:25 2019 -0700
+
+    vm_basic_defs.h: include stddef.h
     
-    Here is the link which contains more information about the uinput module:
+    The stddef.h header has existed since C89. It includes interesting
+    things like an offsetof definition, and a definition of NULL.
     
-    https://www.kernel.org/doc/html/v4.12/input/uinput.html
+    Let's stop re-inventing this long-standardized header. Except
+    in vmkernel, where bogus __FreeBSD__ values break gcc's <stddef.h>.
+    (Detail: vmkernel networking likes to define __FreeBSD__ to empty
+    or 1, whereas ABI requires "FreeBSD major version".
     
-    This patch adds a new module named 'fakeMouse' which is used to simulate the mouse motion under Wayland.
+    This change is deliberately minimal as touching headers included
+    everywhere is inherently fragile. Further cleanups (like removing
+    vmw_offsetof) can be done in follow-up changes.
     
-    This patch is part of the new feature 'Wayland support in Linux guest'.
+    The stddef.h header is a 'freestanding' header, which means it's
+    part of the language and not a "system" header. It is thus safe
+    to include (modulo vmkernel-networking problem above).
 
-commit 995befcb0d6156fb47773c96db6d478173d1bc89
+commit 642d7a61db13969f9fb654ad1cc0d879bf680612
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:18 2018 -0700
+Date:   Tue Apr 30 13:24:25 2019 -0700
 
-    Add new guest metrics to be consumed by vROps.
+    Fix Coverity reported issues in i18n.c code - VMTools & VGAuth
     
-    Windows:
-    * ProcessorQueueLength
-    * CurrentDiskQueueLength
-    * AvgDiskQueueLength
+    bora-vmsoft/apps/vmtoolsbib/i18n.c: MsgLoadCatalog()
+    - Coverity reported memory leak when an error is encountered parsing a
+      line from a message catalog.
+    - Second memory leak on error missed.
     
-    Linux:
-    * CPU run queue size
-    * Current disk queue size
-    * Average disk queue size
+    bora-vmsoft/vgauth/common/i18n.c: MsgLoadCatalog()
+    - Coverity reported some dead code.
+    - Missed reporting memory leak when error is encountered parsing a
+      line from a message catalog.
 
-commit 9d6cfe650cd15095e65024fbb5d9cd6944e1cf14
+commit 0f7b4b275aaf20bebf8d4739cf283fade05c3dcb
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Tue Apr 30 13:24:25 2019 -0700
 
-    Historical: Recording version numbers assigned for 10.2.x patches.
+    Common header file change not applicable to open-vm-tools.
+
+commit 9e0ccaa3bf2805674fd882362427aa2d3376a3a8
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:24 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 3cf1df758ba64cb6aebe81bf3a430ad536221c19
+Author: Oliver Kurth <[e-mail]>
+Date:   Tue Apr 30 13:24:24 2019 -0700
+
+    Toolsd uses log.text RPC only when the useLogTextRpc is set to TRUE.
     
-    Define TOOLS_VERSION_CHAINSAW_PATCH1 as 10.2.1.
-    Define TOOLS_VERSION_CHAINSAW_PATCH2 as 10.2.6.
+    This allows the tools installer to start use the log.text RPC without
+    worrying about that toolsd has not completed the work of scrubbing its logs
+    for security and privacy issues.
 
-commit ba6c319f18d294b36c0e989f851fbfdbc8a629b7
+commit 1b755d3e619ed40d8750532f10af5a1df6de6cda
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Tue Apr 30 13:24:24 2019 -0700
 
-    Bump up the version requirement for glib and friends to 2.34.0
+    Fix memory leak in SNEBuildHash function.
     
-    For open-vm-tools, we are bumping up the minimum version requirement
-    to 2.34.0 for glib and its friends. Modified the configure.ac
-    with the proper new version checks. Also, updated the
-    error message with the proper version.
+    In a specific code path of the SNEBuildHash function, when the
+    environment variable is of the format VMWARE_*=[0|1], the value
+    is not freed.  Fixed the memory leak.
 
-commit 26d03ad8075913cb869b814462b7285c02367252
+commit 0957e9c46476f8eab435576e7094b125e102f6ce
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Tue Apr 30 13:24:24 2019 -0700
 
     Common header file change not applicable to open-vm-tools.
 
-commit ce1ed002f5e05f09678e15b4021bac8155edb1eb
+commit bbefe8051a56b3cf834bf71c8f55fdfd88802b9d
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Mon Apr 15 11:33:00 2019 -0700
 
-    Common source file changes that are not directly related to open-vm-tools.
-    
-    Build vmtools and vgauth for Windows with xmlsec instead of
-    xml-security-c.  It will still be possible to build with xml-security-c
-    either by commenting out the definition of USE_XMLSEC_FOR_WINDOWS in
-    bora-vmsoft/vgauth/make/inc/defs.mk or adding a make command line
-    argument of USE_XMLSEC_FOR_WINDOWS=0.
+    Common header file change not applicable to open-vm-tools.
 
-commit d5c0bcea04aae65484ba3c2756b64acf6f6388d0
+commit a0b825b2251bf9d30fb29d5deb1d269ec361428c
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Mon Apr 15 11:33:00 2019 -0700
 
-    Update bora-vmsoft/install/Source/README
-    
-    The content is stale. Since the file is used internally and is
-    not published, rather than maintain it in two places, point to
-    the current README file and Release Notes on github.
+    Common header file change not applicable to open-vm-tools.
 
-commit 512d5475520ec5e0525633cd47530faaae774b5e
+commit abd87bf17c9869900dad292a458b871de90c4c7d
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Mon Apr 15 11:33:00 2019 -0700
 
     Common header file change not applicable to open-vm-tools.
 
-commit 982998c9a6a3ec8664f9c4c08ff9ef30f52a9ae2
+commit 85bc2e71dd7a855d3c533965859c1756deecc314
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Mon Apr 15 11:33:00 2019 -0700
 
-    Common header file change not applicable to open-vm-tools.
+    Fix minor leak in FileRotateByRenumber - Coverity scan
 
-commit ab36b3227275a5beded8a5115929e2d649c6aad3
+commit 82169f198925c9aa27bd04fd665eac67396adbe7
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Mon Apr 15 11:33:00 2019 -0700
 
-    Common header file changes not applicable to open-vm-tools.
+    Fix a leak if VGAuth setup fails.  Coverity issue
 
-commit 0527d5c5f14f626a5129231778ec433dfff55c2a
+commit 555f28c7d07161a5bcd0a90fe46869bc6be4ba21
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:17 2018 -0700
+Date:   Mon Apr 15 11:33:00 2019 -0700
+
+    Common source file change not applicable to open-vm-tools.
+
+commit b9993b990ea7dc077c6e625137802492245fb31b
+Author: Oliver Kurth <[e-mail]>
+Date:   Mon Apr 15 11:33:00 2019 -0700
 
     Common header file change not applicable to open-vm-tools.
 
-commit 571dc1fbadd962d91dcb7a44652b501de3f48e0e
+commit ca4be3d1bcb1d184eafb2c576dd7a127a95628fc
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:33:00 2019 -0700
 
     Common header file change not applicable to open-vm-tools.
 
-commit 998903d73496bf6080053f994c8410dc880db2f9
+commit e6d24a37cdcd88624f66ad86f161e8576e7c6ec0
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:32:59 2019 -0700
 
     Common header file change not applicable to open-vm-tools.
 
-commit 3b814f9b4dcbf54893078a4ba187d8d0cbf23e31
+commit da8c476be54bcd94c6b4f15a013dd02419b4ec29
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:32:59 2019 -0700
 
-    lib/hashMap/hashMap.c:
-      Add new HashMap_Get() which uses a constant time memory comparison function.
+    Changes to common source files not directly applicable to open-vm-tools.
     
-    lib/misc/utilMem.c:
-      Constant time memory and string comparison functions.
+    Add an error code to a debug message.
 
-commit 5daceb4448834143d884b061f391c37aeaaad683
+commit 8eba31ddbf50a194acdd3eb30935a1fb3895bd50
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:32:59 2019 -0700
 
-    Changes to common header files not applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit 42d1e6b11c0b11c1b1f6f967cb5c4d7e2f3b39e0
+commit b4a0d4c8137cdfbee073b456c71b731fa21e6ead
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:32:59 2019 -0700
 
-    Change to common header file not applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit f4b7b227119712c90be4a3583d4430a3fcc1d093
+commit e53f942615313e5d209f49d9c4da4227671c38d8
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:32:59 2019 -0700
 
-    Change to common header file not applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit 874b8b4801a5bba439401db8e624e3e3d1989ca7
+commit c0ec4f8294ec6428ee2a7f7284b37f79f4661bf3
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:32:59 2019 -0700
 
-    Common header file change not applicale to open-vm-tools.
+    Add a DynBuf_InitWithString() function to the dynamic buffer routines.
 
-commit ff2616a657c32bbb5e6799f8b8cd0a470d0e5202
+commit 2dc55af11451712b05a0c85a9c2ba1e5619b4841
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:16 2018 -0700
+Date:   Mon Apr 15 11:32:59 2019 -0700
 
-    Common header file changes not applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit 5d9cc73f1c7979466d55f7897f98c0888d2fb15d
+commit f35313969af9bd2815709930f054171d7ebbcbc9
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:15 2018 -0700
+Date:   Mon Apr 15 11:32:58 2019 -0700
 
-    Header file change in preparation for C++11 compilation.  Also updating
-    copyright dates.
+    Common header file change not applicable to open-vm-tools.
 
-commit 29fb30f6d1956ccd4ad803b1b7f0430e4ef28ceb
+commit c864f9e015a25864b952210796458e77c1f5726f
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:15 2018 -0700
+Date:   Mon Apr 15 11:32:58 2019 -0700
 
-    FreeBSD vmmemctl: Fold in open-vm-tools pull requests #125 and #140
-    
-    This change incorporates two open-vm-tools pull requests that provide
-    code changes that allows the existing vmmemctl.ko driver to be compiled
-    on FreeBSD 10, 11 or 12.
-    
-    Pull request #125:
-    An optional argument has been added to the sysctl_add_oid() function
-    in FreeBSD 12.x. All releases have a SYSCTL_ADD_OID() macro that does
-    not require the additional argument.
-    
-    Pull request #140:
-    Functions and macros to lock and unlock memory pages and objects have
-    changed between the FBSD 10 & 11.  The pull request provides a set C
-    preprocessor directives to select the appropriate code based on the
-    FreeBSD release being targeted.
-    
-    The code change as been tidied up by using the release version checks
-    to define LOCK and UNLOCK macros for memory pages and objects at the
-    beginning of the source file.  The code logic is easier to follow
-    without the abundance of #if, #else and #endif statements scattered
-    about.
-    
-    Ed Schouten: https://github.com/vmware/open-vm-tools/pull/125
-    Steve Wills: https://github.com/vmware/open-vm-tools/pull/140
+    Common header file change not directly applicable to open-vm-tools.
 
-commit 2a34b181de524b3f0d01cad90d3da184bde7ad99
+commit 6de2df2c43c412c048f666277eaa48d8bb0c0321
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:15 2018 -0700
+Date:   Wed Apr 10 14:14:57 2019 -0700
 
-    Common source file changes not directly applicable to open-vm-tools.
+    Common header file change not applicable to open-vm-tools.
 
-commit fab45e62a1468b86d2097a6a0784c4f259d6b0ef
+commit 306f0f7b507486795c0d726288ceb7145dcf3c00
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:15 2018 -0700
+Date:   Wed Apr 10 14:14:57 2019 -0700
 
-    Common header file change not applicable to open-vm-tools.
+    Common header file change no applicable to open-vm-tools.
 
-commit 357e8418e5441c2c5fc75a19f7b6529d6bce7452
+commit 6219e245c5e42479f4aef36ab8ee49db3c368f83
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:15 2018 -0700
+Date:   Wed Apr 10 14:14:57 2019 -0700
 
-    Common header file change not applicable to open-vm-tools.
+    Remove use of "-Wno-address-of-packed-member" option for OVT builds on FBSD
+    
+    With the HGFS source code refactor to avoid taking the address of a
+    packed structure memberuse of "-Wno-address-of-packed-member"
+    is no longer needed to build OVT on FBSD 11.x and FBSD 12.x.
 
-commit fad97e4a7c756b3b297e0fe9e68a1a4674c4fdcc
+commit 8b2bbbd8c2b647592a2f444a678fe93552fb0d22
 Author: Oliver Kurth <[e-mail]>
-Date:   Mon Apr 23 17:08:15 2018 -0700
+Date:   Wed Apr 10 14:14:56 2019 -0700
 
-    Common header file change not applicable to open-vm-tools.
+    Add a 64 bit pseudo random number generator
+    
+    This change adds a 64 bit pseudo random number generator to the public
+    library by calling the existing 32 bit Random_Fast function twice.
+    Since the period of Random_Fast is 2^64, this should be sufficient.
 
-commit 357d9139342c19a98ed12f5961f415d099df3287
+commit 5f9bd0c6a39a266854fad680d2251c024c309425
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:36 2018 -0700
+Date:   Wed Apr 10 14:14:56 2019 -0700
 
-    Common source file changes that are not applicable to open-vm-tools.
+    Remove some "always TRUE" comparisons reported by clang 6.0 on FBSD.
+    
+    A recent refactoring of HGFS fuse code to avoid taking the address of
+    a field in a packed structure introduced a comparision of an array
+    address != NULL which will always evaluate to "true".  Removing the
+    unnecessary "if" statements.
 
-commit 6c3261d152442fa11fc2b928490d74846f23465d
+commit 67b66d0ff13324413deac6c522bd382ee450125e
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:36 2018 -0700
+Date:   Wed Apr 10 14:14:56 2019 -0700
+
+    Common source file change not applicable to open-vm-tools.
+
+commit 86bf8de08dbb28e8902411b8a9bc0e64f972f74d
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:56 2019 -0700
 
     Common header file change not applicable to open-vm-tools.
 
-commit 3747daca8efbfe8e709687b97c874a29f183b717
+commit 3bc7907533c45544fcfb24906a0e4b7de61718e7
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:36 2018 -0700
+Date:   Wed Apr 10 14:14:55 2019 -0700
 
-    Backout previous change to lib/include/vm_basic_math.h.
+    Changes to common header files not applilcable to open-vm-tools.
 
-commit f9414d19532a9664e6c260a8644ee09200e32429
+commit 6576ad0d7b28bd1ddab2fce8a0f34695aa57a774
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:36 2018 -0700
+Date:   Wed Apr 10 14:14:55 2019 -0700
 
-    Common header file change: lib/include/vm_basic_math.h
-    
-    Define portability macros for Inf and Nan tests.
+    Common source file change not applicable to open-vm-tools.
 
-commit de2010a1a45a9e515b932a1a83374539661a2b39
+commit 8c69b930a826aad87c692d516fd77d1a4cbed0fb
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:35 2018 -0700
+Date:   Wed Apr 10 14:14:55 2019 -0700
 
-    Add missing memory constraints for vm_atomic RMW (Read/Modify/Write) instructions
+    DnD Phase II] - Avoid potential memory overflow.
     
-    There are two inseparable concepts involved when dealing with atomics:
-    1. Atomicity of the access itself
-    2. Ordering of the access with respect to other reads&writes (from the view of
-    other processors).
-    
-    Our Read-Modify-Write functions are all meant to provide the highest level of
-    ordering guarantee: Sequential Consistency, which means no reordering of reads
-    or writes across the access. We properly implement that on ARM, and on
-    x86/x64 at the hardware layer. But, on x86/x64 we needed to tell the compiler
-    (it must flush out any pending reads/writes that are currently hiding in
-    registers)
+    In the case when dragging a format whose size is exactly the same as the
+    size threshold and plain text is provided, the plain text can't be added.
+    Current logic does not handle this case.  Instead it will result in a
+    large unsigned number (0-1 = 0xffff_ffff) of bytes to be allocated to
+    store plain text which causes memory overflow.
     
-    Side Note: we do *not* change the pure Read and pure Write functions, only
-    the Read/Modify/Write ones. On both ARM and x86/x64, vm_atomic functions like
-    Atomic_WriteN provide no (re)ordering guarantees today (at the hardware layer
-    on ARM or at the compiler layer on x86/x64). This is because some callers
-    didn't need or want such guarantees - as such, Atomic_WriteN by itself is
-    *not* sufficient to, say, release a lock. Making these remaining atomic
-    weapons safe by default will require us to first
-    1. add new unordered atomic equivalents of Atomic_ReadN/TestBitN and
-    Atomic_WriteN (in C11 terminology, acquire/release and relaxed)
-    2. Scan the tree and switch appropriate callers to the new functions
+    Just return in the case that no more size left to add plain text or the
+    plain text is empty.
+
+commit 685aa3d0879aabde450ba0d6c79d256d6abaf3f5
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:55 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 71b41229ffe1f31711b35145ee1ab0bfbb763295
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:54 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit f2eb555cf6e9f8c779daf1dc9c2f7aff383d105a
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:54 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 8046af84ee4aa1d271af4c1d2379fb3d88dba3ac
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:54 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit cf05c47b06af90a7bb7c5d561fb425ba2ebc0b47
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:54 2019 -0700
+
+    Common source file change not directly applicable to open-vm-tools.
+
+commit 5a6ee8f90b90f42d24de1561ee94855c576933f3
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:53 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit d759ae5ecfcc6f1069decdb2511ec32bf12a1663
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:53 2019 -0700
+
+    Asyncsocket in low latency send mode may write into freed memory
     
-    *and only then*
-    3. Strengthen the defaults, affecting only callers who needed the stronger
-    defaults to be correct. ... but that would be a separate change in the
-    future.
+    Blast service encounters access violation exception during scale tests
+    in AsyncTCPSocketSend() at bora\lib\asyncsocket\asyncsocket.c.
     
-    Codegen differences (vmm.vmm64):
-    --------------------------------
-    The function that uncovered this was ST_HandleCrossCall, which invoked
-    Atomic_And64.
+    Root cause is asock refcount is not incremented before the inline
+    invocation of AsyncTCPSocketSendCallback() in the low latency send
+    mode and asock is accessed right after this invocation to decrement
+    inLowLatencySendCb counter. AsyncTCPSocketSendCallback() on error
+    would invoke error handler which in turn could close the asock
+    leading to freeing of asock.
     
-    original w/o explicit compiler mem barrier in ST_HandleCrossCall:
-    ...
-    lock and 	QWORD PTR [rdx+0x0],rax
-    movsxd 	rax,DWORD PTR [rip+offset]  <-- load reordered after Atomic_And64
-    lea    	rax,[rax+rax*2]
-    lea    	rdi,[rax*8+0x0]
+    Issue wouldn't happen if AsyncWebSocket impl guarded all of its
+    transport->send(transport) calls with AsyncSocketAddRef(transport)
+    and AsyncSocketRelease(transport) but isn't the case currently.
     
-    with "memory" constraint, it's now identical to code w/an explicit
-    compiler mem barrier (which was the workaround):
-    ...
-    mov    	edx,DWORD PTR [rip+offset]  <-- load emitted prior to Atomic_And64
-    ...
-    lock and 	QWORD PTR [rsi+0x0],rax
-    movsxd 	rax,edx                     <-- ... and used after Atomic_And64
-    lea    	rax,[rax+rax*2]
-    lea    	rdi,[rax*8+0x0]
+    Fix is to add and release asock reference around the inline
+    invocation of AsyncTCPSocketSendCallback().
+
+commit 325e244951790d7a848281fdb0236b0f6ee26996
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:53 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit b90344ea3696506c7d2a8022c340b6aafb6f6a91
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:52 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit 13f457aa737d8bca27f09862cf2a45df8f4a425b
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:52 2019 -0700
+
+    InitiateFileTransferToGuest fails when uploading file to root directory
     
-    vmm.vmm64's .text section shrank 28 bytes
-    vmware-vmx's .text section shrank 16 bytes
+    File upload to '/' on Linux fails the directory exists check.
+    This is caused by the file dirname being an empty string when parsed from
+    the guest file path name per the documented behavior of File_GetPathName.
     
-    Given that these are tiny fractions of the .text section, this suggests the
-    problem was quite rare, which is why it escaped our attention until now.
-    (Testing of vmx's lib/lock, lib/sync, lib/vprobe, and lib/misc saw no
-    differences with GCC 4.4, 6.4, 7.1 or Clang)
+    The caller of File_GetPathName needs to handle the expected empty dirname
+    string when dealing with file path in the root ('/') filesystem on Linux.
     
-    While in there: nuke some tabs
+    Proposed fix is to replace the dirname string with the root path ('/') when:
+    A. dirname obtained from File_GetPathName call is an empty string AND
+    B. the original file path name starts with the path separator ('/') on
+       Linux (or *nix like) GOSes
     
-    Slated for a future change: vmkapi_atomic.h
+    This allows for the directory checks to inspect the root folder before
+    proceeding with the file transfer.
 
-commit 333ac41076afff4e31ccb0d0688e1581e8c9019a
+commit 022121ce185662c05b3e1bf7166500f4f0f72bb2
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:35 2018 -0700
+Date:   Wed Apr 10 14:14:51 2019 -0700
 
     Common header file change not applicable to open-vm-tools.
 
-commit 8671bd8d4f68a490a5b20f1876f05797f3057c4b
+commit 3de5e45099ae309b59f371e1d71c88c80815f92d
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:35 2018 -0700
+Date:   Wed Apr 10 14:14:51 2019 -0700
 
-    vmcheck.c VmCheck_IsVirtualWorld(): Always check for a working backdoor.
-    
-    The specific checks for Xen and VirtualPC hypervisors currently happen
-    only if the VMware hypervisor is not detected.  The test for a working
-    VMware backdoor is then done to avoid all other hypervisors.
+    Backing out the previous change to vixTools.c
     
-    In the case where running on a VMware hypervisor and the backdoor
-    channel has been disabled such as with
+    As the code committed was not the one reviewed but another version of the
+    fix under exploration, reverting the previous change.
+
+commit e38e881a04cdf1684913c0e65596f4965e8d0c32
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:51 2019 -0700
+
+    Common header file change not applicable to open-vm-tools.
+
+commit f682261e7997aa440523af63369e4b99e4823af7
+Author: Oliver Kurth <[e-mail]>
+Date:   Wed Apr 10 14:14:49 2019 -0700
+
+    InitiateFileTransferToGuest fails when uploading file to root directory
     
-       monitor_control.restrict_backdoor = "TRUE"
+    File upload to '/' on Linux fails the directory exists check.
+    This is caused by the file dirname being an empty string when parsed from the guest file path name per the documented behavior of File_GetPathName.
     
-    vmtoolsd, vmware-toolbox-cmd and vmware-checkvm will crash when
-    attempting to get the version number of the installed VMware Tools.
+    The caller of File_GetPathName needs to handle the expected empty dirname string when dealing with file path in the root ('/') filesystem on Linux.
     
-    Added an additional test to detect Linux KVM with the existing tests
-    for the Xen hypervisor and Microsoft Virtual PC.  Avoid checking for
-    a working backdoor if a non VMware hypervisor is seen.
+    Proposed fix is to replace the dirname string with the root path ('/') when:
+    A. dirname obtained from File_GetPathName call is an empty string AND
+    B. the original file path name starts with the path separator ('/') on Linux (or *nix like) GOSes
     
-    Microsoft Hv checking to be added later and is tracked in a separate PR.
-    Oracle VirtualBox provides no unique CPUID vendor signature string.
+    This allows for the directory checks to inspect the root folder before proceedeing with the file transfer.
 
-commit 09958952cc761075d5546b18bed0ce59260ec4db
+commit fcb7bb71a30f740b2d4bcfb8ae82733d044e6c00
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:35 2018 -0700
+Date:   Thu Mar 28 12:43:00 2019 -0700
 
-    FreeBSD open-vm-tools kernel modules compilations cannot locate <stdint.h>
-    
-    With the change for VMware headers to utilize the standard types
-    defined in C99 standard headers, the compilation of FreeBSD kernel
-    modules must specifically add /usr/include to the compilation
-    options.
-    
-    CFLAGS += -isystem /usr/include
-    
-    This change updates the Makefiles's for FreeBSD kernel modules and
-    drivers.
+    Make building without ICU the default for Linux.
 
-commit cdf0406dc669f2284e1e810ac5820f123d46a50e
+commit bd84c8a35c7aedb2638bba087bc1756cfb9ccf9d
 Author: Oliver Kurth <[e-mail]>
-Date:   Fri Mar 23 15:05:35 2018 -0700
+Date:   Thu Mar 28 12:43:00 2019 -0700
 
-    FreeBSD: Improper use of sysconf() for getpwent buffer size leads to
-             vmtoolsd crash.
-    
-    On FreeBSD, sysconf(_SC_GETPW_R_SIZE_MAX) can return -1 if it has
-    no hard limit ultimately resulting in an incorrect buffer size.
-    
-    This change is adapting the sysconf() ifixes done elsewhere to
-    bora-vmsoft/services/plugins/vix/vixTools.c and updating the
-    open-vm-tools AUTHORS file to share credit for the pull request.
+    Query disks for UUID
     
-    https://github.com/vmware/open-vm-tools/pull/238
+    As part of identifying a guest disk so it can be associated with a vmdk,
+    query its serial number, which is the same as the vmdk's ddb.uuid
 
-commit e20e9bd49d244749ee6bcd4ea7d57a26d891afbe
+commit 076e7e10f24b53fcbd7b21d95ee4763f5f527e45