From owner-svn-ports-all@freebsd.org Mon Jan 22 20:27:02 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ACDB5ED4084; Mon, 22 Jan 2018 20:27:02 +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 867FB6D175; Mon, 22 Jan 2018 20:27:02 +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 BD4201F0EC; Mon, 22 Jan 2018 20:27:01 +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 w0MKR1tu029418; Mon, 22 Jan 2018 20:27:01 GMT (envelope-from jpaetzel@FreeBSD.org) Received: (from jpaetzel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0MKR1FU029416; Mon, 22 Jan 2018 20:27:01 GMT (envelope-from jpaetzel@FreeBSD.org) Message-Id: <201801222027.w0MKR1FU029416@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jpaetzel set sender to jpaetzel@FreeBSD.org using -f From: Josh Paetzel Date: Mon, 22 Jan 2018 20:27:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r459695 - in branches/2018Q1/emulators/open-vm-tools: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jpaetzel X-SVN-Commit-Paths: in branches/2018Q1/emulators/open-vm-tools: . files X-SVN-Commit-Revision: 459695 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: Mon, 22 Jan 2018 20:27:02 -0000 Author: jpaetzel Date: Mon Jan 22 20:27:01 2018 New Revision: 459695 URL: https://svnweb.freebsd.org/changeset/ports/459695 Log: MFH: r457864 Fix build with clang 6.0.0 Also avoids an endless loop in practice PR: 224816 Submitted by: dim Approved by: ports-secteam (swills) Added: branches/2018Q1/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c - copied unchanged from r457864, head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c Modified: branches/2018Q1/emulators/open-vm-tools/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/emulators/open-vm-tools/Makefile ============================================================================== --- branches/2018Q1/emulators/open-vm-tools/Makefile Mon Jan 22 20:17:06 2018 (r459694) +++ branches/2018Q1/emulators/open-vm-tools/Makefile Mon Jan 22 20:27:01 2018 (r459695) @@ -4,7 +4,7 @@ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} DISTVERSIONPREFIX= stable- -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= emulators Copied: branches/2018Q1/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c (from r457864, head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c Mon Jan 22 20:27:01 2018 (r459695, copy of r457864, head/emulators/open-vm-tools/files/patch-services_plugins_vix_vixTools.c) @@ -0,0 +1,29 @@ +--- services/plugins/vix/vixTools.c.orig 2017-12-15 21:11:49 UTC ++++ services/plugins/vix/vixTools.c +@@ -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", +@@ -7372,6 +7373,9 @@ VixToolsRunScript(VixCommandRequestHeader *requestMsg, + * deletes it), we should not try 4+ billion times. + */ + break; ++ } ++ if (var == INT_MAX) { ++ break; + } + } + if (fd < 0) {