@@ -1,7 +1,7 @@

-diff -ru open-vm-tools-10.0.5/libDeployPkg/linuxDeployment.c open-vm-tools-modified/libDeployPkg/linuxDeployment.c

-+++ open-vm-tools-modified/libDeployPkg/linuxDeployment.c	2016-04-19 16:51:28.434617505 -0700

-@@ -549,13 +549,17 @@

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

+--- open-vm-tools-stable-10.1.0/open-vm-tools/libDeployPkg/linuxDeployment.c	2016-11-14 15:36:30.000000000 -0800

+@@ -558,13 +558,17 @@

     close(fd);

     // Create space and copy the command

@@ -11,41 +11,32 @@ diff -ru open-vm-tools-10.0.5/libDeployPkg/linuxDeployment.c open-vm-tools-modif

        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);

 +   // hdr.command is a structure of fixed length VMWAREDEPLOYPKG_CMD_LENGTH

-+   (*command)[VMWAREDEPLOYPKG_CMD_LENGTH] = '\0'; 

- 

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

++   (*command)[VMWAREDEPLOYPKG_CMD_LENGTH] = '\0';

++

     *archiveType = hdr.payloadType;

+    *flags = hdr.reserved;

-    return TRUE;

-@@ -907,6 +911,18 @@

-          return DEPLOY_ERROR;

-       }

-    }

-+   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";

+@@ -1042,6 +1046,18 @@

+       free(command);

+       deployStatus =  CloudInitSetup(EXTRACTPATH);

+    } else {

++      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";

 +

-+       // The command will be parsed alter and can be of arbitrary length

-+       command = strdup(PHOTON_OS_LAUNCH_COMMAND);

-+       if (!command) {

-+          SetDeployError("Error allocating memory.");

-+          return DEPLOY_ERROR;

-+       }

-+       _DeployPkg_SkipReboot(true);

-+   }

- 

-    // Run the deployment command

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

-@@ -988,7 +1004,7 @@

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

-    }

-    free (cleanupCommand);

--

-+   

-    //Reset the guest OS

-    if (!sSkipReboot && !deploymentResult) {

-       // Reboot the Vm

++          // The command will be parsed alter and can be of arbitrary length

++          command = strdup(PHOTON_OS_LAUNCH_COMMAND);

++          if (!command) {

++             SetDeployError("Error allocating memory.");

++             return DEPLOY_ERROR;

++          }

++          _DeployPkg_SkipReboot(true);

++      }

+       // Run the deployment command

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

+       deploymentResult = ForkExecAndWaitCommand(command);

@@ -1,9 +1,10 @@

-+++ open-vm-tools-9.10.0/vgauth/service/Makefile.in_	2015-05-12 16:01:37.695680243 -0700

-@@ -322,7 +322,7 @@

- 	../lib/libvgauth.la @XERCES_LIBS@ @XMLSECURITY_LIBS@ \

- 	@SSL_LIBS@ -lxerces-c -lxml-security-c -lssl -lcrypto \

- 	$(am__append_1)

+diff -ru open-vm-tools-10.1.0/open-vm-tools/vgauth/service/Makefile.in open-vm-tools-10.1.0-mod/open-vm-tools/vgauth/service/Makefile.in

+--- open-vm-tools-10.1.0/open-vm-tools/vgauth/service/Makefile.in	2016-09-29 03:21:26.000000000 -0700

+@@ -367,7 +367,7 @@

+ 	-I$(top_srcdir)/vgauth/serviceImpl

+ VGAuthService_LDADD = @GLIB2_LIBS@ @GTHREAD_LIBS@ $(am__append_5) \

+ 	$(am__append_6) @SSL_LIBS@ -lssl -lcrypto $(am__append_7)

 -@HAVE_ICU_FALSE@VGAuthService_LINK = $(LINK)

 +@HAVE_ICU_FALSE@VGAuthService_LINK = $(CXXLINK)

  @HAVE_ICU_TRUE@VGAuthService_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS)     \

@@ -1,14 +1,14 @@

 Summary:        Usermode tools for VmWare virts

 Name:           open-vm-tools

-Version:        10.0.5

-Release:        14%{?dist}

+Version:        10.1.0

+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}-%{version}.tar.gz

-%define sha1 open-vm-tools=9d29a17cce539b032317d0a8c55977666daa137e

+%define sha1 open-vm-tools=6deb5ff09b7033cd4224580e664a608e6b4d1db2

 Source1:        gosc-scripts-1.0.tar.gz

 %define sha1 gosc-scripts-1.0=5031dd9b3b0569a40d2ee0caaa55a1cbf782345e

 Source2:        vmtoolsd.service

@@ -39,10 +39,10 @@ Requires:       systemd

 %description

 VmWare virtualization user mode tools

 %prep

-%setup -q

-%setup -a 1

-%patch0 -p1

-%patch1 -p1

+%setup -q -n open-vm-tools

+%setup -a 1 -n open-vm-tools

+%patch0 -p2

+%patch1 -p2

 %patch2 -p0

 %patch3 -p0

 %patch4 -p0

@@ -62,9 +62,6 @@ install -p -m 644 %{SOURCE3} %{buildroot}/lib/systemd/system

 make DESTDIR=%{buildroot} install

 rm -f %{buildroot}/sbin/mount.vmhgfs

-mkdir -p %{buildroot}/etc/pam.d

-mv %{buildroot}/usr/etc/pam.d/* %{buildroot}/etc/pam.d/

-rmdir %{buildroot}/usr/etc/pam.d

 chmod -x %{buildroot}/etc/pam.d/vmtoolsd

 # Move vm-support to /usr/bin

 mv %{buildroot}%{_sysconfdir}/vmware-tools/vm-support %{buildroot}%{_bindir}

@@ -106,9 +103,11 @@ fi

 %changelog

+*       Mon Nov 21 2016 Kumar Kaushik <kaushikk@vmware.com> 10.1.0-1

+-       Updating version to 10.1.0

 *       Wed Oct 05 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-14

 -       Adding proper entry to /etc/hosts for IPv6.

-*       Mon Oct 04 2016 ChangLee <changLee@vmware.com> 10.0.5-13

+*       Tue Oct 04 2016 ChangLee <changLee@vmware.com> 10.0.5-13

 -       Modified %check

 *       Thu Jun 23 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-12

 -       Avoiding recustomization of hostname, bug#1678537.