From owner-svn-src-all@freebsd.org  Wed Mar  9 22:45:02 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-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 2D28BAC9308;
 Wed,  9 Mar 2016 22:45:02 +0000 (UTC)
 (envelope-from bdrewery@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 mx1.freebsd.org (Postfix) with ESMTPS id DAB6AB57;
 Wed,  9 Mar 2016 22:45:01 +0000 (UTC)
 (envelope-from bdrewery@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u29Mj0rO093967;
 Wed, 9 Mar 2016 22:45:00 GMT (envelope-from bdrewery@FreeBSD.org)
Received: (from bdrewery@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u29Mj0uM093964;
 Wed, 9 Mar 2016 22:45:00 GMT (envelope-from bdrewery@FreeBSD.org)
Message-Id: <201603092245.u29Mj0uM093964@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bdrewery set sender to
 bdrewery@FreeBSD.org using -f
From: Bryan Drewery <bdrewery@FreeBSD.org>
Date: Wed, 9 Mar 2016 22:45:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r296585 - head/share/mk
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Mar 2016 22:45:02 -0000

Author: bdrewery
Date: Wed Mar  9 22:45:00 2016
New Revision: 296585
URL: https://svnweb.freebsd.org/changeset/base/296585

Log:
  These group names may be used as a cookie, so replace any non-fs-safe characters.
  
  One example is in cddl/usr.sbin/dtrace/tests/common/aggs.  It could be
  fixed but other uses of this would break, especially in the
  DIRDEPS_BUILD which uses the group names for stage cookies.
  
  MFC after:	1 week
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.confs.mk
  head/share/mk/bsd.files.mk
  head/share/mk/bsd.incs.mk

Modified: head/share/mk/bsd.confs.mk
==============================================================================
--- head/share/mk/bsd.confs.mk	Wed Mar  9 22:44:48 2016	(r296584)
+++ head/share/mk/bsd.confs.mk	Wed Mar  9 22:45:00 2016	(r296585)
@@ -6,8 +6,10 @@
 
 CONFGROUPS?=	CONFS
 
+_CONFGROUPS=	${CONFGROUPS:C,[/*],_,g}
+
 .if !target(buildconfig)
-.for group in ${CONFGROUPS}
+.for group in ${_CONFGROUPS}
 buildconfig: ${${group}}
 .endfor
 .endif
@@ -17,7 +19,7 @@ all: buildconfig
 .endif
 
 .if !target(installconfig)
-.for group in ${CONFGROUPS}
+.for group in ${_CONFGROUPS}
 .if defined(${group}) && !empty(${group})
 
 ${group}OWN?=	${SHAREOWN}

Modified: head/share/mk/bsd.files.mk
==============================================================================
--- head/share/mk/bsd.files.mk	Wed Mar  9 22:44:48 2016	(r296584)
+++ head/share/mk/bsd.files.mk	Wed Mar  9 22:45:00 2016	(r296585)
@@ -9,7 +9,9 @@ __<bsd.files.mk>__:
 
 FILESGROUPS?=	FILES
 
-.for group in ${FILESGROUPS}
+_FILESGROUPS=	${FILESGROUPS:C,[/*],_,g}
+
+.for group in ${_FILESGROUPS}
 # Add in foo.yes and remove duplicates from all the groups
 ${${group}}:= ${${group}} ${${group}.yes}
 ${${group}}:= ${${group}:O:u}
@@ -20,7 +22,7 @@ buildfiles: ${${group}}
 all: buildfiles
 .endif
 
-.for group in ${FILESGROUPS}
+.for group in ${_FILESGROUPS}
 .if defined(${group}) && !empty(${group})
 installfiles: installfiles-${group}
 

Modified: head/share/mk/bsd.incs.mk
==============================================================================
--- head/share/mk/bsd.incs.mk	Wed Mar  9 22:44:48 2016	(r296584)
+++ head/share/mk/bsd.incs.mk	Wed Mar  9 22:45:00 2016	(r296585)
@@ -8,8 +8,10 @@
 
 INCSGROUPS?=	INCS
 
+_INCSGROUPS=	${INCSGROUPS:C,[/*],_,g}
+
 .if !target(buildincludes)
-.for group in ${INCSGROUPS}
+.for group in ${_INCSGROUPS}
 buildincludes: ${${group}}
 .endfor
 .endif
@@ -19,7 +21,7 @@ all: buildincludes
 .endif
 
 .if !target(installincludes)
-.for group in ${INCSGROUPS}
+.for group in ${_INCSGROUPS}
 .if defined(${group}) && !empty(${group})
 
 ${group}OWN?=	${BINOWN}