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}
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
