@@ -1,8 +1,9 @@

-+++ open-vm-tools-10.1.5-5055683-modified/libDeployPkg/linuxDeployment.c        2017-04-06 19:14:38.000403000 -0700

-@@ -580,13 +580,17 @@

+diff -ru open-vm-tools-stable-10.1.10/open-vm-tools/libDeployPkg/linuxDeployment.c open-vm-tools-stable-10.1.10-modified/open-vm-tools/libDeployPkg/linuxDeployment.c

+--- open-vm-tools-stable-10.1.10/open-vm-tools/libDeployPkg/linuxDeployment.c	2017-07-28 14:59:15.000000000 -0700

+@@ -582,13 +582,17 @@

     close(fd);

-

+ 

     // Create space and copy the command

 -   *command = malloc(VMWAREDEPLOYPKG_CMD_LENGTH);

 +   *command = malloc(VMWAREDEPLOYPKG_CMD_LENGTH + 1);

@@ -10,7 +11,7 @@

        SetDeployError("Error allocating memory.");

        return FALSE;

     }

-

+ 

 -   memcpy(*command, hdr.command, VMWAREDEPLOYPKG_CMD_LENGTH);

 +   // will pad with '\0' if necessary

 +   strncpy(*command, hdr.command, VMWAREDEPLOYPKG_CMD_LENGTH);

@@ -19,11 +20,11 @@

 +

     *archiveType = hdr.payloadType;

     *flags = hdr.reserved;

-

-@@ -1074,6 +1078,20 @@

-       free(command);

-       deployStatus =  CloudInitSetup(tmpDirPath);

+ 

