I made a pass over what's in environment.bz2 and unset all that look

like they should never ever be initialised like they are saved on the
target system (e.g. non-matching prefix), and those that just could leak
some information you don't want to be leaked in a paranoia mood.

svn path=/main/branches/prefix/; revision=8530

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 99099c0a07f4df9ec9fdd2ceacc669e4e8e73a12..2a083bb8a3d7948957da937a6a0865131be21196 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1405,6 +1405,30 @@ save_ebuild_env() {
                        newpdepend do_newdepend remove_path_entry killparent \
                        save_ebuild_env
 
+               # These better not be used on a different system
+               unset -f BASH BUILD_PREFIX D DEFAULT_PATH DISTCC_DIR DISTDIR \
+                       EBUILD ECLASSDIR ED EPATCH_SOURCE EPREFIX EROOT \
+                       FETCH_COMMAND FILESDIR HOME HOSTTYPE INFOPATH INPUT_DEVICES \
+                       LCD_DEVICES LESS LESSOPEN MACHTYPE MAKEOPTS MANPATH O PAGER \
+                       PATH PKGDIR PKG_LOGDIR PKG_TMPDIR PORTAGE_ACTUAL_DISTDIR \
+                       PORTAGE_BASHRC PORTAGE_BINPKG_TMPFILE PORTAGE_BIN_PATH \
+                       PORTAGE_BUILDDIR PORTAGE_DEPCACHEDIR PORTAGE_ELOG_CLASSES \
+                       PORTAGE_ELOG_MAILSUBJECT PORTAGE_ELOG_SYSTEM PORTAGE_LOG_FILE \
+                       PORTAGE_PYM_PATH PORTAGE_TMPDIR PORTDIR PROFILE_PATHS \
+                       PWORKDIR PYTHONPATH RESUMECOMMAND ROOT ROOTPATH \
+                       SANDBOX_DISABLED SANDBOX_LOG SANDBOX_ON SANDBOX_PREDICT \
+                       STARTDIR TMP TMPDIR USE_ORDER USE_ORDER
+
+               # Some paranoia filters
+               unset -f CVS_RSH EUID GCC_SPECS GENTOO_MIRRORS HOSTNAME OLDPWD \
+                       PORTAGE_ARCHLIST PORTAGE_ELOG_MAILFROM PORTAGE_ELOG_MAILURI \
+                       PORTAGE_GID PORTAGE_GROUP PORTAGE_INST_GID PORTAGE_INST_UID \
+                       PORTAGE_RSYNC_OPTS PORTAGE_USER PWD SHELL SHELLOPTS SYNC \
+                       TERM UID dir srcdir STY SSH_AGENT_PID TERM_PROGRAM HOST \
+                       TERM_PROGRAM_VERSION GROUP USER SSH_AUTH_SOCK \
+                       __CF_USER_TEXT_ENCODING ECHANGELOG_USER TERMINFO VENDOR \
+                       LOGNAME DISPLAY SECURITYSESSIONID REMOTEHOST LS_COLORS MAIL
+
                set
                export
        ) | egrep -v -e "${var_grep}"