From ef29a6759f2b6a02ca6fadcda00eaf779d1f2b67 Mon Sep 17 00:00:00 2001
From: Ravindra Kumar <ravindrakumar@vmware.com>
Date: Tue, 4 Feb 2020 11:17:15 -0800
Subject: [PATCH] Package new upstream version open-vm-tools-11.0.5-15389592.
 Removed vix-memleak.patch which is no longer needed.

---
 .gitignore         |  1 +
 open-vm-tools.spec | 14 +++++++-----
 sources            |  2 +-
 vix-memleak.patch  | 56 ----------------------------------------------
 4 files changed, 10 insertions(+), 63 deletions(-)
 delete mode 100644 vix-memleak.patch

diff --git a/.gitignore b/.gitignore
index c1456e0..56ba551 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /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
+/open-vm-tools-11.0.5-15389592.tar.gz
diff --git a/open-vm-tools.spec b/open-vm-tools.spec
index 076c54a..5b1d495 100644
--- a/open-vm-tools.spec
+++ b/open-vm-tools.spec
@@ -20,15 +20,15 @@
 
 %global _hardened_build 1
 %global majorversion    11.0
-%global minorversion    0
-%global toolsbuild      14549434
+%global minorversion    5
+%global toolsbuild      15389592
 %global toolsversion    %{majorversion}.%{minorversion}
 %global toolsdaemon     vmtoolsd
 %global vgauthdaemon    vgauthd
 
 Name:             open-vm-tools
 Version:          %{toolsversion}
-Release:          6%{?dist}
+Release:          1%{?dist}
 Summary:          Open Virtual Machine Tools for virtual machines hosted on VMware
 License:          GPLv2
 URL:              https://github.com/vmware/%{name}
@@ -47,9 +47,7 @@ ExclusiveArch:    %{ix86} x86_64
 
 # 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
-Patch3:           gcc10-warning.patch
+Patch2:           gcc10-warning.patch
 
 BuildRequires:    autoconf
 BuildRequires:    automake
@@ -344,6 +342,10 @@ fi
 %{_bindir}/vmware-vgauth-smoketest
 
 %changelog
+* Tue Feb 04 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.5-1
+- Package new upstream version open-vm-tools-11.0.5-15389592.
+- Removed vix-memleak.patch which is no longer needed.
+
 * Tue Feb 04 2020 Ravindra Kumar <ravindrakumar@vmware.com> - 11.0.0-6
 - Added gcc10-warning.patch for fixing compilation issues.
 
diff --git a/sources b/sources
index 0c6ffdd..df5acbb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-vm-tools-11.0.0-14549434.tar.gz) = 53782494ed0ff8db6884476f70fff174afa0bf59f09ccc0dd14d6718bf552b64b14859b55f1b4b6f583d05fc11395f8a42f131bde224752661dbb4103f1a62ad
+SHA512 (open-vm-tools-11.0.5-15389592.tar.gz) = 7b465f2dd8987e2b67c17bf9bbfaf52f92013180944f87161bb2e846da36716121d96f499e47ceaeaf535cc17706d7d1ced2b47d08144ef0f3749db23d01f404
diff --git a/vix-memleak.patch b/vix-memleak.patch
deleted file mode 100644
index ea2c69c..0000000
--- a/vix-memleak.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-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;