From 580828183a8c888f3e5454a2171faf292d998ff4 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Mon, 11 Apr 2016 21:06:46 +1000 Subject: clarify rationale for env whitelist entries * add EDITOR, PS1, TERM for basic functionality of interactive shells * separate mxe related variables * identify source of ACLOCAL_PATH and LD_LIBRARY_PATH --- Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index edec8ad..3f846bf 100644 --- a/Makefile +++ b/Makefile @@ -155,8 +155,15 @@ endef PRELOAD_VARS := LD_PRELOAD DYLD_FORCE_FLAT_NAMESPACE DYLD_INSERT_LIBRARIES # use a minimal whitelist of safe environment variables -# HOME is needed for ~/.gitconfig for patch-tool-mxe -ENV_WHITELIST := PATH HOME LANG MAKE% MXE% %PROXY %proxy LD_LIBRARY_PATH $(PRELOAD_VARS) ACLOCAL_PATH +# basic working shell environment and mxe variables +# see http://www.linuxfromscratch.org/lfs/view/stable/chapter04/settingenvironment.html +ENV_WHITELIST := EDITOR HOME LANG PATH %PROXY %proxy PS1 TERM +ENV_WHITELIST += MAKE% MXE% $(PRELOAD_VARS) + +# OS/Distro related issues - "unsafe" but practical +# 1. https://github.com/mxe/mxe/issues/697 +ENV_WHITELIST += ACLOCAL_PATH LD_LIBRARY_PATH + unexport $(filter-out $(ENV_WHITELIST),$(shell env | cut -d '=' -f1)) # disable wine with readonly directory (created by mxe-conf) -- cgit v0.12