+@@ -1094,6 +1098,20 @@

     } else {

+       sLog(log_info, "cloud-init is either not installed or the flag to enable \

+            cloud-init is not set.\n Executing traditional GOSC workflow");

 +      if ((strstr(command, "scripts/Customize.pl") != NULL) || (strstr(command, "scripts/customize.sh") != NULL)) {

 +          free (command);

 +          const char* PHOTON_OS_LAUNCH_COMMAND = "/bin/bash /usr/share/open-vm-tools/GOSC/gosc-scripts/imc-shell/imgcust-scripts/customize.sh /tmp/.vmware/linux/deploy/cust.cfg";

@@ -40,3 +41,4 @@

 +      sLog(log_info, "Launching deployment %s.  \n", command);

        deploymentResult = ForkExecAndWaitCommand(command);

        free(command);

+ 

deleted file mode 100644

@@ -1,11 +0,0 @@

-diff -Naur open-vm-tools.orig/lib/wiper/wiperPosix.c open-vm-tools/lib/wiper/wiperPosix.c

-+++ open-vm-tools/lib/wiper/wiperPosix.c	2017-03-24 13:13:29.118630435 -0700

-@@ -29,6 +29,7 @@

- 

- #include <stdio.h>

- #include <sys/stat.h>

-+#include <sys/sysmacros.h>

- #if defined(__linux__) || defined(sun)

- # include <sys/vfs.h>

- #elif defined(__FreeBSD__) || defined(__APPLE__)

deleted file mode 100755

@@ -1,267 +0,0 @@

-+++ libDeployPkg/linuxDeployment.c.ORIG	2016-10-11 14:08:49.000097000 -0400

-@@ -43,6 +43,8 @@

- #include "mspackWrapper.h"

- #include "rpcout.h"

- #include "toolsDeployPkg.h"

-+#include <strutil.h>

-+#include <util.h>

- 

- /*

-  * These are covered by #ifndef to give the ability to change these

-@@ -52,12 +54,17 @@

- 

- #define CLEANUPCMD  "/bin/rm -r -f "

- 

--#ifndef EXTRACTPATH

--#define EXTRACTPATH "/tmp/.vmware/linux/deploy"

-+#ifndef TMP_PATH_VAR

-+#define TMP_PATH_VAR "/tmp/.vmware/linux/deploy"

- #endif

- 

--#ifndef CLEANUPPATH

--#define CLEANUPPATH "/tmp/.vmware"

-+#ifndef IMC_TMP_PATH_VAR

-+#define IMC_TMP_PATH_VAR "@@IMC_TMP_PATH_VAR@@"

-+#endif

-+

-+// '/tmp' below will be addressed by PR 1601405.

-+#ifndef TMP_DIR_PATH_PATTERN

-+#define TMP_DIR_PATH_PATTERN "/tmp/.vmware-imgcust-dXXXXXX"

- #endif

- 

- #ifndef BASEFILENAME

-@@ -115,7 +122,6 @@

- // Private functions

- static Bool GetPackageInfo(const char* pkgName, char** cmd, uint8* type, uint8* flags);

- static Bool ExtractZipPackage(const char* pkg, const char* dest);

--static Bool CreateDir(const char *path);

- static void Init(void);

- static struct List* AddToList(struct List* head, const char* token);

- static int ListSize(struct List* head);

-@@ -151,8 +157,17 @@

- NORETURN void

- Panic(const char *fmtstr, ...)

- {

--   /* Ignored */

--   sLog(log_warning, "Panic callback invoked. \n");

-+   va_list args;

-+

-+   char *tmp = Util_SafeMalloc(MAXSTRING);

-+

-+   va_start(args, fmtstr);

-+   vsprintf(tmp, fmtstr, args);

-+

-+   sLog(log_error, "Panic callback invoked: %s\n", tmp);

-+

-+   free(tmp);

-+

-    exit(1);

- }

- 

-@@ -169,12 +184,19 @@

-  *

-  **/

- void

--Debug(const char *fmtstr,

--      va_list args)

-+Debug(const char *fmtstr, ...)

- {

--   /* Ignored */

- #ifdef VMX86_DEBUG

--   sLog(log_warning, "Debug callback invoked. \n");

-+   va_list args;

-+

-+   char *tmp = Util_SafeMalloc(MAXSTRING);

-+

-+   va_start(args, fmtstr);

-+   vsprintf(tmp, fmtstr, args);

-+

-+   sLog(log_debug, "Debug callback invoked: %s\n", tmp);

-+

-+   free(tmp);

- #endif

- }

- 

-@@ -979,6 +1001,7 @@

- Deploy(const char* packageName)

- {

-    int deployStatus = DEPLOY_SUCCESS;

-+   char* pkgCommand = NULL;

-    char* command = NULL;

-    int deploymentResult = 0;

-    char *nics;

-@@ -986,6 +1009,7 @@

-    uint8 archiveType;

-    uint8 flags;

-    bool forceSkipReboot = false;

-+   char *tmpDirPath;

-    Bool cloudInitEnabled = FALSE;

-    const char *cloudInitConfigFilePath = "/etc/cloud/cloud.cfg";

-    char cloudCommand[1024];

-@@ -998,33 +1022,41 @@

-                                TOOLSDEPLOYPKG_ERROR_SUCCESS,

-                                NULL);

- 

-+   tmpDirPath = mkdtemp((char *)Util_SafeStrdup(TMP_DIR_PATH_PATTERN));

-+   if (tmpDirPath == NULL) {

-+      SetDeployError("Error creating tmp dir: %s", strerror(errno));

-+      return DEPLOY_ERROR;

-+   }

-+

-    sLog(log_info, "Reading cabinet file %s. \n", packageName);

- 

-    // Get the command to execute

--   if (!GetPackageInfo(packageName, &command, &archiveType, &flags)) {

-+   if (!GetPackageInfo(packageName, &pkgCommand, &archiveType, &flags)) {

-       SetDeployError("Error extracting package header information. (%s)",

-                      GetDeployError());

-+      free(tmpDirPath);

-       return DEPLOY_ERROR;

-    }

- 

--   // Print the header command

--#ifdef VMX86_DEBUG

--   sLog(log_debug, "Header command: %s \n ", command);

--#endif

--

--   // create the destination directory

--   if (!CreateDir(EXTRACTPATH "/")) {

--      free(command);

--      return DEPLOY_ERROR;

-+   sLog(log_info, "Original deployment command: %s\n", pkgCommand);

-+   if (strstr(pkgCommand, IMC_TMP_PATH_VAR) != NULL) {

-+      command = StrUtil_ReplaceAll(pkgCommand, IMC_TMP_PATH_VAR, tmpDirPath);

-+   } else {

-+      command = StrUtil_ReplaceAll(pkgCommand, TMP_PATH_VAR, tmpDirPath);

-    }

-+   free(pkgCommand);

-+

-+   sLog(log_info, "Actual deployment command: %s\n", command);

- 

-    if (archiveType == VMWAREDEPLOYPKG_PAYLOAD_TYPE_CAB) {

--      if (!ExtractCabPackage(packageName, EXTRACTPATH)) {

-+      if (!ExtractCabPackage(packageName, tmpDirPath)) {

-+         free(tmpDirPath);

-          free(command);

-          return DEPLOY_ERROR;

-       }

-    } else if (archiveType == VMWAREDEPLOYPKG_PAYLOAD_TYPE_ZIP) {

--      if (!ExtractZipPackage(packageName, EXTRACTPATH)) {

-+      if (!ExtractZipPackage(packageName, tmpDirPath)) {

-+         free(tmpDirPath);

-          free(command);

-          return DEPLOY_ERROR;

-       }

-@@ -1040,10 +1072,8 @@

-       cloudInitEnabled = TRUE;

-       sSkipReboot = TRUE;

-       free(command);

--      deployStatus =  CloudInitSetup(EXTRACTPATH);

-+      deployStatus =  CloudInitSetup(tmpDirPath);

-    } else {

--      // Run the deployment command

--      sLog(log_info, "Launching deployment %s.  \n", command);

-       deploymentResult = ForkExecAndWaitCommand(command);

-       free(command);

- 

-@@ -1089,7 +1119,7 @@

-        * of the sucess/failure of the customization so that at the end of it we

-        * always have nics enabled.

-        */

--      nics = GetNicsToEnable(EXTRACTPATH);

-+      nics = GetNicsToEnable(tmpDirPath);

-       if (nics) {

-          // XXX: Sleep before the last SetCustomizationStatusInVmx

-          //      This is a temporary-hack for PR 422790

-@@ -1104,22 +1134,23 @@

-       }

-    }

- 

--   cleanupCommand = malloc(strlen(CLEANUPCMD) + strlen(CLEANUPPATH) + 1);

-+   cleanupCommand = malloc(strlen(CLEANUPCMD) + strlen(tmpDirPath) + 1);

-    if (!cleanupCommand) {

-       SetDeployError("Error allocating memory.");

-+      free(tmpDirPath);

-       return DEPLOY_ERROR;

-    }

- 

-    strcpy(cleanupCommand, CLEANUPCMD);

--   strcat(cleanupCommand, CLEANUPPATH);

-+   strcat(cleanupCommand, tmpDirPath);

- 

-    sLog(log_info, "Launching cleanup. \n");

-    if (ForkExecAndWaitCommand(cleanupCommand) != 0) {

--      sLog(log_warning, "Error while clean up. Error removing directory %s. (%s)",

--           EXTRACTPATH, strerror (errno));

--      //TODO: What should be done if cleanup fails ??

-+      sLog(log_warning, "Error while clean up tmp directory %s: (%s)",

-+           tmpDirPath, strerror (errno));

-    }

-    free (cleanupCommand);

-+   free(tmpDirPath);

- 

-    if (flags & VMWAREDEPLOYPKG_HEADER_FLAGS_SKIP_REBOOT) {

-       forceSkipReboot = true;

-@@ -1388,61 +1419,6 @@

-    return retval;

- }

- 

--/**

-- * Sets up the path for exracting file. For e.g. if the file is /a/b/c/d.abc

-- * then it creates /a/b/c (skips if any of the directories along the path

-- * exists). If the the path ends in '/', then the the entire input is assumed

-- * to be a directory and is created as such.

-- *

-- * @param path  IN: Complete path of the file

-- * @return TRUE on success

-- */

--

--Bool

--CreateDir(const char* path)

--{

--   struct stat stats;

--   char* token;

--   char* copy;

--

--   // make a copy we can modify

--   copy = strdup(path);

--

--   // walk through the path (it employs in string replacement)

--   for (token = copy + 1; *token; ++token) {

--

--      // find

--      if (*token != '/') {

--         continue;

--      }

--

--      /*

--       * cut it off here for e.g. on first iteration /a/b/c/d.abc will have

--       * token /a, on second /a/b etc

--       */

--      *token = 0;

--

--      sLog(log_debug, "Creating directory %s", copy);

--

--      // ignore if the directory exists

--      if (!((stat(copy, &stats) == 0) && S_ISDIR(stats.st_mode))) {

--         // make directory and check error (accessible only by owner)

--         if (mkdir(copy, 0700) == -1) {

--            sLog(log_error, "Unable to create directory %s (%s)", copy,

--                 strerror(errno));

--            free(copy);

--            return FALSE;

--         }

--      }

--

--      // restore the token

--      *token = '/';

--   }

--

--   free(copy);

--   return TRUE;

--}

--

- //......................................................................................

- 

- /**

@@ -1,25 +1,23 @@

 Summary:        Usermode tools for VmWare virts

 Name:           open-vm-tools

-Version:        10.1.5

-Release:        6%{?dist}

+Version:        10.1.10

+Release:        1%{?dist}

 License:        LGPLv2+

 URL:            https://github.com/vmware/open-vm-tools

 Group:          Applications/System

 Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0:        https://github.com/vmware/open-vm-tools/archive/%{name}-stable-%{version}.tar.gz

-%define sha1 open-vm-tools=9672874e8b785de27d7fda57bf791f900546c18f

+%define sha1 open-vm-tools=26ac84e86b4c862006b8de7973802e45dfd77464

 Source1:        gosc-scripts-1.0.tar.gz

 %define sha1 gosc-scripts-1.0=5031dd9b3b0569a40d2ee0caaa55a1cbf782345e

 Source2:        vmtoolsd.service

 Source3:        vgauthd.service

-Patch0:         open-vm-tools-tmp-race.patch

-Patch1:         IPv6Support.patch

-Patch2:         hostnameReCustomizationFix.patch

-Patch3:         PureIPv6-hosts.patch

-Patch4:         open-vm-tools-sysmacros.patch

-Patch5:         GOSC-libDeploy.patch

-Patch6:         timezoneCust.patch

+Patch0:         IPv6Support.patch

+Patch1:         hostnameReCustomizationFix.patch

+Patch2:         PureIPv6-hosts.patch

+Patch3:         GOSC-libDeploy.patch

+Patch4:         timezoneCust.patch

 BuildRequires:  glib-devel

 BuildRequires:  xerces-c-devel

 BuildRequires:  xml-security-c-devel

@@ -54,10 +52,8 @@ It contains the libraries and header files to create applications.

 %patch0 -p0

 %patch1 -p0

 %patch2 -p0

-%patch3 -p0

-%patch4 -p1

-%patch5 -p1

-%patch6 -p0

+%patch3 -p2

+%patch4 -p0

 %build

 touch ChangeLog

 autoreconf -i

@@ -117,6 +113,8 @@ fi

 %{_libdir}/*.so

 %changelog

+*   Tue Aug 22 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.10-1

+-   Updating version to 10.1.10, removing upstream patches.

 *   Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 10.1.5-6

 -   Add libdnet-devel and libmspack-devel to BuildRequires, add devel package.

 *   Mon Jun 05 2017 Bo Gan <ganb@vmware.com> 10.1.5-5