r5582 - in glibc-package/trunk/debian: . patches/all
Author: aurel32
Date: 2013-05-11 16:02:35 +0000 (Sat, 11 May 2013)
New Revision: 5582
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/all/local-ldd.diff
Log:
* patches/all/local-ldd.diff: check if the dynamic linker works before
using it. Closes: #631242, #707091.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2013-05-11 14:56:01 UTC (rev 5581)
+++ glibc-package/trunk/debian/changelog 2013-05-11 16:02:35 UTC (rev 5582)
@@ -24,6 +24,8 @@
* patches/any/local-missing-linux_types.h.diff: Drop, not need anymore.
* local/manpages/ld.so.8: drop --ignore-rpath documentation. Closes:
#707802.
+ * patches/all/local-ldd.diff: check if the dynamic linker works before
+ using it. Closes: #631242, #707091.
[ Petr Salinger ]
* patches/kfreebsd/local-linuxthreads-initfini.diff: follow upstream
Modified: glibc-package/trunk/debian/patches/all/local-ldd.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/local-ldd.diff 2013-05-11 14:56:01 UTC (rev 5581)
+++ glibc-package/trunk/debian/patches/all/local-ldd.diff 2013-05-11 16:02:35 UTC (rev 5582)
@@ -10,7 +10,7 @@
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
-@@ -152,8 +152,6 @@
+@@ -151,12 +152,11 @@
echo "ldd: ${file}:" $"not regular file" >&2
result=1
elif test -r "$file"; then
@@ -19,7 +19,13 @@
RTLD=
ret=1
for rtld in ${RTLDLIST}; do
-@@ -166,28 +164,16 @@
+- if test -x $rtld; then
++ dummy=`$rtld 2>&1`
++ if test $? = 127; then
+ verify_out=`${rtld} --verify "$file"`
+ ret=$?
+ case $ret in
+@@ -165,17 +165,8 @@
fi
done
case $ret in
@@ -37,11 +43,9 @@
+ 0|2)
+ try_trace "$RTLD" "$file" || result=1
;;
-- 1)
-+ 1|126)
+ 1)
# This can be a non-ELF binary or no binary at all.
- nonelf "$file" || {
- echo $" not a dynamic executable"
+@@ -184,9 +175,6 @@
result=1
}
;;
Reply to: