| 1 |
commit: c3a50a9a2c8116c95c8b2f89d570a89c299ddea3 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Dec 22 05:43:51 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Dec 22 05:43:51 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=c3a50a9a |
| 7 |
|
| 8 |
filter_readonly_variables: don't trust binpkg var |
| 9 |
|
| 10 |
--- |
| 11 |
bin/phase-functions.sh | 4 ++++ |
| 12 |
1 files changed, 4 insertions(+), 0 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/phase-functions.sh b/bin/phase-functions.sh |
| 15 |
index 482fd6a..7407aba 100644 |
| 16 |
--- a/bin/phase-functions.sh |
| 17 |
+++ b/bin/phase-functions.sh |
| 18 |
@@ -92,6 +92,8 @@ filter_readonly_variables() { |
| 19 |
local filtered_sandbox_vars="SANDBOX_ACTIVE SANDBOX_BASHRC |
| 20 |
SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB |
| 21 |
SANDBOX_LOG SANDBOX_ON" |
| 22 |
+ # Untrusted due to possible application of package renames to binpkgs |
| 23 |
+ local binpkg_untrusted_vars="CATEGORY P PF PN PR PV PVR" |
| 24 |
local misc_garbage_vars="_portage_filter_opts" |
| 25 |
filtered_vars="$readonly_bash_vars $bash_misc_vars |
| 26 |
$PORTAGE_READONLY_VARS $misc_garbage_vars" |
| 27 |
@@ -130,6 +132,8 @@ filter_readonly_variables() { |
| 28 |
${PORTAGE_SAVED_READONLY_VARS} |
| 29 |
${PORTAGE_MUTABLE_FILTERED_VARS} |
| 30 |
" |
| 31 |
+ elif ! has --allow-extra-vars $* ; then |
| 32 |
+ filtered_vars+=" ${binpkg_untrusted_vars}" |
| 33 |
fi |
| 34 |
|
| 35 |
"${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}"/filter-bash-environment.py "${filtered_vars}" || die "filter-bash-environment.py failed" |
Archives