]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/glibc/glibc-rh713134.patch
Merge remote-tracking branch 'origin/next' into thirteen
[people/teissler/ipfire-2.x.git] / src / patches / glibc / glibc-rh713134.patch
1 2011-03-18 Andreas Schwab <schwab@redhat.com>
2
3 * elf/ldd.bash.in: Never run file directly.
4
5 Index: glibc-2.12-2-gc4ccff1/elf/ldd.bash.in
6 ===================================================================
7 --- glibc-2.12-2-gc4ccff1.orig/elf/ldd.bash.in
8 +++ glibc-2.12-2-gc4ccff1/elf/ldd.bash.in
9 @@ -167,18 +167,6 @@ warning: you do not have execution permi
10 fi
11 done
12 case $ret in
13 - 0)
14 - # If the program exits with exit code 5, it means the process has been
15 - # invoked with __libc_enable_secure. Fall back to running it through
16 - # the dynamic linker.
17 - try_trace "$file"
18 - rc=$?
19 - if [ $rc = 5 ]; then
20 - try_trace "$RTLD" "$file"
21 - rc=$?
22 - fi
23 - [ $rc = 0 ] || result=1
24 - ;;
25 1)
26 # This can be a non-ELF binary or no binary at all.
27 nonelf "$file" || {
28 @@ -186,7 +174,7 @@ warning: you do not have execution permi
29 result=1
30 }
31 ;;
32 - 2)
33 + 0|2)
34 try_trace "$RTLD" "$file" || result=1
35 ;;
36 *)