Re: [gentoo-portage-dev] [PATCH] bin/ebuild-helpers/portageq: fix bug #524964

[Michał Górny]

Dnia 2014-10-10, o godz. 21:50:53
Zac Medico <zmedico@g.o> napisał(a):

> Since commit 0cc4c1ac21a2ea94cfb1f6ff4b461a9e349d47df,
> $PORTAGE_BIN_PATH/portageq no longer exists, which breaks
> bin/ebuild-helpers/portageq. Note that has_version and best_version
> rely on bin/ebuild-helpers/portageq if IPC is disabled, so breakage
> extends beyond ebuilds that call portageq "illegally". Since
> $PORTAGE_BIN_PATH no longer works, use PATH to locate the real
> portageq python script.
>
> Fixes: 0cc4c1ac21a2 ("Install Portage using setup.py")
> X-Gento-Bug: 524964
> X-Gentoo-URL: https://bugs.gentoo.org/show_bug.cgi?id=524964
> ---
>  bin/ebuild-helpers/portageq | 19 +++++++++++++++++--
>  1 file changed, 17 insertions(+), 2 deletions(-)
>
> diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq
> index b67b03f..9eb17fc 100755
> --- a/bin/ebuild-helpers/portageq
> +++ b/bin/ebuild-helpers/portageq
> @@ -2,9 +2,24 @@
>  # Copyright 2009-2013 Gentoo Foundation
>  # Distributed under the terms of the GNU General Public License v2
>
> +scriptpath=${BASH_SOURCE[0]}
> +scriptname=${scriptpath##*/}
> +
>  PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
>  PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
>  # Use safe cwd, avoiding unsafe import for bug #469338.
>  cd "${PORTAGE_PYM_PATH}"
> -PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
> -	exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/portageq" "$@"
> +
> +IFS=':'
> +
> +for path in ${PATH}; do

This will trigger unwanted filename expansion. For example,

  PATH='/*/bin'

will trigger '/usr/bin' rather than '/*/bin' :P.

> +	[[ -x ${path}/${scriptname} ]] || continue
> +	[[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue
> +	PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \
> +		exec "${PORTAGE_PYTHON:-/usr/bin/python}" \
> +			"${path}/${scriptname}" "$@"
> +done
> +
> +unset IFS
> +echo "${scriptname}: command not found" 1>&2
> +exit 127



-- 
Best regards,
Michał Górny