Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13403 - in main/trunk: bin pym/portage
Date: Tue, 28 Apr 2009 06:34:59
Message-Id: E1Lygu8-0000qF-A2@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-04-28 06:34:55 +0000 (Tue, 28 Apr 2009)
3 New Revision: 13403
4
5 Modified:
6 main/trunk/bin/ebuild.sh
7 main/trunk/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.
11
12
13 Modified: main/trunk/bin/ebuild.sh
14 ===================================================================
15 --- main/trunk/bin/ebuild.sh 2009-04-27 03:24:51 UTC (rev 13402)
16 +++ main/trunk/bin/ebuild.sh 2009-04-28 06:34:55 UTC (rev 13403)
17 @@ -1620,7 +1620,7 @@
18 SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
19 SANDBOX_LOG SANDBOX_ON"
20 filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS}
21 - BASH_.* PATH POSIXLY_CORRECT"
22 + BASH_.* HISTFILE PATH POSIXLY_CORRECT"
23 if hasq --filter-sandbox $* ; then
24 filtered_vars="${filtered_vars} SANDBOX_.*"
25 else
26
27 Modified: main/trunk/pym/portage/__init__.py
28 ===================================================================
29 --- main/trunk/pym/portage/__init__.py 2009-04-27 03:24:51 UTC (rev 13402)
30 +++ main/trunk/pym/portage/__init__.py 2009-04-28 06:34:55 UTC (rev 13403)
31 @@ -1127,7 +1127,7 @@
32
33 # variables that break bash
34 _environ_filter += [
35 - "POSIXLY_CORRECT",
36 + "HISTFILE", "POSIXLY_CORRECT",
37 ]
38
39 # portage config variables and variables set directly by portage