From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 30 Apr 2009 07:28:45 +0000 (-0000)
Subject: Bug #71646 - Don't allow the HISTFILE variable into the ebuild environment
X-Git-Tag: v2.1.6.12~29
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=dd20d4a65f44188b1e5ea5bb17f1766b56a5d4d7;p=portage.git

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 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 b8d952e62..6ed19bb78 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