From owner-svn-ports-all@FreeBSD.ORG  Thu Apr 24 22:42:06 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A9A1BD01;
 Thu, 24 Apr 2014 22:42:06 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 96D981974;
 Thu, 24 Apr 2014 22:42:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3OMg61H079427;
 Thu, 24 Apr 2014 22:42:06 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Received: (from bdrewery@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3OMg6MC079426;
 Thu, 24 Apr 2014 22:42:06 GMT
 (envelope-from bdrewery@svn.freebsd.org)
Message-Id: <201404242242.s3OMg6MC079426@svn.freebsd.org>
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Thu, 24 Apr 2014 22:42:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352075 - head/Mk/Scripts
X-SVN-Group: ports-head
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.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2014 22:42:06 -0000

Author: bdrewery
Date: Thu Apr 24 22:42:06 2014
New Revision: 352075
URL: http://svnweb.freebsd.org/changeset/ports/352075
QAT: https://qat.redports.org/buildarchive/r352075/

Log:
  - Fix check-stagedir causing staging violating. Quote all directory names
    when doing plist checks. This could leak out if an unsupported format
    was used such as 'rmdir -p' or 'rmdir dir1 dir2 dir3'
  
  With hat:	portmgr
  Reported by:	antoine
  Pointyhat to:	bdrewery

Modified:
  head/Mk/Scripts/check-stagedir.sh

Modified: head/Mk/Scripts/check-stagedir.sh
==============================================================================
--- head/Mk/Scripts/check-stagedir.sh	Thu Apr 24 22:31:24 2014	(r352074)
+++ head/Mk/Scripts/check-stagedir.sh	Thu Apr 24 22:42:06 2014	(r352075)
@@ -364,8 +364,11 @@ check_missing_plist_items() {
 	mkdir ${WRKDIR}/.missing-dirs
 	comm -23 ${WRKDIR}/.plist-dirs-sorted-no-comments \
 	    ${WRKDIR}/.staged-dirs-sorted > ${WRKDIR}/.missing-plist-dirs
-	sed "s,^,${WRKDIR}/.missing-dirs," ${WRKDIR}/.missing-plist-dirs | \
-	    xargs mkdir -p
+	# Creates the dirs in WRKDIR/.missing-dirs and ensure spaces are
+	# quoted.
+	sed -e "s,^,${WRKDIR}/.missing-dirs," \
+	    -e 's,^\(.*\)$,"\1",' \
+	    ${WRKDIR}/.missing-plist-dirs | xargs mkdir -p
 	find -ds ${WRKDIR}/.missing-dirs | \
 	    sed -e "s,^${WRKDIR}/.missing-dirs,," | \
 	    while read dir; do \