From owner-svn-ports-all@freebsd.org  Tue Aug 27 08:52:28 2019
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id C8C9ED05C8;
 Tue, 27 Aug 2019 08:52:28 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46HjLN4rLcz4cr7;
 Tue, 27 Aug 2019 08:52:28 +0000 (UTC)
 (envelope-from bapt@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 87EBF1C449;
 Tue, 27 Aug 2019 08:52:28 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x7R8qSQ2072861;
 Tue, 27 Aug 2019 08:52:28 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id x7R8qSJZ072859;
 Tue, 27 Aug 2019 08:52:28 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201908270852.x7R8qSJZ072859@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 27 Aug 2019 08:52:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r509995 - head/Mk/Scripts
X-SVN-Group: ports-head
X-SVN-Commit-Author: bapt
X-SVN-Commit-Paths: head/Mk/Scripts
X-SVN-Commit-Revision: 509995
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.29
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 Aug 2019 08:52:28 -0000

Author: bapt
Date: Tue Aug 27 08:52:28 2019
New Revision: 509995
URL: https://svnweb.freebsd.org/changeset/ports/509995

Log:
  Prevent globbing before validating env vars.
  
  Submitted by:	dillon
  Obtained from:	dports (dragonfly)

Modified:
  head/Mk/Scripts/functions.sh

Modified: head/Mk/Scripts/functions.sh
==============================================================================
--- head/Mk/Scripts/functions.sh	Tue Aug 27 07:48:54 2019	(r509994)
+++ head/Mk/Scripts/functions.sh	Tue Aug 27 08:52:28 2019	(r509995)
@@ -153,9 +153,11 @@ parse_plist() {
 validate_env() {
 	local envfault
 	for i ; do
+		set -f
 		if ! (eval ": \${${i}?}" ) >/dev/null; then
 			envfault="${envfault}${envfault:+" "}${i}"
 		fi
+		set +f
 	done
 	if [ -n "${envfault}" ]; then
 		echo "Environment variable ${envfault} undefined. Aborting." \