From owner-svn-ports-all@freebsd.org Tue Mar 13 14:20:25 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6EBEDF510AB; Tue, 13 Mar 2018 14:20:25 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 220BE7F0CD; Tue, 13 Mar 2018 14:20:25 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 03EFE1AE88; Tue, 13 Mar 2018 14:20:25 +0000 (UTC) (envelope-from jpaetzel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2DEKOra039684; Tue, 13 Mar 2018 14:20:24 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2DEKOMs039682; Tue, 13 Mar 2018 14:20:24 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201803131420.w2DEKOMs039682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Tue, 13 Mar 2018 14:20:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464378 - in head/emulators/open-vm-tools: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in head/emulators/open-vm-tools: . files X-SVN-Commit-Revision: 464378 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Mar 2018 14:20:25 -0000 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 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 + #include + #include ++#include + + #ifdef _WIN32 + #include +@@ -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. */