sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

brp-verify_elf, verify-elf: simplify VERIFY_ELF_* parameter passing

Browse Source
This commit is contained in:
Alexey Tourbin 2009-12-18 22:55:46 +03:00
parent f82116d5f9
commit e6683d0de4
2 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
scripts/brp-verify_elf.in
View File

@ -34,42 +34,25 @@ export VERIFY_ELF_UNRESOLVED=normal
for t in `printf %s "$RPM_VERIFY_ELF_METHOD" |tr , ' '`; do for t in `printf %s "$RPM_VERIFY_ELF_METHOD" |tr , ' '`; do
case "$t" in case "$t" in
no|none|skip) no|none|skip)
Info 'ELF verification disabled'
exit 0 exit 0
;; ;;
arch) arch=?*)
VERIFY_ELF_ARCH=normal
;;
arch=*)
VERIFY_ELF_ARCH="${t#arch=}" VERIFY_ELF_ARCH="${t#arch=}"
;; ;;
fhs) fhs=?*)
VERIFY_ELF_FHS=normal
;;
fhs=*)
VERIFY_ELF_FHS="${t#fhs=}" VERIFY_ELF_FHS="${t#fhs=}"
;; ;;
rpath) rpath=?*)
VERIFY_ELF_RPATH=normal
;;
rpath=*)
VERIFY_ELF_RPATH="${t#rpath=}" VERIFY_ELF_RPATH="${t#rpath=}"
;; ;;
stack) stack=?*)
VERIFY_ELF_STACK=normal
;;
stack=*)
VERIFY_ELF_STACK="${t#stack=}" VERIFY_ELF_STACK="${t#stack=}"
;; ;;
textrel) textrel=?*)
VERIFY_ELF_TEXTREL=normal
;;
textrel=*)
VERIFY_ELF_TEXTREL="${t#textrel=}" VERIFY_ELF_TEXTREL="${t#textrel=}"
;; ;;
unresolved) unresolved=?*)
VERIFY_ELF_UNRESOLVED=normal
;;
unresolved=*)
VERIFY_ELF_UNRESOLVED="${t#unresolved=}" VERIFY_ELF_UNRESOLVED="${t#unresolved=}"
;; ;;
normal) normal)
@ -106,19 +89,6 @@ done
[ -z "$RPM_TARGET_ARCH" -o -n "${RPM_TARGET_ARCH##arm*}" ] || [ -z "$RPM_TARGET_ARCH" -o -n "${RPM_TARGET_ARCH##arm*}" ] ||
VERIFY_ELF_STACK=no VERIFY_ELF_STACK=no
[ "$VERIFY_ELF_ARCH" != no ] || VERIFY_ELF_ARCH=
[ -z "$RPM_VERIFY_ELF_ARCH" ] || VERIFY_ELF_ARCH="$RPM_VERIFY_ELF_ARCH"
[ "$VERIFY_ELF_FHS" != no ] || VERIFY_ELF_FHS=
[ -z "$RPM_VERIFY_ELF_FHS" ] || VERIFY_ELF_FHS="$RPM_VERIFY_ELF_FHS"
[ "$VERIFY_ELF_RPATH" != no ] || VERIFY_ELF_RPATH=
[ -z "$RPM_VERIFY_ELF_RPATH" ] || VERIFY_ELF_RPATH="$RPM_VERIFY_ELF_RPATH"
[ "$VERIFY_ELF_STACK" != no ] || VERIFY_ELF_STACK=
[ -z "$RPM_VERIFY_ELF_STACK" ] || VERIFY_ELF_STACK="$RPM_VERIFY_ELF_STACK"
[ "$VERIFY_ELF_TEXTREL" != no ] || VERIFY_ELF_TEXTREL=
[ -z "$RPM_VERIFY_ELF_TEXTREL" ] || VERIFY_ELF_TEXTREL="$RPM_VERIFY_ELF_TEXTREL"
[ "$VERIFY_ELF_UNRESOLVED" != no ] || VERIFY_ELF_UNRESOLVED=
[ -z "$RPM_VERIFY_ELF_UNRESOLVED" ] || VERIFY_ELF_UNRESOLVED="$RPM_VERIFY_ELF_UNRESOLVED"
: ${RPM_VERIFY_ELF_TOPDIR:=} : ${RPM_VERIFY_ELF_TOPDIR:=}
: ${RPM_VERIFY_ELF_SKIPLIST:=} : ${RPM_VERIFY_ELF_SKIPLIST:=}
[ -d "$RPM_BUILD_ROOT$RPM_VERIFY_ELF_TOPDIR" ] || exit 0 [ -d "$RPM_BUILD_ROOT$RPM_VERIFY_ELF_TOPDIR" ] || exit 0

12
scripts/verify-elf.in
View File

