r4532 - in glibc-package/branches/eglibc-2.13/debian: . patches patches/any
Author: aurel32
Date: 2011-02-26 11:18:34 +0000 (Sat, 26 Feb 2011)
New Revision: 4532
Added:
glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff
Modified:
glibc-package/branches/eglibc-2.13/debian/changelog
glibc-package/branches/eglibc-2.13/debian/patches/series
Log:
* Add patches/any/cvs-dl-missing-deps.diff to output an early error
when dependencies are missing. Closes: #612792.
Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-26 11:11:34 UTC (rev 4531)
+++ glibc-package/branches/eglibc-2.13/debian/changelog 2011-02-26 11:18:34 UTC (rev 4532)
@@ -121,6 +121,8 @@
kernels. Closes: #611195.
* Add patches/any/cvs-dlopen_memory_leak.diff to fix a memory leak
in dlopen(). Closes: #195888.
+ * Add patches/any/cvs-dl-missing-deps.diff to output an early error
+ when dependencies are missing. Closes: #612792.
[ Samuel Thibault ]
* Add patches/any/cvs-glro_dl_debug_mask.diff to fix build without
Added: glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff (rev 0)
+++ glibc-package/branches/eglibc-2.13/debian/patches/any/cvs-dl-missing-deps.diff 2011-02-26 11:18:34 UTC (rev 4532)
@@ -0,0 +1,30 @@
+2011-02-17 Andreas Schwab <schwab@redhat.com>
+
+ [BZ #12454]
+ * elf/dl-deps.c (_dl_map_object_deps): Signal error early when
+ dependencies are missing.
+
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 440fb56..5288353 100644
+--- a/elf/dl-deps.c
++++ b/elf/dl-deps.c
+@@ -491,6 +491,10 @@ _dl_map_object_deps (struct link_map *map,
+ if (errno == 0 && errno_saved != 0)
+ __set_errno (errno_saved);
+
++ if (errno_reason)
++ _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
++ NULL, errstring);
++
+ struct link_map **old_l_initfini = NULL;
+ if (map->l_initfini != NULL && map->l_type == lt_loaded)
+ {
+@@ -683,8 +687,4 @@ Filters not supported with LD_TRACE_PRELINKING"));
+ }
+ if (old_l_initfini != NULL)
+ _dl_scope_free (old_l_initfini);
+-
+- if (errno_reason)
+- _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname,
+- NULL, errstring);
+ }
Modified: glibc-package/branches/eglibc-2.13/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-26 11:11:34 UTC (rev 4531)
+++ glibc-package/branches/eglibc-2.13/debian/patches/series 2011-02-26 11:18:34 UTC (rev 4532)
@@ -219,3 +219,4 @@
any/submitted-ldsodefs_rtld_debug.diff
any/local-relro-mprotect.diff
any/cvs-dlopen_memory_leak.diff
+any/cvs-dl-missing-deps.diff
Reply to: