Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=56fc5789a7518308820a9128ccab611ff7c91955

commit 56fc5789a7518308820a9128ccab611ff7c91955
Author: Melko <me...@frugalware.org>
Date:   Sun Aug 28 18:51:34 2011 +0200

glibc-2.14-6-i686

* add patch to fix crash with alsa and mplayer
(maybe also some other apps are involved)

diff --git a/source/base/glibc/FrugalBuild b/source/base/glibc/FrugalBuild
index cead5ad..89efcb9 100644
--- a/source/base/glibc/FrugalBuild
+++ b/source/base/glibc/FrugalBuild
@@ -11,7 +11,7 @@ USE_GLIBC_PORTS=${USE_GLIBC_PORTS:-$USE_GLIBC_PORTS_DEFAULT}

pkgname=glibc
pkgver=2.14
-pkgrel=5
+pkgrel=6
pkgdesc="GNU C Library"
url="http://www.gnu.org/software/libc/libc.html";
depends=()
@@ -27,13 +27,15 @@ 
source=(http://ftp.gnu.org/pub/gnu/glibc/glibc-$pkgver.tar.gz \
gcc45.patch \
revert-8f4a5048eea6536ee85c0f2670adbb97d71e427d.patch \
nis.diff \
-       glibc-2.14-revert-4462fad3.patch)
+       glibc-2.14-revert-4462fad3.patch \
+       glibc-2.14-libdl-crash.patch)
sha1sums=('74a57dd5bd2494a190da7ded31477980aefa5093' \
'be4a7bea8af743331e2c6704faa24b6cb4e155d5' \
'2283966c4f48bbc9b6ad0ae3bbd64601c057c721' \
'c8d14d0f2e239ba0def978010163e919a45700f7' \
'9c4544aee1063f65da39273349f0780d5723747d' \
-          '42af7bdcfc3edd795d181ce973f6b9278720abfc')
+          '42af7bdcfc3edd795d181ce973f6b9278720abfc' \
+          '0cbe39b2fe6e058562e9ac44d54ed539c8416bf7')

if Fuse GLIBC_PORTS; then
source=("${source[@]}" 
"http://ftp.gnu.org/pub/gnu/glibc/glibc-ports-$pkgver.tar.gz";)
diff --git a/source/base/glibc/glibc-2.14-libdl-crash.patch 
b/source/base/glibc/glibc-2.14-libdl-crash.patch
new file mode 100644
index 0000000..ee29f8c
--- /dev/null
+++ b/source/base/glibc/glibc-2.14-libdl-crash.patch
@@ -0,0 +1,132 @@
+diff --git a/elf/dl-close.c b/elf/dl-close.c
+index 73b2a2f..9bd91e3 100644
+--- a/elf/dl-close.c
++++ b/elf/dl-close.c
+@@ -1,5 +1,5 @@
+ /* Close a shared object opened by `_dl_open'.
+-   Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
+   if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
+       || dl_close_state != not_pending)
+     {
+-      if (map->l_direct_opencount == 0)
+-      {
+-        if (map->l_type == lt_loaded)
+-          dl_close_state = rerun;
+-        else if (map->l_type == lt_library)
+-          {
+-            struct link_map **oldp = map->l_initfini;
+-            map->l_initfini = map->l_orig_initfini;
+-            _dl_scope_free (oldp);
+-          }
+-      }
++      if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
++      dl_close_state = rerun;
+
+       /* There are still references to this object.  Do nothing more.  */
+       if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
+diff --git a/elf/dl-deps.c b/elf/dl-deps.c
+index 9e30594..3890d00 100644
+--- a/elf/dl-deps.c
++++ b/elf/dl-deps.c
+@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
+                 nneeded * sizeof needed[0]);
+         atomic_write_barrier ();
+         l->l_initfini = l_initfini;
++        l->l_free_initfini = 1;
+       }
+
+       /* If we have no auxiliary objects just go on to the next map.  */
+@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
+   l_initfini[nlist] = NULL;
+   atomic_write_barrier ();
+   map->l_initfini = l_initfini;
++  map->l_free_initfini = 1;
+   if (l_reldeps != NULL)
+     {
+       atomic_write_barrier ();
+@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
+       _dl_scope_free (old_l_reldeps);
+     }
+   if (old_l_initfini != NULL)
+-      map->l_orig_initfini = old_l_initfini;
++    _dl_scope_free (old_l_initfini);
+ }
+diff --git a/elf/dl-libc.c b/elf/dl-libc.c
+index 7be9483..a13fce3 100644
+--- a/elf/dl-libc.c
++++ b/elf/dl-libc.c
+@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
+
+   for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
+     {
+-      /* Remove all additional names added to the objects.  */
+       for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
+       {
+         struct libname_list *lnp = l->l_libname->next;
+
+         l->l_libname->next = NULL;
+
++        /* Remove all additional names added to the objects.  */
+         while (lnp != NULL)
+           {
+             struct libname_list *old = lnp;
+@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
+             if (! old->dont_free)
+               free (old);
+           }
++
++        /* Free the initfini dependency list.  */
++        if (l->l_free_initfini)
++          free (l->l_initfini);
+       }
+
+       if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 4a9109e..617e30e 100644
+--- a/elf/rtld.c
++++ b/elf/rtld.c
+@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit 
interface: %s; ignored.\n",
+             lnp->dont_free = 1;
+             lnp = lnp->next;
+           }
++        l->l_free_initfini = 0;
+
+         if (l != &GL(dl_rtld_map))
+           _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
+diff --git a/include/link.h b/include/link.h
+index e877104..051b99a 100644
+--- a/include/link.h
++++ b/include/link.h
+@@ -1,6 +1,6 @@
+ /* Data structure for communication from the run-time dynamic linker for
+    loaded ELF shared objects.
+-   Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, 
Inc.
++   Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -192,6 +192,9 @@ struct link_map
+                                                during LD_TRACE_PRELINKING=1
+                                                contains any DT_SYMBOLIC
+                                                libraries.  */
++    unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
++                                     freed, ie. not allocated with
++                                     the dummy malloc in ld.so.  */
+
+     /* Collected information about own RPATH directories.  */
+     struct r_search_path_struct l_rpath_dirs;
+@@ -240,9 +243,6 @@ struct link_map
+
+     /* List of object in order of the init and fini calls.  */
+     struct link_map **l_initfini;
+-    /* The init and fini list generated at startup, saved when the
+-       object is also loaded dynamically.  */
+-    struct link_map **l_orig_initfini;
+
+     /* List of the dependencies introduced through symbol binding.  */
+     struct link_map_reldeps
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to