Bug#204668 - Fix WORKDIR quoting in econf() when updating

config.guess and config.sub. (trunk r9162)

svn path=/main/branches/2.1.2/; revision=9171

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 56347fc9d95b516cc13c9153f75bacf3478d2484..ef21d222d696252edacc936f04f1287cbbb1b351 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -409,9 +409,11 @@ econf() {
        fi
        if [ -x "${ECONF_SOURCE}/configure" ]; then
                if [ -e /usr/share/gnuconfig/ ]; then
-                       for x in $(find "${WORKDIR}" -type f '(' -name config.guess -o -name config.sub ')') ; do
+                       find "${WORKDIR}" -type f '(' \
+                       -name config.guess -o -name config.sub ')' -print0 | \
+                       while read -d $'\0' x ; do
                                vecho " * econf: updating ${x/${WORKDIR}\/} with /usr/share/gnuconfig/${x##*/}"
-                               cp -f /usr/share/gnuconfig/${x##*/} ${x}
+                               cp -f /usr/share/gnuconfig/"${x##*/}" "${x}"
                        done
                fi