Package new upstream version open-vm-tools-11.0.0-14549434.

Added gcc9-static-inline.patch for gcc9 warnings.
Added vix-memleak.patch for a memory leak.
Removed gcc9-warnings.patch which is no longer needed.
Removed vmware-guestproxycerttool as it is no longer available upstream.

.gitignore

@@ -14,3 +14,4 @@
 /open-vm-tools-10.3.0-8931395.tar.gz
 /open-vm-tools-10.3.5-10430147.tar.gz
 /open-vm-tools-10.3.10-12406962.tar.gz
+/open-vm-tools-11.0.0-14549434.tar.gz

gcc9-static-inline.patch

@@ -0,0 +1,73 @@
+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
+@@ -290,7 +290,7 @@ typedef struct ToolsAppCtx {
+  *
+  * @return TRUE if COM is initialized when the function returns.
+  */
+-G_INLINE_FUNC gboolean
++static inline gboolean
+ 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 {
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC ToolsCorePool *
++static inline ToolsCorePool *
+ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
+ {
+    ToolsCorePool *pool = NULL;
+@@ -123,7 +123,7 @@ ToolsCorePool_GetPool(ToolsAppCtx *ctx)
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC guint
++static inline guint
+ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
+                          ToolsCorePoolCb cb,
+                          gpointer data,
+@@ -153,7 +153,7 @@ ToolsCorePool_SubmitTask(ToolsAppCtx *ctx,
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC void
++static inline void
+ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
+                          guint taskId)
+ {
+@@ -197,7 +197,7 @@ ToolsCorePool_CancelTask(ToolsAppCtx *ctx,
+  *******************************************************************************
+  */
+ 
+-G_INLINE_FUNC gboolean
++static inline gboolean
+ 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

open-vm-tools.spec

@@ -19,16 +19,16 @@
 ################################################################################
 
 %global _hardened_build 1
-%global majorversion    10.3
+%global majorversion    11.0
-%global minorversion    10
+%global minorversion    0
-%global toolsbuild      12406962
+%global toolsbuild      14549434
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          2%{?dist}
+Release:          1%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -44,7 +44,10 @@ ExclusiveArch:    x86_64
 ExclusiveArch:    %{ix86} x86_64
 %endif
 
-Patch1:           gcc9-warnings.patch
+# Reference https://github.com/vmware/open-vm-tools/commit/89c0d444567eb525e8d083fb564c46d68e96660c
+Patch1:           gcc9-static-inline.patch
+# Reference https://github.com/vmware/open-vm-tools/commit/9bc72f0b09702754b429115658a85223cb3058bd
+Patch2:           vix-memleak.patch
 
 BuildRequires:    autoconf
 BuildRequires:    automake
@@ -146,7 +149,7 @@ useful for verifying the functioning of %{name} in VMware virtual
 machines.
 
 %prep
-%autosetup -p1 -n %{name}-%{version}-%{toolsbuild}
+%autosetup -p2 -n %{name}-%{version}-%{toolsbuild}
 
 %build
 # Required for regenerating configure script when
@@ -246,9 +249,6 @@ if [ "$1" = "0" -a                                       \
       umount /mnt/hgfs &> /dev/null || /bin/true
       rmdir /mnt/hgfs &> /dev/null || /bin/true
    fi
-
-   # Cleanup GuestProxy certs
-   %{_bindir}/vmware-guestproxycerttool -e &> /dev/null || /bin/true
 fi
 
 %postun
@@ -265,6 +265,8 @@ fi
 %dir %{_sysconfdir}/vmware-tools/vgauth
 %dir %{_sysconfdir}/vmware-tools/vgauth/schemas
 %config(noreplace) %{_sysconfdir}/vmware-tools/*.conf
+# Don't expect users to modify example tools.conf file
+%config %{_sysconfdir}/vmware-tools/tools.conf.example
 # Don't expect users to modify VGAuth schema files
 %config %{_sysconfdir}/vmware-tools/vgauth/schemas/*
 %{_sysconfdir}/vmware-tools/*-vm-default
@@ -275,7 +277,6 @@ fi
 %{_bindir}/vmhgfs-fuse
 %{_bindir}/vmtoolsd
 %{_bindir}/vmware-checkvm
-%{_bindir}/vmware-guestproxycerttool
 %{_bindir}/vmware-hgfsclient
 %{_bindir}/vmware-namespace-cmd
 %{_bindir}/vmware-rpctool
@@ -321,6 +322,13 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Wed Oct 02 2019 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-1
+- Package new upstream version open-vm-tools-11.0.0-14549434.
+- Added gcc9-static-inline.patch for gcc9 warnings.
+- Added vix-memleak.patch for a memory leak.
+- Removed gcc9-warnings.patch which is no longer needed.
+- Removed vmware-guestproxycerttool as it is no longer available upstream.
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 10.3.10-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (open-vm-tools-10.3.10-12406962.tar.gz) = fd35794896c2de5a3b6c7fad0e86558ae0f16c7ab09c791d0d9b8a61cff8052d3d5fcfd19613f793251050f86edda2335b29f49503b3fee41f48495b2ab80a0a
+SHA512 (open-vm-tools-11.0.0-14549434.tar.gz) = 53782494ed0ff8db6884476f70fff174afa0bf59f09ccc0dd14d6718bf552b64b14859b55f1b4b6f583d05fc11395f8a42f131bde224752661dbb4103f1a62ad

vix-memleak.patch

@@ -0,0 +1,56 @@
+diff --git a/open-vm-tools/services/plugins/vix/vixTools.c b/open-vm-tools/services/plugins/vix/vixTools.c
+index 6352b9151..9ba550737 100644
+--- a/open-vm-tools/services/plugins/vix/vixTools.c
++++ b/open-vm-tools/services/plugins/vix/vixTools.c
+@@ -9753,7 +9753,6 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
+    char *destPtr;
+    char *endDestPtr;
+    char *tmpBuf = NULL;
+-   char *recordBuf;
+    size_t recordSize;
+    char *escapedStr = NULL;
+    char *escapedStr2 = NULL;
+@@ -9813,6 +9812,8 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
+    destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s",
+                           VIX_XML_ESCAPED_TAG);
+    for (i = 0; i < num; i++) {
++      char *recordBuf = NULL;
++
+       escapedStr = VixToolsEscapeXMLString(uaList[i].pemCert);
+       if (escapedStr == NULL) {
+          err = VIX_E_OUT_OF_MEMORY;
+@@ -9886,6 +9887,8 @@ VixToolsListAuthAliases(VixCommandRequestHeader *requestMsg, // IN
+          Log("%s: ListAuth list results too large, truncating", __FUNCTION__);
+          goto abort;
+       }
++      free(recordBuf);
++      recordBuf = NULL;
+    }
+ 
+    *result = resultBuffer;
+@@ -9951,7 +9954,6 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
+    char *destPtr;
+    char *endDestPtr;
+    char *tmpBuf = NULL;
+-   char *recordBuf;
+    char *escapedStr = NULL;
+    char *escapedStr2 = NULL;
+    size_t recordSize;
+@@ -10005,6 +10007,8 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
+    destPtr += Str_Sprintf(destPtr, endDestPtr - destPtr, "%s",
+                           VIX_XML_ESCAPED_TAG);
+    for (i = 0; i < num; i++) {
++      char *recordBuf = NULL;
++
+       escapedStr = VixToolsEscapeXMLString(maList[i].pemCert);
+       if (escapedStr == NULL) {
+          err = VIX_E_OUT_OF_MEMORY;
+@@ -10076,6 +10080,8 @@ VixToolsListMappedAliases(VixCommandRequestHeader *requestMsg, // IN
+          Log("%s: ListMapped results too large, truncating", __FUNCTION__);
+          goto abort;
+       }
++      free(recordBuf);
++      recordBuf = NULL;
+    }
+ 
+    *result = resultBuffer;