| 1 |
Author: grobian |
| 2 |
Date: 2008-09-10 08:33:53 +0000 (Wed, 10 Sep 2008) |
| 3 |
New Revision: 11499 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/bin/misc-functions.sh |
| 7 |
Log: |
| 8 |
Merged from trunk -r11496:11498 |
| 9 |
|
| 10 |
| 11497 | In the ignored LDFLAGS check, filter out anything under | |
| 11 |
| zmedico | /usr/lib/debug/ in order to avoid duplicate warnings for | |
| 12 |
| | splitdebug files. Thanks to Cardoe for the suggestion. | |
| 13 |
|
| 14 |
| 11498 | Don't mention log files in $T for eqawarn messages since the | |
| 15 |
| zmedico | logs are likely to get removed and the user can just use the | |
| 16 |
| | log from elog anyway. Thanks to Jeremy Olexa <darkside@g.o> | |
| 17 |
| | for the suggestion. | |
| 18 |
|
| 19 |
|
| 20 |
Modified: main/branches/prefix/bin/misc-functions.sh |
| 21 |
=================================================================== |
| 22 |
--- main/branches/prefix/bin/misc-functions.sh 2008-09-06 22:57:28 UTC (rev 11498) |
| 23 |
+++ main/branches/prefix/bin/misc-functions.sh 2008-09-10 08:33:53 UTC (rev 11499) |
| 24 |
@@ -106,8 +106,7 @@ |
| 25 |
eqawarn " risk. On some architectures, the code may not even function" |
| 26 |
eqawarn " properly, if at all." |
| 27 |
eqawarn " For more information, see http://hardened.gentoo.org/pic-fix-guide.xml" |
| 28 |
- eqawarn " Please include this file in your report:" |
| 29 |
- eqawarn " ${T}/scanelf-textrel.log" |
| 30 |
+ eqawarn " Please include the following list of files in your report:" |
| 31 |
eqawarn "${f}" |
| 32 |
vecho -ne '\a\n' |
| 33 |
die_msg="${die_msg} textrels," |
| 34 |
@@ -151,8 +150,7 @@ |
| 35 |
eqawarn " on some architectures/operating systems. A bug should be filed" |
| 36 |
eqawarn " at http://bugs.gentoo.org/ to make sure the file is fixed." |
| 37 |
eqawarn " For more information, see http://hardened.gentoo.org/gnu-stack.xml" |
| 38 |
- eqawarn " Please include this file in your report:" |
| 39 |
- eqawarn " ${T}/scanelf-execstack.log" |
| 40 |
+ eqawarn " Please include the following list of files in your report:" |
| 41 |
eqawarn "${f}" |
| 42 |
vecho -ne '\a\n' |
| 43 |
die_msg="${die_msg} execstacks" |
| 44 |
@@ -179,13 +177,15 @@ |
| 45 |
set -${shopts} |
| 46 |
fi |
| 47 |
fi |
| 48 |
- sed -e "/^\$/d" -e "s#^#/#" -i "${T}"/scanelf-ignored-LDFLAGS.log |
| 49 |
+ # Filter anything under /usr/lib/debug/ in order to avoid |
| 50 |
+ # duplicate warnings for splitdebug files. |
| 51 |
+ sed -e "s#^usr/lib/debug/.*##" -e "/^\$/d" -e "s#^#/#" \ |
| 52 |
+ -i "${T}"/scanelf-ignored-LDFLAGS.log |
| 53 |
f=$(<"${T}"/scanelf-ignored-LDFLAGS.log) |
| 54 |
if [[ -n ${f} ]] ; then |
| 55 |
vecho -ne '\a\n' |
| 56 |
eqawarn "${BAD}QA Notice: Files built without respecting LDFLAGS have been detected${NORMAL}" |
| 57 |
- eqawarn " Please include this file in your report:" |
| 58 |
- eqawarn " ${T}/scanelf-ignored-LDFLAGS.log" |
| 59 |
+ eqawarn " Please include the following list of files in your report:" |
| 60 |
eqawarn "${f}" |
| 61 |
vecho -ne '\a\n' |
| 62 |
sleep 1 |
Archives