From 83373898865daff020b5fd80df57ec7b75e09f70 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 7 Jun 2009 06:40:12 +0000 Subject: [PATCH] Merged from trunk -r13625:13628 | 13626 | Bug #268929 - Add grep for 'dereferencing pointer' messages | | zmedico | produced by gcc 4.4. Thanks to ABCD for | | | this patch. | | 13627 | drop sandbox settings that sandbox itself takes care of | | SpankMan | #258684 | | 13628 | Make usev() strip ! prefix in echoed output as specified in | | zmedico | bug #270658, comment #16. | svn path=/main/branches/prefix/; revision=13629 --- bin/ebuild.sh | 13 +++++-------- bin/misc-functions.sh | 1 + 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 621e408f3..91a0ae51f 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -6,9 +6,6 @@ PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-@PORTAGE_BASE@/bin}" PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-@PORTAGE_BASE@/pym}" -export SANDBOX_PREDICT="${SANDBOX_PREDICT:+${SANDBOX_PREDICT}:}/proc/self/maps:/dev/console:/dev/random" -export SANDBOX_WRITE="${SANDBOX_WRITE:+${SANDBOX_WRITE}:}/dev/shm:/dev/stdout:/dev/stderr:${PORTAGE_TMPDIR}" -export SANDBOX_READ="${SANDBOX_READ:+${SANDBOX_READ}:}/:/dev/shm:/dev/stdin:${PORTAGE_TMPDIR}" # Don't use sandbox's BASH_ENV for new shells because it does # 'source /etc/profile' which can interfere with the build # environment by modifying our PATH. @@ -21,10 +18,6 @@ if [ -n "${PORTAGE_ROOTPATH}" ] ; then unset PORTAGE_ROOTPATH fi -if [ ! -z "${PORTAGE_GPG_DIR}" ]; then - SANDBOX_PREDICT="${SANDBOX_PREDICT}:${PORTAGE_GPG_DIR}" -fi - # These two functions wrap sourcing and calling respectively. At present they # perform a qa check to make sure eclasses and ebuilds and profiles don't mess # with shell opts (shopts). Ebuilds/eclasses changing shopts should reset them @@ -107,6 +100,10 @@ addwrite() { _sb_append_var WRITE "$@" ; } adddeny() { _sb_append_var DENY "$@" ; } addpredict() { _sb_append_var PREDICT "$@" ; } +addwrite "${PORTAGE_TMPDIR}" +addread "/:${PORTAGE_TMPDIR}" +[[ -n ${PORTAGE_GPG_DIR} ]] && addpredict "${PORTAGE_GPG_DIR}" + lchown() { chown -h "$@" } @@ -127,7 +124,7 @@ use() { usev() { if useq ${1}; then - echo "${1}" + echo "${1#!}" return 0 fi return 1 diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh index f97efbce8..10a1a730e 100644 --- a/bin/misc-functions.sh +++ b/bin/misc-functions.sh @@ -482,6 +482,7 @@ install_qa_check() { if [[ -n ${PORTAGE_LOG_FILE} && -r ${PORTAGE_LOG_FILE} ]] ; then local m msgs=( ": warning: dereferencing type-punned pointer will break strict-aliasing rules$" + ": warning: dereferencing pointer .* does break strict-aliasing rules$" ": warning: implicit declaration of function " ": warning: incompatible implicit declaration of built-in function " ": warning: is used uninitialized in this function$" # we'll ignore "may" and "might" -- 2.26.2