| 1 |
Author: zmedico |
| 2 |
Date: 2009-04-30 07:28:45 +0000 (Thu, 30 Apr 2009) |
| 3 |
New Revision: 13544 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/bin/ebuild.sh |
| 7 |
main/branches/2.1.6/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Bug #71646 - Don't allow the HISTFILE variable into the ebuild environment |
| 10 |
since it triggers sandbox violations. (trunk r13403) |
| 11 |
|
| 12 |
Modified: main/branches/2.1.6/bin/ebuild.sh |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.6/bin/ebuild.sh 2009-04-30 07:27:08 UTC (rev 13543) |
| 15 |
+++ main/branches/2.1.6/bin/ebuild.sh 2009-04-30 07:28:45 UTC (rev 13544) |
| 16 |
@@ -1620,7 +1620,7 @@ |
| 17 |
SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB |
| 18 |
SANDBOX_LOG SANDBOX_ON" |
| 19 |
filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS} |
| 20 |
- BASH_.* PATH POSIXLY_CORRECT" |
| 21 |
+ BASH_.* HISTFILE PATH POSIXLY_CORRECT" |
| 22 |
if hasq --filter-sandbox $* ; then |
| 23 |
filtered_vars="${filtered_vars} SANDBOX_.*" |
| 24 |
else |
| 25 |
|
| 26 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
| 27 |
=================================================================== |
| 28 |
--- main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:27:08 UTC (rev 13543) |
| 29 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2009-04-30 07:28:45 UTC (rev 13544) |
| 30 |
@@ -1127,7 +1127,7 @@ |
| 31 |
|
| 32 |
# variables that break bash |
| 33 |
_environ_filter += [ |
| 34 |
- "POSIXLY_CORRECT", |
| 35 |
+ "HISTFILE", "POSIXLY_CORRECT", |
| 36 |
] |
| 37 |
|
| 38 |
# portage config variables and variables set directly by portage |
Archives