Bug #71646 - Don't allow the HISTFILE variable into the ebuild environment

since it triggers sandbox violations. (trunk r13403)

svn path=/main/branches/2.1.6/; revision=13544

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9cbd748e6743a731cfeebc93254c80c16f0d9b69..83e79e81866a65ad1f20741fef4a8157b53f14e2 100755 (executable)
--- 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 b8d952e625f4bba72358d1b87e68d5f339f8e4f3..6ed19bb78bfb9ff7f5984f63c5e75241a9f1588b 100644 (file)
--- 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