diff options
author | 2005-06-13 04:22:03 +0000 | |
---|---|---|
committer | 2005-06-13 04:22:03 +0000 | |
commit | e7bc042a91d3e8c98b4b6b65488afa0e47acc2c5 (patch) | |
tree | 0d0492a64dbc562e5e00dcd67aa42369ecffb219 | |
parent | update ROOT description and move single definition to make.conf.5 #90632 (diff) | |
download | portage-cvs-e7bc042a91d3e8c98b4b6b65488afa0e47acc2c5.tar.gz portage-cvs-e7bc042a91d3e8c98b4b6b65488afa0e47acc2c5.tar.bz2 portage-cvs-e7bc042a91d3e8c98b4b6b65488afa0e47acc2c5.zip |
use %p instead of %F for outputting stuff from scanelf
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | bin/ebuild.sh | 20 |
2 files changed, 15 insertions, 11 deletions
@@ -1,12 +1,16 @@ # ChangeLog for Portage; the Gentoo Linux ports system # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Id: ChangeLog,v 1.796.2.132 2005/05/29 12:40:07 jstubbs Exp $ +# $Id: ChangeLog,v 1.796.2.133 2005/06/13 04:22:03 vapier Exp $ MAJOR CHANGES in 2.0.51: 1. /var/cache/edb/virtuals is no longer used at all. It's calculated now. 2. /var/cache/edb/world is now /var/lib/portage/world. 3. /etc/portage/profile/virtuals is _USER_ configs only. + 13 Jun 2005; Mike Frysinger <vapier@gentoo.org> bin/ebuild.sh: + Use the %p output modifier instead of %F so we don't have to update the + output by removing all the $D references. + 29 May 2005; Jason Stubbs <jstubbs@gentoo.org> bin/ebuild.sh: Made /etc/profile.env sourced regardless of USERLAND. Made copying of config.sub and config.guess --force'd as they are sometimes u-w. Replaced a if/else of diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 5c3c058..86930b9 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.35 2005/05/31 22:44:50 vapier Exp $ +# $Header: /local/data/ulm/cvs/history/var/cvsroot/gentoo-src/portage/bin/ebuild.sh,v 1.201.2.36 2005/06/13 04:22:03 vapier Exp $ export SANDBOX_PREDICT="${SANDBOX_PREDICT}:/proc/self/maps:/dev/console:/usr/lib/portage/pym:/dev/random" export SANDBOX_WRITE="${SANDBOX_WRITE}:/dev/shm:${PORTAGE_TMPDIR}" @@ -1020,26 +1020,26 @@ dyn_install() { if type -p scanelf > /dev/null ; then # Make sure we disallow insecure RUNPATH/RPATH's - f=$(scanelf -qyRF '%r %F' "${D}" | sed -e "s:${D}::" | grep "${BUILDDIR}") + f=$(scanelf -qyRF '%r %p' "${D}" | grep "${BUILDDIR}") if [[ -n ${f} ]] ; then echo -ne '\a\n' echo "QA Notice: the following files contain insecure RUNPATH's" echo " Please file a bug about this at http://bugs.gentoo.org/" echo " For more information on this issue, kindly review:" echo " http://bugs.gentoo.org/81745" - echo "${f//${D}\/}" + echo "${f}" echo -ne '\a\n' die "Insecure binaries detected" fi # Check for setid binaries but are not built with BIND_NOW - f=$(scanelf -qyRF '%b %F' "${D}") + f=$(scanelf -qyRF '%b %p' "${D}") if [[ -n ${f} ]] ; then echo -ne '\a\n' echo "QA Notice: the following files are setXid, dyn linked, and using lazy bindings" echo " This combination is generally discouraged. Try re-emerging the package:" echo " LDFLAGS='-Wl,-z,now' emerge ${PN}" - echo "${f//${D}\/}" + echo "${f}" echo -ne '\a\n' [[ ${FEATURES/stricter} != "${FEATURES}" ]] \ && die "Aborting due to lazy bindings" @@ -1047,7 +1047,7 @@ dyn_install() { fi # TEXTREL's are baaaaaaaad - f=$(scanelf -qyRF '%t %F' "${D}") + f=$(scanelf -qyRF '%t %p' "${D}") if [[ -n ${f} ]] ; then echo -ne '\a\n' echo "QA Notice: the following files contain runtime text relocations" @@ -1056,7 +1056,7 @@ dyn_install() { echo " and might not function properly on other architectures hppa for example." echo " If you are a programmer please take a closer look at this package and" echo " consider writing a patch which addresses this problem." - echo "${f//${D}\/}" + echo "${f}" echo -ne '\a\n' [[ ${FEATURES/stricter} != "${FEATURES}" ]] \ && die "Aborting due to textrels" @@ -1064,14 +1064,14 @@ dyn_install() { fi # Check for files with executable stacks - f=$(scanelf -qyRF '%e %F' "${D}") + f=$(scanelf -qyRF '%e %p' "${D}") if [[ -n ${f} ]] ; then echo -ne '\a\n' echo "QA Notice: the following files contain executable stacks" echo " Files with executable stacks will not work properly (or at all!)" echo " on some architectures/operating systems. A bug should be filed" echo " at http://bugs.gentoo.org/ to make sure the file is fixed." - echo "${f//${D}\/}" + echo "${f}" echo -ne '\a\n' [[ ${FEATURES/stricter} != "${FEATURES}" ]] \ && die "Aborting due to +x stack" @@ -1079,7 +1079,7 @@ dyn_install() { fi # Save NEEDED information - scanelf -qyRF '%F %n' "${D}" | sed -e "s:${D}::g" > "${BUILDDIR}"/build-info/NEEDED + scanelf -qyRF '%p %n' "${D}" | sed -e 's:^:/:' > "${BUILDDIR}"/build-info/NEEDED fi if [[ ${UNSAFE} > 0 ]] ; then |