svn commit: r464378 - in head/emulators/open-vm-tools: . files

[Josh Paetzel]

Author: jpaetzel
Date: Tue Mar 13 14:20:24 2018
New Revision: 464378
URL: https://svnweb.freebsd.org/changeset/ports/464378

Log:
  Reintegrate accidentally removed patch
  
  Along the way remove a patch that is no longer
  needed.
  
  Reported by:	John Wolfe <jwolfe at vmware.com>
  Pointyhat:	jpaetzel

Deleted:
  head/emulators/open-vm-tools/files/patch-lib_hgfsServer_hgfsServerLinux.c
Modified:
  head/emulators/open-vm-tools/Makefile
  head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c

Modified: head/emulators/open-vm-tools/Makefile
==============================================================================
--- head/emulators/open-vm-tools/Makefile	Tue Mar 13 14:13:26 2018	(r464377)
+++ head/emulators/open-vm-tools/Makefile	Tue Mar 13 14:20:24 2018	(r464378)
@@ -4,7 +4,7 @@
 PORTNAME=		open-vm-tools
 PORTVERSION=		${RELEASE_VER}
 DISTVERSIONPREFIX=	stable-
-PORTREVISION=		4
+PORTREVISION=		5
 PORTEPOCH=		2
 CATEGORIES=		emulators
 

Modified: head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c
==============================================================================
--- head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c	Tue Mar 13 14:13:26 2018	(r464377)
+++ head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c	Tue Mar 13 14:20:24 2018	(r464378)
@@ -1,6 +1,33 @@
---- services/plugins/vix/vixTools.c.orig	2018-02-24 17:50:37 UTC
+--- services/plugins/vix/vixTools.c.orig	2017-12-15 21:11:49 UTC
 +++ services/plugins/vix/vixTools.c
-@@ -10135,7 +10135,7 @@ abort:
+@@ -52,6 +52,7 @@
+ #include <stdarg.h>
+ #include <fcntl.h>
+ #include <errno.h>
++#include <limits.h>
+ 
+ #ifdef _WIN32
+ #include <WTypes.h>
+@@ -7330,7 +7331,7 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
+          goto abort;
+       }
+    }
+-   for (var = 0; var <= 0xFFFFFFFF; var++) {
++   for (var = 0; ; var++) {
+       free(tempScriptFilePath);
+       tempScriptFilePath = Str_SafeAsprintf(NULL,
+                                             "%s"DIRSEPS"%s%d%s",
+@@ -7373,6 +7374,9 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg,
+           */
+          break;
+       }
++      if (var == INT_MAX) {
++         break;
++      }
+    }
+    if (fd < 0) {
+       /*
+@@ -10131,7 +10135,7 @@ abort:
     struct passwd pwd;
     struct passwd *ppwd = &pwd;
     char *buffer = NULL; // a pool of memory for Posix_Getpwnam_r() to use.
@@ -9,7 +36,7 @@
  
     /*
      * For POSIX systems, look up the uid of 'username', and compare
-@@ -10148,9 +10148,15 @@ abort:
+@@ -10144,9 +10148,15 @@ abort:
      * Multiply by 4 to compensate for the conversion to UTF-8 by
      * the Posix_Getpwnam_r() wrapper.
      */