r2112 - in glibc-package/trunk/debian: . patches/any
Author: aurel32
Date: 2007-04-22 13:03:02 +0000 (Sun, 22 Apr 2007)
New Revision: 2112
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/any/local-ldd.diff
Log:
* debian/patches/any/local-ldd.diff: update to discard the error message
that appears if one of the dynamic loader is not supported by the
kernel. Closes: #263494.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-04-22 10:36:40 UTC (rev 2111)
+++ glibc-package/trunk/debian/changelog 2007-04-22 13:03:02 UTC (rev 2112)
@@ -27,8 +27,11 @@
charset alias. patches/any/submitted-iconv-colon.diff: new patch to
allow colons in charset names. Closes: #91935.
* New Hungarian debconf translation, by Attila Szervác. Closes: #420420.
+ * debian/patches/any/local-ldd.diff: update to discard the error message
+ that appears if one of the dynamic loader is not supported by the
+ kernel. Closes: #263494.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 22 Apr 2007 12:34:39 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 22 Apr 2007 15:02:00 +0200
glibc (2.5-3) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/any/local-ldd.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-ldd.diff 2007-04-22 10:36:40 UTC (rev 2111)
+++ glibc-package/trunk/debian/patches/any/local-ldd.diff 2007-04-22 13:03:02 UTC (rev 2112)
@@ -1,8 +1,8 @@
# All lines beginning with `# DP:' are a description of the patch.
-# DP: Make ldd handle non-executable shared objects
-# DP:
+# DP: Make ldd handle non-executable shared objects. Discard the error
+# DP: message if the kernel does not support one of the dynamic loaders.
# DP: Updated by gotom, it's nice to merge to the upstream after my review.
-# Date: (Updated 2004-01-02 gotom)
+# Date: (Updated 2007-04-22 aurel32)
Index: elf/ldd.bash.in
===================================================================
@@ -16,7 +16,7 @@
while test $# -gt 0; do
case "$1" in
-@@ -151,8 +152,11 @@
+@@ -151,13 +152,16 @@
echo "ldd: ${file}:" $"not regular file" >&2
result=1
elif test -r "$file"; then
@@ -30,6 +30,12 @@
RTLD=
ret=1
for rtld in ${RTLDLIST}; do
+ if test -x $rtld; then
+- verify_out=`${rtld} --verify "$file"`
++ verify_out=`${rtld} --verify "$file" 2>/dev/null`
+ ret=$?
+ case $ret in
+ [02]) RTLD=${rtld}; break;;
@@ -169,7 +173,11 @@
# If the program exits with exit code 5, it means the process has been
# invoked with __libc_enable_secure. Fall back to running it through
Reply to: