<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[154182] branches/release_2_3/base/src</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/154182">154182</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2016-10-23 18:33:17 +0200 (Sun, 23 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>merge <a href="https://trac.macports.org/changeset/122042">r122042</a> from trunk:
base: macports1.0: provide shell escaping function, use shell escaping for the selfupdate arguments in an attempt to fix #43875
merge <a href="https://trac.macports.org/changeset/122044">r122044</a> from trunk:
base: Makefiles: Quote DSTUSR/DSTGRP/DSTMODE, INSTALLDIR and RUNUSR in an attempt to fix #43875</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesrelease_2_3baseMakefilein">branches/release_2_3/base/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basedocMakefilein">branches/release_2_3/base/doc/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrcdarwintracelib10Makefilein">branches/release_2_3/base/src/darwintracelib1.0/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrcmacports10Makefilein">branches/release_2_3/base/src/macports1.0/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrcmacports10macportstcl">branches/release_2_3/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#branchesrelease_2_3basesrcmacports10testsmacportstest">branches/release_2_3/base/src/macports1.0/tests/macports.test</a></li>
<li><a href="#branchesrelease_2_3basesrcpackage10Makefilein">branches/release_2_3/base/src/package1.0/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrcportMakefilein">branches/release_2_3/base/src/port/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrcport10Makefilein">branches/release_2_3/base/src/port1.0/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrcprogramsdaemondoMakefilein">branches/release_2_3/base/src/programs/daemondo/Makefile.in</a></li>
<li><a href="#branchesrelease_2_3basesrcregistry20Makefilein">branches/release_2_3/base/src/registry2.0/Makefile.in</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchesrelease_2_3base">branches/release_2_3/base/</a></li>
<li><a href="#branchesrelease_2_3basesrc">branches/release_2_3/base/src/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx">Index: branches/release_2_3/base
</span><span class="cx">===================================================================
</span><del>--- branches/release_2_3/base 2016-10-23 16:30:55 UTC (rev 154181)
</del><ins>+++ branches/release_2_3/base 2016-10-23 16:33:17 UTC (rev 154182)
</ins><a id="branchesrelease_2_3base"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/gsoc13-tests:106692-111324
</span><span class="cx"> /branches/universal-sanity/base:51872-52323
</span><span class="cx"> /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><del>-/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
</del><ins>+/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
</ins><span class="cx"> /users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx"> /users/perry/base-select:44044-44692
</span><span class="cx">\ No newline at end of property
</span><a id="branchesrelease_2_3baseMakefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -36,22 +36,22 @@
</span><span class="cx">
</span><span class="cx"> install::
</span><span class="cx"> [ ! -f "$(DESTDIR)${sysconfdir}/macports/mp_version" ] || rm -vf "$(DESTDIR)${sysconfdir}/macports/mp_version"
</span><del>- $(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/"
</del><ins>+ $(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/"
</ins><span class="cx"> # Only run these scripts when not building in a destroot
</span><span class="cx"> ifeq ($(DESTDIR),)
</span><span class="cx"> # create run user if it doesn't exist
</span><span class="cx"> @if test -n "${DSCL}" -a -n "${DSEDITGROUP}" ; then \
</span><del>- if ! ${DSCL} -q . -read /Groups/${RUNUSR} > /dev/null 2>&1 ; then \
</del><ins>+ if ! ${DSCL} -q . -read "/Groups/${RUNUSR}" > /dev/null 2>&1 ; then \
</ins><span class="cx"> if test `id -u` -eq 0; then \
</span><span class="cx"> echo "Creating group \"${RUNUSR}\"" ; \
</span><del>- ${DSEDITGROUP} -q -o create ${RUNUSR} ; \
</del><ins>+ ${DSEDITGROUP} -q -o create "${RUNUSR}" ; \
</ins><span class="cx"> else \
</span><span class="cx"> echo "Not creating group \"${RUNUSR}\" (not root)" ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><del>- if ! ${DSCL} -q . -list /Users/${RUNUSR} > /dev/null 2>&1 ; then \
</del><ins>+ if ! ${DSCL} -q . -list "/Users/${RUNUSR}" > /dev/null 2>&1 ; then \
</ins><span class="cx"> if test `id -u` -eq 0; then \
</span><span class="cx"> echo "Creating user \"${RUNUSR}\"" ; \
</span><span class="cx"> NEXTUID=501; \
</span><span class="lines">@@ -58,36 +58,36 @@
</span><span class="cx"> while test -n "`${DSCL} -q /Search -search /Users UniqueID $$NEXTUID`"; do \
</span><span class="cx"> let "NEXTUID=NEXTUID+1"; \
</span><span class="cx"> done; \
</span><del>- ${DSCL} -q . -create /Users/${RUNUSR} UniqueID $$NEXTUID ; \
</del><ins>+ ${DSCL} -q . -create "/Users/${RUNUSR}" UniqueID $$NEXTUID ; \
</ins><span class="cx"> \
</span><del>- ${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 ; \
</del><ins>+ ${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 ; \
</ins><span class="cx"> \
</span><del>- ${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 ; \
</del><ins>+ ${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 ; \
</ins><span class="cx"> else \
</span><span class="cx"> echo "Not creating user \"${RUNUSR}\" (not root)" ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><del>- if test "$$(${DSCL} -q . -read /Users/${RUNUSR} NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \
</del><ins>+ if test "$$(${DSCL} -q . -read "/Users/${RUNUSR}" NFSHomeDirectory)" = "NFSHomeDirectory: /var/empty" ; then \
</ins><span class="cx"> if test `id -u` -eq 0; then \
</span><span class="cx"> echo "Updating home directory location for user \"${RUNUSR}\"" ; \
</span><del>- ${DSCL} -q . -create /Users/${RUNUSR} NFSHomeDirectory "${localstatedir}/macports/home" ; \
</del><ins>+ ${DSCL} -q . -create "/Users/${RUNUSR}" NFSHomeDirectory "${localstatedir}/macports/home" ; \
</ins><span class="cx"> else \
</span><span class="cx"> echo "Not updating home directory location for user \"${RUNUSR}\" (not root)" ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> if test `sw_vers -productVersion | /usr/bin/awk -F . '{print $$2}'` -eq 4 -a `id -u` -eq 0; then \
</span><del>- 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 \
</del><ins>+ 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 \
</ins><span class="cx"> echo "Fixing PrimaryGroupID for user \"${RUNUSR}\"" ; \
</span><del>- ${DSCL} -q . -create /Users/${RUNUSR} PrimaryGroupID $$GID ; \
- ${DSCL} -q . -create /Users/${RUNUSR} RealName MacPorts ; \
</del><ins>+ ${DSCL} -q . -create "/Users/${RUNUSR}" PrimaryGroupID $$GID ; \
+ ${DSCL} -q . -create "/Users/${RUNUSR}" RealName MacPorts ; \
</ins><span class="cx"> fi ; \
</span><span class="cx"> fi ; \
</span><span class="cx"> else \
</span></span></pre></div>
<a id="branchesrelease_2_3basedocMakefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/doc/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -32,8 +32,8 @@
</span><span class="cx"> gzip -c $^ > $@
</span><span class="cx">
</span><span class="cx"> install: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}"
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${DESTDIR}${mpconfigdir}"
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${DESTDIR}${mpconfigdir}"
</ins><span class="cx">
</span><span class="cx"> < prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
</span><span class="cx"> < base.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
</span><span class="lines">@@ -41,15 +41,15 @@
</span><span class="cx"> ifneq (8,@OS_MAJOR@)
</span><span class="cx"> # Tiger's chmod doesn't accept -h
</span><span class="cx"> # mtree with umask 0077 doesn't get the permissions of the symlink right
</span><del>- chmod -h 755 ${INSTALLDIR}/man
</del><ins>+ chmod -h 755 "${INSTALLDIR}/man"
</ins><span class="cx"> endif
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> for f in ${CONF}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f "${DESTDIR}${mpconfigdir}/$${f}.default"; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$f" "${DESTDIR}${mpconfigdir}/$${f}.default"; \
</ins><span class="cx"> if test ! -e "${DESTDIR}${mpconfigdir}/$$f" ; then \
</span><span class="cx"> set -x; \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f "${DESTDIR}${mpconfigdir}"; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 644 "$$f" "${DESTDIR}${mpconfigdir}"; \
</ins><span class="cx"> fi; \
</span><span class="cx"> done
</span><span class="cx">
</span><span class="lines">@@ -58,13 +58,13 @@
</span><span class="cx"> for m in ${MAN5}; do rm -f "${INSTALLDIR}/share/man/man5/$$m" ; done
</span><span class="cx"> for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done
</span><span class="cx">
</span><del>- $(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"
</del><ins>+ $(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"
</ins><span class="cx">Index: branches/release_2_3/base/src
</span><span class="cx">===================================================================
</span><del>--- branches/release_2_3/base/src 2016-10-23 16:30:55 UTC (rev 154181)
</del><ins>+++ branches/release_2_3/base/src 2016-10-23 16:33:17 UTC (rev 154182)
</ins></span></pre></div>
<a id="branchesrelease_2_3basesrc"></a>
<div class="propset"><h4>Property changes: branches/release_2_3/base/src</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> /branches/gsoc13-tests/src:106692-111324
</span><span class="cx"> /branches/universal-sanity/base/src:51872-52323
</span><span class="cx"> /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><del>-/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
</del><ins>+/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
</ins><span class="cx"> /users/perry/base-bugs_and_notes/src:45682-46060
</span><span class="cx"> /users/perry/base-select/src:44044-44692
</span><span class="cx">\ No newline at end of property
</span><a id="branchesrelease_2_3basesrcdarwintracelib10Makefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/darwintracelib1.0/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> distclean:: clean
</span><span class="cx">
</span><span class="cx"> install:: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx"> test::
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcmacports10Makefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/macports1.0/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -31,13 +31,13 @@
</span><span class="cx"> @# creating the directory will fail.
</span><span class="cx"> if test -L "${INSTALLDIR}"; then rm -rf "${INSTALLDIR}"; fi
</span><span class="cx">
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx"> $(SILENT) set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
</ins><span class="cx"> done
</span><span class="cx">
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/macports1.0/macports.tcl (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -3512,7 +3512,7 @@
</span><span class="cx"> }
</span><span class="cx"> ui_debug "Permissions OK"
</span><span class="cx">
</span><del>- set configure_args "--prefix=$prefix --with-install-user=$owner --with-install-group=$group --with-directory-mode=$perms"
</del><ins>+ 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]"
</ins><span class="cx"> # too many users have an incompatible readline in /usr/local, see ticket #10651
</span><span class="cx"> if {$tcl_platform(os) ne {Darwin} || $prefix eq {/usr/local}
</span><span class="cx"> || ([glob -nocomplain /usr/local/lib/lib{readline,history}*] eq {} && [glob -nocomplain /usr/local/include/readline/*.h] eq {})} {
</span><span class="lines">@@ -4927,3 +4927,25 @@
</span><span class="cx"> }
</span><span class="cx"> return $archive_sites_conf_values
</span><span class="cx"> }
</span><ins>+
+##
+# 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]'"
+}
</ins></span></pre></div>
<a id="branchesrelease_2_3basesrcmacports10testsmacportstest"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/macports1.0/tests/macports.test (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -958,4 +958,39 @@
</span><span class="cx"> } -result "Get archive sites conf values successful."
</span><span class="cx">
</span><span class="cx">
</span><ins>+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"]
+
</ins><span class="cx"> cleanupTests
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcpackage10Makefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/package1.0/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> $(TCLSH) $(srcdir)/tests/test.tcl -nocolor
</span><span class="cx">
</span><span class="cx"> install:: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</ins><span class="cx"> $(SILENT)set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
</ins><span class="cx"> done
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins></span></pre></div>
<a id="branchesrelease_2_3basesrcportMakefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/port/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -34,14 +34,14 @@
</span><span class="cx"> distclean: clean
</span><span class="cx">
</span><span class="cx"> install: all mkdirs
</span><del>- $(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
</del><ins>+ $(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
</ins><span class="cx"> ifneq (,$(findstring darwin,@build_os@))
</span><span class="cx"> ifneq (8,@OS_MAJOR@)
</span><del>- chmod -h 555 ${INSTALLDIR}/bin/portf ${INSTALLDIR}/bin/port-tclsh
</del><ins>+ chmod -h 555 "${INSTALLDIR}/bin/portf" "${INSTALLDIR}/bin/port-tclsh"
</ins><span class="cx"> endif
</span><span class="cx"> endif
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcport10Makefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/port1.0/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -30,14 +30,14 @@
</span><span class="cx"> rm -f port_autoconf.tcl port_test_autoconf.tcl
</span><span class="cx">
</span><span class="cx"> install:: all
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
</ins><span class="cx"> $(SILENT)set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}"; \
</ins><span class="cx"> done
</span><span class="cx"> $(SILENT)set -x; for file in ${SRCS_AUTOCONF}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}"; \
</ins><span class="cx"> done
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins><span class="cx">
</span><span class="cx"> test::
</span><span class="cx"> $(TCLSH) $(srcdir)/tests/test.tcl -nocolor
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcprogramsdaemondoMakefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/programs/daemondo/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -35,6 +35,6 @@
</span><span class="cx"> rm -f Makefile
</span><span class="cx">
</span><span class="cx"> install: daemondo
</span><del>- ${INSTALL} -o ${DSTUSR} -g ${DSTGRP} -m 555 ${PROGRAM} ${DESTDIR}${bindir}
</del><ins>+ ${INSTALL} -o "${DSTUSR}" -g "${DSTGRP}" -m 555 "${PROGRAM}" "${DESTDIR}${bindir}"
</ins><span class="cx">
</span><span class="cx"> test:
</span></span></pre></div>
<a id="branchesrelease_2_3basesrcregistry20Makefilein"></a>
<div class="modfile"><h4>Modified: branches/release_2_3/base/src/registry2.0/Makefile.in (154181 => 154182)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -40,12 +40,12 @@
</span><span class="cx"> rm -f registry_autoconf.tcl
</span><span class="cx">
</span><span class="cx"> install:: all $(SHLIB_NAME)
</span><del>- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
</del><ins>+ $(INSTALL) -d -o "${DSTUSR}" -g "${DSTGRP}" -m "${DSTMODE}" "${INSTALLDIR}"
+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "${SHLIB_NAME}" "${INSTALLDIR}"
</ins><span class="cx"> $(SILENT) set -x; for file in ${SRCS}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}/$$file; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$(srcdir)/$$file" "${INSTALLDIR}/$$file"; \
</ins><span class="cx"> done
</span><span class="cx"> $(SILENT) set -x; for file in ${SRCS_AUTOCONF}; do \
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 "$$file" "${INSTALLDIR}/$$file"; \
</ins><span class="cx"> done
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del><ins>+ $(INSTALL) -o "${DSTUSR}" -g "${DSTGRP}" -m 444 pkgIndex.tcl "${INSTALLDIR}"
</ins></span></pre>
</div>
</div>
</body>
</html>