@ -57,19 +57,19 @@ VerifyELF()
fname="${f#$RPM_BUILD_ROOT}" fname="${f#$RPM_BUILD_ROOT}"
fname="${fname#.}" fname="${fname#.}"
if [ -n "$VERIFY_ELF_ARCH" -a "$RPM_TARGET_ARCH" = noarch ]; then if [ "${VERIFY_ELF_ARCH:=normal}" != no ] && [ "$RPM_TARGET_ARCH" = noarch ]; then
[ "$VERIFY_ELF_ARCH" = relaxed ] && prefix=WARNING || prefix=ERROR [ "$VERIFY_ELF_ARCH" = relaxed ] && prefix=WARNING || prefix=ERROR
[ "$VERIFY_ELF_ARCH" = relaxed ] || rc=1 [ "$VERIFY_ELF_ARCH" = relaxed ] || rc=1
Info "$prefix: $f: ELF object for \"$RPM_TARGET_ARCH\" architecture" Info "$prefix: $f: ELF object for \"$RPM_TARGET_ARCH\" architecture"
fi fi
if [ -n "$VERIFY_ELF_FHS" ] && [ -z "${fname##/usr/share/*}" -o -z "${fname##/etc/*}" ]; then if [ "${VERIFY_ELF_FHS:=normal}" != no ] && [ -z "${fname##/usr/share/*}" -o -z "${fname##/etc/*}" ]; then
[ "$VERIFY_ELF_FHS" = relaxed ] && prefix=WARNING || prefix=ERROR [ "$VERIFY_ELF_FHS" = relaxed ] && prefix=WARNING || prefix=ERROR
[ "$VERIFY_ELF_FHS" = relaxed ] || rc=1 [ "$VERIFY_ELF_FHS" = relaxed ] || rc=1
Info "$prefix: $f: ELF object out of allowed directory tree" Info "$prefix: $f: ELF object out of allowed directory tree"
fi fi
if [ -n "$VERIFY_ELF_RPATH" ]; then if [ "${VERIFY_ELF_RPATH:=normal}" != no ]; then
rpath="$(printf %s "$objdump_info" |awk '{if ($1=="RPATH") print $2}')" rpath="$(printf %s "$objdump_info" |awk '{if ($1=="RPATH") print $2}')"
if [ -n "$rpath" ]; then if [ -n "$rpath" ]; then
prefix= prefix=
@ -106,7 +106,7 @@ VerifyELF()
fi fi
fi fi
if [ -n "$VERIFY_ELF_STACK" ]; then if [ "${VERIFY_ELF_STACK:=normal}" != no ]; then
if [ -z "${t##*ELF* executable*}" -o -z "${t##*ELF* shared object*}" ]; then if [ -z "${t##*ELF* executable*}" -o -z "${t##*ELF* shared object*}" ]; then
stack="$(printf %s "$objdump_info" |sed -ne 's/^[[:space:]]*STACK[[:space:]]\+\([^[:space:]]\+\).*/\1/p')" stack="$(printf %s "$objdump_info" |sed -ne 's/^[[:space:]]*STACK[[:space:]]\+\([^[:space:]]\+\).*/\1/p')"
if [ -z "$stack" ]; then if [ -z "$stack" ]; then
@ -122,7 +122,7 @@ VerifyELF()
fi fi
fi fi
if [ -n "$VERIFY_ELF_TEXTREL" ]; then if [ "${VERIFY_ELF_TEXTREL:=normal}" != no ]; then
textrel="$(printf %s "$objdump_info" |sed -ne 's/^[[:space:]]*TEXTREL[[:space:]]\+\([^[:space:]]\+\).*/\1/p')" textrel="$(printf %s "$objdump_info" |sed -ne 's/^[[:space:]]*TEXTREL[[:space:]]\+\([^[:space:]]\+\).*/\1/p')"
if [ -n "$textrel" ]; then if [ -n "$textrel" ]; then
[ "$VERIFY_ELF_TEXTREL" = relaxed ] && prefix=WARNING || prefix=ERROR [ "$VERIFY_ELF_TEXTREL" = relaxed ] && prefix=WARNING || prefix=ERROR
@ -131,7 +131,7 @@ VerifyELF()
fi fi
fi fi
if [ -n "$VERIFY_ELF_UNRESOLVED" ]; then if [ "${VERIFY_ELF_UNRESOLVED:=normal}" != no ]; then
while [ -z "${t##*ELF* executable*dynamically linked*}" -o -z "${t##*ELF* shared object*}" ]; do while [ -z "${t##*ELF* executable*dynamically linked*}" -o -z "${t##*ELF* shared object*}" ]; do
rpath="$(printf %s "$objdump_info" |awk '{if ($1=="RPATH") print $2}' |tr -s : ' ' |sed -e "s|\$ORIGIN|${fname%/*}|g")" rpath="$(printf %s "$objdump_info" |awk '{if ($1=="RPATH") print $2}' |tr -s : ' ' |sed -e "s|\$ORIGIN|${fname%/*}|g")"
if [ -n "$rpath" ]; then if [ -n "$rpath" ]; then