Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH v2] profiles/base: Set initial ENV_UNSET (EAPI 7)
Date: Thu, 03 May 2018 07:39:27
Message-Id: 20180503073909.10001-1-mgorny@gentoo.org
1 Now that EAPI 7 is accepted and implemented in Portage, provide
2 the initial environment blacklist for coming EAPI 7 ebuilds. The list
3 is based on existing eclasses, xdg-utils mostly. Rationale is provided
4 in the comment above ENV_UNSET.
5 ---
6 profiles/base/make.defaults | 12 ++++++++++++
7 1 file changed, 12 insertions(+)
8
9 diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
10 index bd038bebf167..cbc527e954e5 100644
11 --- a/profiles/base/make.defaults
12 +++ b/profiles/base/make.defaults
13 @@ -22,6 +22,18 @@ USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_PPC ABI_S390 ABI_X86 CPU_F
14 CONFIG_PROTECT="/etc"
15 CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf"
16
17 +# EAPI 7 environment variable blacklist.
18 +#
19 +# DBUS_SESSION_BUS_ADDRESS to avoid trying to access the user's session
20 +# bus.
21 +#
22 +# DISPLAY and XAUTHORITY to avoid trying to access the user's X11.
23 +#
24 +# XDG_* since the values coming from user environment can collide with
25 +# ebuild-set ${HOME} (e.g. by referring to user's home directory).
26 +# We exclude XDG_DATA_DIRS & XDG_CONFIG_DIRS as those are set in env.d.
27 +ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY XAUTHORITY XDG_CACHE_HOME XDG_CONFIG_HOME XDG_DATA_HOME XDG_RUNTIME_DIR"
28 +
29 # Variables that are set exclusively by the profile
30 # and not by user configuration files.
31 PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND"
32 --
33 2.17.0