From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from <gentoo-commits+bounces-411376-garchives=archives.gentoo.org@lists.gentoo.org>) id 1RdbRx-0003F2-3g for garchives@archives.gentoo.org; Thu, 22 Dec 2011 05:44:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1D23321C02D; Thu, 22 Dec 2011 05:44:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B1D2A21C02D for <gentoo-commits@lists.gentoo.org>; Thu, 22 Dec 2011 05:44:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 393C91B4021 for <gentoo-commits@lists.gentoo.org>; Thu, 22 Dec 2011 05:44:07 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 6C8D580042 for <gentoo-commits@lists.gentoo.org>; Thu, 22 Dec 2011 05:44:06 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <c3a50a9a2c8116c95c8b2f89d570a89c299ddea3.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/phase-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c3a50a9a2c8116c95c8b2f89d570a89c299ddea3 Date: Thu, 22 Dec 2011 05:44:06 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 9500270f-9c55-4e7a-9c77-dc1da22968e7 X-Archives-Hash: d8db8c334598823d3276c8d06ee7e304 commit: c3a50a9a2c8116c95c8b2f89d570a89c299ddea3 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Dec 22 05:43:51 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Dec 22 05:43:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc3a50a9a filter_readonly_variables: don't trust binpkg var --- bin/phase-functions.sh | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh index 482fd6a..7407aba 100644 --- a/bin/phase-functions.sh +++ b/bin/phase-functions.sh @@ -92,6 +92,8 @@ filter_readonly_variables() { local filtered_sandbox_vars=3D"SANDBOX_ACTIVE SANDBOX_BASHRC SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB SANDBOX_LOG SANDBOX_ON" + # Untrusted due to possible application of package renames to binpkgs + local binpkg_untrusted_vars=3D"CATEGORY P PF PN PR PV PVR" local misc_garbage_vars=3D"_portage_filter_opts" filtered_vars=3D"$readonly_bash_vars $bash_misc_vars $PORTAGE_READONLY_VARS $misc_garbage_vars" @@ -130,6 +132,8 @@ filter_readonly_variables() { ${PORTAGE_SAVED_READONLY_VARS} ${PORTAGE_MUTABLE_FILTERED_VARS} " + elif ! has --allow-extra-vars $* ; then + filtered_vars+=3D" ${binpkg_untrusted_vars}" fi =20 "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-= environment.py "${filtered_vars}" || die "filter-bash-environment.py fail= ed"