[154182] branches/release_2_3/base/src
raimue at macports.org
raimue at macports.org
Sun Oct 23 18:33:17 CEST 2016
Revision: 154182
https://trac.macports.org/changeset/154182
Author: raimue at macports.org
Date: 2016-10-23 18:33:17 +0200 (Sun, 23 Oct 2016)
Log Message:
-----------
merge r122042 from trunk:
base: macports1.0: provide shell escaping function, use shell escaping for the selfupdate arguments in an attempt to fix #43875
merge r122044 from trunk:
base: Makefiles: Quote DSTUSR/DSTGRP/DSTMODE, INSTALLDIR and RUNUSR in an attempt to fix #43875
Revision Links:
--------------
https://trac.macports.org/changeset/122042
https://trac.macports.org/changeset/122044
Modified Paths:
--------------
branches/release_2_3/base/Makefile.in
branches/release_2_3/base/doc/Makefile.in
branches/release_2_3/base/src/darwintracelib1.0/Makefile.in
branches/release_2_3/base/src/macports1.0/Makefile.in
branches/release_2_3/base/src/macports1.0/macports.tcl
branches/release_2_3/base/src/macports1.0/tests/macports.test
branches/release_2_3/base/src/package1.0/Makefile.in
branches/release_2_3/base/src/port/Makefile.in
branches/release_2_3/base/src/port1.0/Makefile.in
branches/release_2_3/base/src/programs/daemondo/Makefile.in
branches/release_2_3/base/src/registry2.0/Makefile.in
Property Changed:
----------------
branches/release_2_3/base/
branches/release_2_3/base/src/
Index: branches/release_2_3/base
===================================================================
--- branches/release_2_3/base 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base 2016-10-23 16:33:17 UTC (rev 154182)
Property changes on: branches/release_2_3/base
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,6 ##
/branches/gsoc13-tests:106692-111324
/branches/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
-/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073
+/trunk/base:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135998-135999,136965,137850,138461,138530,138749,139270,140693,140724,141134,145037,145162,146644,147347,147456,148084,149299,149529,150305,152115,152442,152447,152676,153648,153865,153932,154073
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
\ No newline at end of property
Modified: branches/release_2_3/base/Makefile.in
===================================================================
--- branches/release_2_3/base/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -36,22 +36,22 @@
install::
[ ! -f "$(DESTDIR)${sysconfdir}/macports/mp_version" ] || rm -vf "$(DESTDIR)${sysconfdir}/macports/mp_version"
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "$(DESTDIR)${datadir}/macports/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash "$(DESTDIR)${datadir}/macports/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/macports-pubkey.pem "$(DESTDIR)${datadir}/macports/"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "$(DESTDIR)${datadir}/macports/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 setupenv.bash "$(DESTDIR)${datadir}/macports/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 $(srcdir)/macports-pubkey.pem "$(DESTDIR)${datadir}/macports/"
# Only run these scripts when not building in a destroot
ifeq ($(DESTDIR),)
# create run user if it doesn't exist
@if test -n "${DSCL}" -a -n "${DSEDITGROUP}" ; then \
- if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then \
+ if ! ${DSCL} -q . -read "/Groups/${RUNUSR}" > /dev/null 2>&1 ; then \
if test `id -u` -eq 0; then \
echo "Creating group \"${RUNUSR}\"" ; \
- ${DSEDITGROUP} -q -o create ${RUNUSR} ; \
+ ${DSEDITGROUP} -q -o create "${RUNUSR}" ; \
else \
echo "Not creating group \"${RUNUSR}\" (not root)" ; \
fi ; \
fi ; \
- if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then \
+ if ! ${DSCL} -q . -list "/Users/${RUNUSR}" > /dev/null 2>&1 ; then \
if test `id -u` -eq 0; then \
echo "Creating user \"${RUNUSR}\"" ; \
NEXTUID=501; \
@@ -58,36 +58,36 @@
while test -n "`${DSCL} -q /Search -search /Users UniqueID $$NEXTUID`"; do \
let "NEXTUID=NEXTUID+1"; \
done; \
- ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $$NEXTUID ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" UniqueID $$NEXTUID ; \
\
- ${DSCL} -q . -delete /Users/${RUNUSR} AuthenticationAuthority ; \
- ${DSCL} -q . -delete /Users/${RUNUSR} PasswordPolicyOptions ; \
- ${DSCL} -q . -delete /Users/${RUNUSR} dsAttrTypeNative:KerberosKeys ; \
- ${DSCL} -q . -delete /Users/${RUNUSR} dsAttrTypeNative:ShadowHashData ; \
+ ${DSCL} -q . -delete "/Users/${RUNUSR}" AuthenticationAuthority ; \
+ ${DSCL} -q . -delete "/Users/${RUNUSR}" PasswordPolicyOptions ; \
+ ${DSCL} -q . -delete "/Users/${RUNUSR}" dsAttrTypeNative:KerberosKeys ; \
+ ${DSCL} -q . -delete "/Users/${RUNUSR}" dsAttrTypeNative:ShadowHashData ; \
\
- ${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts ; \
- ${DSCL} -q . -create /Users/${RUNUSR} Password \* ; \
- ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$(${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $$2}') ; \
- ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory "${localstatedir}/macports/home" ; \
- ${DSCL} -q . -create /Users/${RUNUSR} UserShell /usr/bin/false ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" RealName MacPorts ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" Password \* ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" PrimaryGroupID $$(${DSCL} -q . -read "/Groups/${RUNUSR}" PrimaryGroupID | /usr/bin/awk '{print $$2}') ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" UserShell /usr/bin/false ; \
else \
echo "Not creating user \"${RUNUSR}\" (not root)" ; \
fi ; \
fi ; \
- if test "$$(${DSCL} -q . -read /Users/${RUNUSR} NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \
+ if test "$$(${DSCL} -q . -read "/Users/${RUNUSR}" NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \
if test `id -u` -eq 0; then \
echo "Updating home directory location for user \"${RUNUSR}\"" ; \
- ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory "${localstatedir}/macports/home" ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \
else \
echo "Not updating home directory location for user \"${RUNUSR}\" (not root)" ; \
fi ; \
fi ; \
if test `sw_vers -productVersion | /usr/bin/awk -F . '{print $$2}'` -eq 4 -a `id -u` -eq 0; then \
- GID=`${DSCL} -q . -read /Groups/${RUNUSR} PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \
- if test "`${DSCL} -q . -read /Users/${RUNUSR} PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \
+ GID=`${DSCL} -q . -read "/Groups/${RUNUSR}" PrimaryGroupID | /usr/bin/awk '{print $$2}'` ; \
+ if test "`${DSCL} -q . -read "/Users/${RUNUSR}" PrimaryGroupID 2>/dev/null | /usr/bin/awk '{print $$2}'`" != "$$GID"; then \
echo "Fixing PrimaryGroupID for user \"${RUNUSR}\"" ; \
- ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$GID ; \
- ${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" PrimaryGroupID $$GID ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" RealName MacPorts ; \
fi ; \
fi ; \
else \
Modified: branches/release_2_3/base/doc/Makefile.in
===================================================================
--- branches/release_2_3/base/doc/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/doc/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -32,8 +32,8 @@
gzip -c $^ > $@
install: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}"
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${DESTDIR}${mpconfigdir}"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${mpconfigdir}"
< prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
< base.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
@@ -41,15 +41,15 @@
ifneq (8, at OS_MAJOR@)
# Tiger's chmod doesn't accept -h
# mtree with umask 0077 doesn't get the permissions of the symlink right
- chmod -h 755 ${INSTALLDIR}/man
+ chmod -h 755 "${INSTALLDIR}/man"
endif
endif
for f in ${CONF}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f "${DESTDIR}${mpconfigdir}/$${f}.default"; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$f" "${DESTDIR}${mpconfigdir}/$${f}.default"; \
if test ! -e "${DESTDIR}${mpconfigdir}/$$f" ; then \
set -x; \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f "${DESTDIR}${mpconfigdir}"; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 "$$f" "${DESTDIR}${mpconfigdir}"; \
fi; \
done
@@ -58,13 +58,13 @@
for m in ${MAN5}; do rm -f "${INSTALLDIR}/share/man/man5/$$m" ; done
for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}/share/macports/install"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz "${INSTALLDIR}/share/man/man1"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/share/macports/install"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 port.1.gz "${INSTALLDIR}/share/man/man1"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"
Index: branches/release_2_3/base/src
===================================================================
--- branches/release_2_3/base/src 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src 2016-10-23 16:33:17 UTC (rev 154182)
Property changes on: branches/release_2_3/base/src
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,6 ##
/branches/gsoc13-tests/src:106692-111324
/branches/universal-sanity/base/src:51872-52323
/branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
-/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447,153648,153865
+/trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118570,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119571,119594-119595,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,122042,122044,122827,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,127797,128113,128274,128276,128422,132312,134501-134502,134511,135851,136965,137850,138461,138530,138749,139270,141134,145037,145162,146644,147347,147456,148084,149299,150305,152115,152442,152447,153648,153865
/users/perry/base-bugs_and_notes/src:45682-46060
/users/perry/base-select/src:44044-44692
\ No newline at end of property
Modified: branches/release_2_3/base/src/darwintracelib1.0/Makefile.in
===================================================================
--- branches/release_2_3/base/src/darwintracelib1.0/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/darwintracelib1.0/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -27,7 +27,7 @@
distclean:: clean
install:: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}"
test::
Modified: branches/release_2_3/base/src/macports1.0/Makefile.in
===================================================================
--- branches/release_2_3/base/src/macports1.0/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/macports1.0/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -31,13 +31,13 @@
@# creating the directory will fail.
if test -L "${INSTALLDIR}"; then rm -rf "${INSTALLDIR}"; fi
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
$(SILENT) set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
done
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
include $(srcdir)/../../Mk/macports.tea.mk
Modified: branches/release_2_3/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_3/base/src/macports1.0/macports.tcl 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/macports1.0/macports.tcl 2016-10-23 16:33:17 UTC (rev 154182)
@@ -3512,7 +3512,7 @@
}
ui_debug "Permissions OK"
- set configure_args "--prefix=$prefix --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
+ set configure_args "--prefix=[macports::shellescape $prefix] --with-install-user=[macports::shellescape $owner] --with-install-group=[macports::shellescape $group] --with-directory-mode=[macports::shellescape $perms]"
# too many users have an incompatible readline in /usr/local, see ticket #10651
if {$tcl_platform(os) ne {Darwin} || $prefix eq {/usr/local}
|| ([glob -nocomplain /usr/local/lib/lib{readline,history}*] eq {} && [glob -nocomplain /usr/local/include/readline/*.h] eq {})} {
@@ -4927,3 +4927,25 @@
}
return $archive_sites_conf_values
}
+
+##
+# Escape a string for use in a POSIX shell, e.g., when passing it to the \c system Pextlib extension. This is necessary
+# to handle cases such as group names with backslashes correctly. See #43875 for an example of a problem caused by
+# missing quotes.
+#
+# @param arg The argument that should be escaped for use in a POSIX shell
+# @return A quoted version of the argument
+proc macports::shellescape {arg} {
+ set mapping {}
+ # Replace each backslash by a double backslash. Apparently Bash treats Backslashes in single-quoted strings
+ # differently depending on whether is was invoked as sh or bash: echo 'using \backslashes' preserves the backslash
+ # in bash mode, but interprets it in sh mode. Since the `system' command uses sh, escape backslashes.
+ lappend mapping "\\" "\\\\"
+ # Replace each single quote with a single quote (closing the currently open string), an escaped single quote \'
+ # (additional backslash needed to escape the backslash in Tcl), and another single quote (opening a new quoted
+ # string).
+ lappend mapping "'" "'\\''"
+
+ # Add a single quote at the start, escape all single quotes in the argument, and add a single quote at the end
+ return "'[string map $mapping $arg]'"
+}
Modified: branches/release_2_3/base/src/macports1.0/tests/macports.test
===================================================================
--- branches/release_2_3/base/src/macports1.0/tests/macports.test 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/macports1.0/tests/macports.test 2016-10-23 16:33:17 UTC (rev 154182)
@@ -958,4 +958,39 @@
} -result "Get archive sites conf values successful."
+set shellescapeTests [list \
+ "using \\backslashes" \
+ " spaces " \
+ "and tabs" \
+ "quotes need to be \"supported\", too" \
+ "… and not only 'double-quotes'" \
+ "other meta chars such as \$dollar," \
+ "!bang, ;semicolon, :colon," \
+ "\$(subshells) and similar must be kept" \
+ ">redirects <& must be ignored as well as ampersands &"]
+test shellescaping {
+ Check whether shell escaping using macports::shellescape works correctly when passed to Pextlib's system extension.
+} -setup {
+ set outputfile "shellescapetestoutput.txt"
+ makeFile "" $outputfile
+
+} -body {
+ set first "yes"
+ foreach test $shellescapeTests {
+ if {$first eq "yes"} {
+ system "echo [macports::shellescape $test] >$outputfile"
+ set first "no"
+ } else {
+ system "echo [macports::shellescape $test] >>$outputfile"
+ }
+ }
+
+ set fd [open $outputfile r]
+ set output [read -nonewline $fd]
+ close $fd
+ return $output
+} -cleanup {
+ removeFile $outputfile
+} -result [join $shellescapeTests "\n"]
+
cleanupTests
Modified: branches/release_2_3/base/src/package1.0/Makefile.in
===================================================================
--- branches/release_2_3/base/src/package1.0/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/package1.0/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -25,8 +25,8 @@
$(TCLSH) $(srcdir)/tests/test.tcl -nocolor
install:: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
$(SILENT)set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
done
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
Modified: branches/release_2_3/base/src/port/Makefile.in
===================================================================
--- branches/release_2_3/base/src/port/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/port/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -34,14 +34,14 @@
distclean: clean
install: all mkdirs
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/bin
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/var/macports
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 555 port portindex portmirror ${INSTALLDIR}/bin/
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/port-help.tcl ${INSTALLDIR}/var/macports/
- cd ${INSTALLDIR}/bin && $(LN_S) -f port portf
- cd ${INSTALLDIR}/bin && $(LN_S) -f ${TCLSH} port-tclsh
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/bin"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}/var/macports"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 555 port portindex portmirror "${INSTALLDIR}/bin/"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/port-help.tcl" "${INSTALLDIR}/var/macports/"
+ cd "${INSTALLDIR}/bin" && $(LN_S) -f port portf
+ cd "${INSTALLDIR}/bin" && $(LN_S) -f "${TCLSH}" port-tclsh
ifneq (,$(findstring darwin, at build_os@))
ifneq (8, at OS_MAJOR@)
- chmod -h 555 ${INSTALLDIR}/bin/portf ${INSTALLDIR}/bin/port-tclsh
+ chmod -h 555 "${INSTALLDIR}/bin/portf" "${INSTALLDIR}/bin/port-tclsh"
endif
endif
Modified: branches/release_2_3/base/src/port1.0/Makefile.in
===================================================================
--- branches/release_2_3/base/src/port1.0/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/port1.0/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -30,14 +30,14 @@
rm -f port_autoconf.tcl port_test_autoconf.tcl
install:: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
$(SILENT)set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
done
$(SILENT)set -x; for file in ${SRCS_AUTOCONF}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}"; \
done
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
test::
$(TCLSH) $(srcdir)/tests/test.tcl -nocolor
Modified: branches/release_2_3/base/src/programs/daemondo/Makefile.in
===================================================================
--- branches/release_2_3/base/src/programs/daemondo/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/programs/daemondo/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -35,6 +35,6 @@
rm -f Makefile
install: daemondo
- ${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${DESTDIR}${bindir}
+ ${INSTALL} -o "${DSTUSR}" -g "${DSTGRP}" -m 555 "${PROGRAM}" "${DESTDIR}${bindir}"
test:
Modified: branches/release_2_3/base/src/registry2.0/Makefile.in
===================================================================
--- branches/release_2_3/base/src/registry2.0/Makefile.in 2016-10-23 16:30:55 UTC (rev 154181)
+++ branches/release_2_3/base/src/registry2.0/Makefile.in 2016-10-23 16:33:17 UTC (rev 154182)
@@ -40,12 +40,12 @@
rm -f registry_autoconf.tcl
install:: all $(SHLIB_NAME)
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}"
$(SILENT) set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}/$$file; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}/$$file"; \
done
$(SILENT) set -x; for file in ${SRCS_AUTOCONF}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
done
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161023/84056783/attachment-0002.html>
More information about the macports-changes
mailing list