r1949 - in glibc-package/branches/glibc-2.5/debian: . patches/any
Author: madcoder
Date: 2007-02-07 18:43:10 +0100 (Wed, 07 Feb 2007)
New Revision: 1949
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/any/local-ldd.diff
Log:
Closes: #165417
* Rework patches/any/local-ldd.diff so that we don't use file(1) anymore (it
wasn't used anyway). Closes: #165417.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2007-02-07 14:22:09 UTC (rev 1948)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2007-02-07 17:43:10 UTC (rev 1949)
@@ -121,6 +121,10 @@
* Update localedata/fix-lang.diff
* Update localedata/first_weekday.diff
+ [ Pierre Habouzit ]
+ * Rework patches/any/local-ldd.diff so that we don't use file(1) anymore (it
+ wasn't used anyway). Closes: #165417.
+
-- Aurelien Jarno <aurel32@debian.org> Wed, 7 Feb 2007 13:56:40 +0100
glibc (2.4-1) UNRELEASED; urgency=low
Modified: glibc-package/branches/glibc-2.5/debian/patches/any/local-ldd.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/any/local-ldd.diff 2007-02-07 14:22:09 UTC (rev 1948)
+++ glibc-package/branches/glibc-2.5/debian/patches/any/local-ldd.diff 2007-02-07 17:43:10 UTC (rev 1949)
@@ -33,16 +33,15 @@
RTLD=
for rtld in ${RTLDLIST}; do
if test -x $rtld; then
-@@ -171,7 +175,12 @@
+@@ -171,7 +175,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
# the dynamic linker.
- try_trace "$file"
-+ if [ ! -x "$file" ] && eval file -L "$file" 2>/dev/null \
-+ | sed 10q | egrep "$file_magic_regex" > /dev/null; then
-+ try_trace "${RTLD}" "$file"
-+ else
++ if test -x "$file"; then
+ try_trace "$file"
++ else
++ try_trace "${RTLD}" "$file"
+ fi
rc=$?
if [ $rc = 5 ]; then
Reply to: