summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-04-28 06:34:55 +0000
committerZac Medico <zmedico@gentoo.org>2009-04-28 06:34:55 +0000
commitcb0d2d041ca677b5a0f8938bca741e20c1e3c27a (patch)
treeea0738489b67893c5f9f506ba0acd842064f3778
parentc3be57994f9edb6b8a4af16dbcafe9da3cc3b68b (diff)
downloadportage-cb0d2d041ca677b5a0f8938bca741e20c1e3c27a.tar.gz
portage-cb0d2d041ca677b5a0f8938bca741e20c1e3c27a.tar.bz2
portage-cb0d2d041ca677b5a0f8938bca741e20c1e3c27a.zip
Bug #71646 - Don't allow the HISTFILE variable into the ebuild environment
since it triggers sandbox violations. svn path=/main/trunk/; revision=13403
-rwxr-xr-xbin/ebuild.sh2
-rw-r--r--pym/portage/__init__.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9cbd748e6..83e79e818 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1620,7 +1620,7 @@ filter_readonly_variables() {
SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
SANDBOX_LOG SANDBOX_ON"
filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS}
- BASH_.* PATH POSIXLY_CORRECT"
+ BASH_.* HISTFILE PATH POSIXLY_CORRECT"
if hasq --filter-sandbox $* ; then
filtered_vars="${filtered_vars} SANDBOX_.*"
else
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4bb2513ae..ea04d5e87 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1127,7 +1127,7 @@ class config(object):
# variables that break bash
_environ_filter += [
- "POSIXLY_CORRECT",
+ "HISTFILE", "POSIXLY_CORRECT",
]
# portage config variables and variables set directly by portage