--- misc-functions.sh.orig 2006-04-30 12:07:09.000000000 +0200 +++ misc-functions.sh 2006-05-02 11:45:36.000000000 +0200 @@ -88,14 +88,16 @@ qa_var="QA_TEXTRELS_${ARCH}" [[ -n ${!qa_var} ]] && QA_TEXTRELS=${!qa_var} [[ -n ${QA_STRICT_TEXTRELS} ]] && QA_TEXTRELS="" - f=$(scanelf -qyRF '%t %p' "${D}" | grep -v ' usr/lib/debug/' | \ - gawk ' - BEGIN { split("'"${QA_TEXTRELS}"'", ignore); } - { for (idx in ignore) - if ($NF ~ "^"ignore[idx]"$") - next; - print; - }') + f="" + while read s; do + sf=( ${s} ) + for t in ${QA_TEXTRELS}; do + [[ ${sf[1]} =~ "^${t}$" ]] && continue 2 + done + f="${f}${s}\n" + done < "${T}"/scanelf-textrel.log echo -ne '\a\n' @@ -107,7 +109,7 @@ echo " For more information, see http://hardened.gentoo.org/pic-fix-guide.xml" echo " Please include this file in your report:" echo " ${T}/scanelf-textrel.log" - echo "${f}" + printf "${f}" echo -ne '\a\n' die_msg="${die_msg} textrels," sleep 1 @@ -130,14 +132,16 @@ qa_var="QA_EXECSTACK_${ARCH}" [[ -n ${!qa_var} ]] && QA_EXECSTACK=${!qa_var} [[ -n ${QA_STRICT_EXECSTACK} ]] && QA_EXECSTACK="" - f=$(scanelf -qyRF '%e %p' "${D}" | grep -v ' usr/lib/debug/' | \ - gawk ' - BEGIN { split("'"${QA_EXECSTACK}"'", ignore); } - { for (idx in ignore) - if ($NF ~ "^"ignore[idx]"$") - next; - print; - }') + f="" + while read s; do + sf=( ${s} ) + for e in ${QA_EXECSTACK}; do + [[ ${sf[3]} =~ "^${e}$" ]] && continue 2 + done + f="${f}${s}\n" + done <