[arch-commits] Commit in glibc/trunk (6 files)

2017-06-21 Thread Jan Steffens
Date: Wednesday, June 21, 2017 @ 10:19:47
  Author: heftig
Revision: 299110

2.25-5

Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/CVE-2017-1000366-rtld-LD_AUDIT.patch
  glibc/trunk/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch
  glibc/trunk/CVE-2017-1000366-rtld-LD_PRELOAD.patch
  glibc/trunk/cvs-hwcap-AT_SECURE.patch
  glibc/trunk/cvs-vectorized-strcspn-guards.patch

-+
 CVE-2017-1000366-rtld-LD_AUDIT.patch|  205 --
 CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch |   33 
 CVE-2017-1000366-rtld-LD_PRELOAD.patch  |  111 --
 PKGBUILD|   23 --
 cvs-hwcap-AT_SECURE.patch   |   28 ---
 cvs-vectorized-strcspn-guards.patch |   21 --
 6 files changed, 4 insertions(+), 417 deletions(-)

Deleted: CVE-2017-1000366-rtld-LD_AUDIT.patch
===
--- CVE-2017-1000366-rtld-LD_AUDIT.patch2017-06-21 10:14:23 UTC (rev 
299109)
+++ CVE-2017-1000366-rtld-LD_AUDIT.patch2017-06-21 10:19:47 UTC (rev 
299110)
@@ -1,205 +0,0 @@
-From ba67ba3275d47e0080f0e5f09d9f5102c000c97e Mon Sep 17 00:00:00 2001
-Message-Id: 

-In-Reply-To: 
-References: 
-From: Florian Weimer 
-Date: Sun, 28 May 2017 20:44:52 +0200
-Subject: [PATCH 3/3] rtld: Reject overly long LD_AUDIT path elements
-To: libc-al...@sourceware.org
-
-Also only process the last LD_AUDIT entry.

- elf/rtld.c | 110 -
- 1 file changed, 95 insertions(+), 15 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 30f0cae..89d8573 100644
 a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -116,13 +116,91 @@ dso_name_valid_for_suid (const char *p)
-   return *p != '\0';
- }
- 
--/* List of auditing DSOs.  */
-+/* LD_AUDIT variable contents.  Must be processed before the
-+   audit_list below.  */
-+const char *audit_list_string;
-+
-+/* Cyclic list of auditing DSOs.  audit_list->next is the first
-+   element.  */
- static struct audit_list
- {
-   const char *name;
-   struct audit_list *next;
- } *audit_list;
- 
-+/* Iterator for audit_list_string followed by audit_list.  */
-+struct audit_list_iter
-+{
-+  /* Tail of audit_list_string still needing processing, or NULL.  */
-+  const char *audit_list_tail;
-+
-+  /* The list element returned in the previous iteration.  NULL before
-+ the first element.  */
-+  struct audit_list *previous;
-+
-+  /* Scratch buffer for returning a name which is part of
-+ audit_list_string.  */
-+  char fname[PATH_MAX];
-+};
-+
-+/* Initialize an audit list iterator.  */
-+static void
-+audit_list_iter_init (struct audit_list_iter *iter)
-+{
-+  iter->audit_list_tail = audit_list_string;
-+  iter->previous = NULL;
-+}
-+
-+/* Iterate through both audit_list_string and audit_list.  */
-+static const char *
-+audit_list_iter_next (struct audit_list_iter *iter)
-+{
-+  if (iter->audit_list_tail != NULL)
-+{
-+  /* First iterate over audit_list_string.  */
-+  while (*iter->audit_list_tail != '\0')
-+  {
-+/* Split audit list at colon.  */
-+size_t len = strcspn (iter->audit_list_tail, ":");
-+if (len > 0 && len < PATH_MAX)
-+  {
-+memcpy (iter->fname, iter->audit_list_tail, len);
-+iter->fname[len] = '\0';
-+  }
-+else
-+  /* Do not return this name to the caller.  */
-+  iter->fname[0] = '\0';
-+
-+/* Skip over the substring and the following delimiter.  */
-+iter->audit_list_tail += len;
-+if (*iter->audit_list_tail == ':')
-+  ++iter->audit_list_tail;
-+
-+/* If the name is valid, return it.  */
-+if (dso_name_valid_for_suid (iter->fname))
-+  return iter->fname;
-+/* Otherwise, wrap around and try the next name.  */
-+  }
-+  /* Fall through to the procesing of audit_list.  */
-+}
-+
-+  if (iter->previous == NULL)
-+{
-+  if (audit_list == NULL)
-+  /* No pre-parsed audit list.  */
-+  return NULL;
-+  /* Start of audit list.  The first list element is at
-+   audit_list->next (cyclic list).  */
-+  iter->previous = audit_list->next;
-+  return iter->previous->name;
-+}
-+  if (iter->previous == audit_list)
-+/* Cyclic list wrap-around.  */
-+return NULL;
-+  iter->previous = iter->previous->next;
-+  return iter->previous->name;
-+}
-+
- #ifndef HAVE_INLINED_SYSCALLS
- /* Set nonzero during loading and initialization of executable and
-libraries, cleared before the executable's entry point runs.  This
-@@ -1290,11 +1368,13 @@ of this helper program; chances are you did not intend 
to run this program.\n\
- GL(dl_rtld_map).l_tls_modid = 

[arch-commits] Commit in glibc/trunk (6 files)

2017-06-19 Thread Levente Polyak
Date: Monday, June 19, 2017 @ 21:50:56
  Author: anthraxx
Revision: 298991

upgpkg: glibc 2.25-4 (stack-gap security update)

Added:
  glibc/trunk/CVE-2017-1000366-rtld-LD_AUDIT.patch
  glibc/trunk/CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch
  glibc/trunk/CVE-2017-1000366-rtld-LD_PRELOAD.patch
  glibc/trunk/cvs-hwcap-AT_SECURE.patch
  glibc/trunk/cvs-vectorized-strcspn-guards.patch
Modified:
  glibc/trunk/PKGBUILD

-+
 CVE-2017-1000366-rtld-LD_AUDIT.patch|  205 ++
 CVE-2017-1000366-rtld-LD_LIBRARY_PATH.patch |   33 
 CVE-2017-1000366-rtld-LD_PRELOAD.patch  |  111 ++
 PKGBUILD|   24 ++-
 cvs-hwcap-AT_SECURE.patch   |   28 +++
 cvs-vectorized-strcspn-guards.patch |   21 ++
 6 files changed, 418 insertions(+), 4 deletions(-)

Added: CVE-2017-1000366-rtld-LD_AUDIT.patch
===
--- CVE-2017-1000366-rtld-LD_AUDIT.patch(rev 0)
+++ CVE-2017-1000366-rtld-LD_AUDIT.patch2017-06-19 21:50:56 UTC (rev 
298991)
@@ -0,0 +1,205 @@
+From ba67ba3275d47e0080f0e5f09d9f5102c000c97e Mon Sep 17 00:00:00 2001
+Message-Id: 

+In-Reply-To: 
+References: 
+From: Florian Weimer 
+Date: Sun, 28 May 2017 20:44:52 +0200
+Subject: [PATCH 3/3] rtld: Reject overly long LD_AUDIT path elements
+To: libc-al...@sourceware.org
+
+Also only process the last LD_AUDIT entry.
+---
+ elf/rtld.c | 110 -
+ 1 file changed, 95 insertions(+), 15 deletions(-)
+
+diff --git a/elf/rtld.c b/elf/rtld.c
+index 30f0cae..89d8573 100644
+--- a/elf/rtld.c
 b/elf/rtld.c
+@@ -116,13 +116,91 @@ dso_name_valid_for_suid (const char *p)
+   return *p != '\0';
+ }
+ 
+-/* List of auditing DSOs.  */
++/* LD_AUDIT variable contents.  Must be processed before the
++   audit_list below.  */
++const char *audit_list_string;
++
++/* Cyclic list of auditing DSOs.  audit_list->next is the first
++   element.  */
+ static struct audit_list
+ {
+   const char *name;
+   struct audit_list *next;
+ } *audit_list;
+ 
++/* Iterator for audit_list_string followed by audit_list.  */
++struct audit_list_iter
++{
++  /* Tail of audit_list_string still needing processing, or NULL.  */
++  const char *audit_list_tail;
++
++  /* The list element returned in the previous iteration.  NULL before
++ the first element.  */
++  struct audit_list *previous;
++
++  /* Scratch buffer for returning a name which is part of
++ audit_list_string.  */
++  char fname[PATH_MAX];
++};
++
++/* Initialize an audit list iterator.  */
++static void
++audit_list_iter_init (struct audit_list_iter *iter)
++{
++  iter->audit_list_tail = audit_list_string;
++  iter->previous = NULL;
++}
++
++/* Iterate through both audit_list_string and audit_list.  */
++static const char *
++audit_list_iter_next (struct audit_list_iter *iter)
++{
++  if (iter->audit_list_tail != NULL)
++{
++  /* First iterate over audit_list_string.  */
++  while (*iter->audit_list_tail != '\0')
++  {
++/* Split audit list at colon.  */
++size_t len = strcspn (iter->audit_list_tail, ":");
++if (len > 0 && len < PATH_MAX)
++  {
++memcpy (iter->fname, iter->audit_list_tail, len);
++iter->fname[len] = '\0';
++  }
++else
++  /* Do not return this name to the caller.  */
++  iter->fname[0] = '\0';
++
++/* Skip over the substring and the following delimiter.  */
++iter->audit_list_tail += len;
++if (*iter->audit_list_tail == ':')
++  ++iter->audit_list_tail;
++
++/* If the name is valid, return it.  */
++if (dso_name_valid_for_suid (iter->fname))
++  return iter->fname;
++/* Otherwise, wrap around and try the next name.  */
++  }
++  /* Fall through to the procesing of audit_list.  */
++}
++
++  if (iter->previous == NULL)
++{
++  if (audit_list == NULL)
++  /* No pre-parsed audit list.  */
++  return NULL;
++  /* Start of audit list.  The first list element is at
++   audit_list->next (cyclic list).  */
++  iter->previous = audit_list->next;
++  return iter->previous->name;
++}
++  if (iter->previous == audit_list)
++/* Cyclic list wrap-around.  */
++return NULL;
++  iter->previous = iter->previous->next;
++  return iter->previous->name;
++}
++
+ #ifndef HAVE_INLINED_SYSCALLS
+ /* Set nonzero during loading and initialization of executable and
+libraries, cleared before the executable's entry point runs.  This
+@@ -1290,11 +1368,13 @@ of this helper program; chances are you did not intend 
to run this program.\n\
+ 

[arch-commits] Commit in glibc/trunk (6 files)

2013-08-13 Thread Allan McRae
Date: Tuesday, August 13, 2013 @ 13:00:32
  Author: allan
Revision: 192510

upstream update, adjust systemd files to those agreed upstream, remove old 
patches

Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/nscd.service
  glibc/trunk/nscd.tmpfiles
Deleted:
  glibc/trunk/glibc-2.17-getaddrinfo-stack-overflow.patch
  glibc/trunk/glibc-2.17-regexp-matcher-overrun.patch
  glibc/trunk/glibc-2.17-sync-with-linux37.patch

-+
 PKGBUILD|   27 +
 glibc-2.17-getaddrinfo-stack-overflow.patch |   47 
 glibc-2.17-regexp-matcher-overrun.patch |  137 --
 glibc-2.17-sync-with-linux37.patch  |  130 
 nscd.service|7 -
 nscd.tmpfiles   |3 
 6 files changed, 13 insertions(+), 338 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-08-13 10:59:11 UTC (rev 192509)
+++ PKGBUILD2013-08-13 11:00:32 UTC (rev 192510)
@@ -5,8 +5,8 @@
 # NOTE: valgrind requires rebuilt with each major glibc version
 
 pkgname=glibc
-pkgver=2.17
-pkgrel=6
+pkgver=2.18
+pkgrel=1
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -20,20 +20,14 @@
 options=('!strip')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
-glibc-2.17-sync-with-linux37.patch
-glibc-2.17-getaddrinfo-stack-overflow.patch
-glibc-2.17-regexp-matcher-overrun.patch
 nscd.service
 nscd.tmpfiles
 locale.gen.txt
 locale-gen)
-md5sums=('87bf675c8ee523ebda4803e8e1cec638'
+md5sums=('88fbbceafee809e82efd52efa1e3c58f'
  'SKIP'
- 'fb99380d94598cc76d793deebf630022'
- '56d5f2c09503a348281a20ae404b7de3'
- '200acc05961b084ee00dde919e64f82d'
- 'c1e07c0bec0fe89791bfd9d13fc85edf'
- 'bccbe5619e75cf1d97312ec3681c605c'
+ 'd5fab2cd3abea65aa5ae696ea4a47d6b'
+ 'da662ca76e7c8d7efbc7986ab7acea2d'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 
@@ -41,15 +35,6 @@
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # combination of upstream commits 318cd0b, b540704 and fc1abbe
-  patch -p1 -i ${srcdir}/glibc-2.17-sync-with-linux37.patch
-
-  # CVE-2013-1914 - upstream commit 1cef1b19
-  patch -p1 -i ${srcdir}/glibc-2.17-getaddrinfo-stack-overflow.patch
-
-  # CVE-2013-0242 - upstream commit a445af0b
-  patch -p1 -i ${srcdir}/glibc-2.17-regexp-matcher-overrun.patch
-
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build
@@ -146,5 +131,5 @@
   
usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
   usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so 
\
   usr/lib/{libmemusage,libpcprofile,libSegFault}.so \
-  usr/lib/{pt_chown,{audit,gconv}/*.so}
+  usr/lib/{audit,gconv}/*.so
 }

Deleted: glibc-2.17-getaddrinfo-stack-overflow.patch
===
--- glibc-2.17-getaddrinfo-stack-overflow.patch 2013-08-13 10:59:11 UTC (rev 
192509)
+++ glibc-2.17-getaddrinfo-stack-overflow.patch 2013-08-13 11:00:32 UTC (rev 
192510)
@@ -1,47 +0,0 @@
-diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
-index d95c2d1..2309281 100644
 a/sysdeps/posix/getaddrinfo.c
-+++ b/sysdeps/posix/getaddrinfo.c
-@@ -2489,11 +2489,27 @@ getaddrinfo (const char *name, const char *service,
-   __typeof (once) old_once = once;
-   __libc_once (once, gaiconf_init);
-   /* Sort results according to RFC 3484.  */
--  struct sort_result results[nresults];
--  size_t order[nresults];
-+  struct sort_result *results;
-+  size_t *order;
-   struct addrinfo *q;
-   struct addrinfo *last = NULL;
-   char *canonname = NULL;
-+  bool malloc_results;
-+
-+  malloc_results
-+  = !__libc_use_alloca (nresults * (sizeof (*results) + sizeof (size_t)));
-+  if (malloc_results)
-+  {
-+results = malloc (nresults * (sizeof (*results) + sizeof (size_t)));
-+if (results == NULL)
-+  {
-+__free_in6ai (in6ai);
-+return EAI_MEMORY;
-+  }
-+  }
-+  else
-+  results = alloca (nresults * (sizeof (*results) + sizeof (size_t)));
-+  order = (size_t *) (results + nresults);
- 
-   /* Now we definitely need the interface information.  */
-   if (! check_pf_called)
-@@ -2664,6 +2680,9 @@ getaddrinfo (const char *name, const char *service,
- 
-   /* Fill in the canonical name into the new first entry.  */
-   p-ai_canonname = canonname;
-+
-+  if (malloc_results)
-+  free (results);
- }
- 
-   __free_in6ai (in6ai);
--- 
-1.7.1
-

Deleted: glibc-2.17-regexp-matcher-overrun.patch

[arch-commits] Commit in glibc/trunk (6 files)

2012-10-23 Thread Allan McRae
Date: Tuesday, October 23, 2012 @ 18:53:07
  Author: allan
Revision: 169584

binutils 2.23 rebuild, fix service file typo (FS#32190), replace patch with 
upstream fix, add two more patches

Added:
  glibc/trunk/glibc-2.16-detect-fma.patch
  glibc/trunk/glibc-2.16-glob-use-size_t.patch
  glibc/trunk/glibc-2.16-unlock-mutex.patch
Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/nscd.service
Deleted:
  glibc/trunk/glibc-2.15-revert-c5a0802a.patch

--+
 PKGBUILD |   25 -
 glibc-2.15-revert-c5a0802a.patch |  226 --
 glibc-2.16-detect-fma.patch  |   72 +++
 glibc-2.16-glob-use-size_t.patch |   52 ++
 glibc-2.16-unlock-mutex.patch|  775 +
 nscd.service |2 
 6 files changed, 919 insertions(+), 233 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-10-23 22:51:30 UTC (rev 169583)
+++ PKGBUILD2012-10-23 22:53:07 UTC (rev 169584)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.16.0
-pkgrel=4
+pkgrel=5
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -21,10 +21,12 @@
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
 glibc-2.15-fix-res_query-assert.patch
-glibc-2.15-revert-c5a0802a.patch
+glibc-2.16-unlock-mutex.patch
 glibc-2.16-rpcgen-cpp-path.patch
 glibc-2.16-strncasecmp-segfault.patch
 glibc-2.16-strtod-overflow.patch
+glibc-2.16-detect-fma.patch
+glibc-2.16-glob-use-size_t.patch
 nscd.rcd
 nscd.service
 nscd.tmpfiles
@@ -33,16 +35,19 @@
 md5sums=('80b181b02ab249524ec92822c0174cf7'
  '2a1221a15575820751c325ef4d2fbb90'
  '31f415b41197d85d3bbee3d1eecd06a3'
- '0a0383d50d63f1c02919fe9943b82014'
+ '0afcd8c6020d61684aba63ed5f26bd91'
  'ea6a43915474e8276e9361eed6a01280'
  'f042d37cc8ca3459023431809039bc88'
  '61d322f7681a85d3293ada5c3ccc2c7e'
+ '2426f593bc43f5499c41d21b57ee0e30'
+ 'a441353901992feda4b15a11a20140a1'
  '589d79041aa767a5179eaa4e2737dd3f'
  'ad8a9af15ab7eeaa23dc7ee85024af9f'
  'bccbe5619e75cf1d97312ec3681c605c'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 
+
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
@@ -50,9 +55,9 @@
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
   patch -p1 -i ${srcdir}/glibc-2.15-fix-res_query-assert.patch
 
-  # revert commit c5a0802a - causes various hangs
-  # https://bugzilla.redhat.com/show_bug.cgi?id=552960
-  patch -p1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
+  # prevent hang by locked mutex
+  # http://sourceware.org/git/?p=glibc.git;a=patch;h=c30e8edf
+  patch -p1 -i ${srcdir}/glibc-2.16-unlock-mutex.patch
 
   # prevent need for /lib/cpp symlink
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=bf9b740a
@@ -66,6 +71,14 @@
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=da1f4319
   patch -p1 -i ${srcdir}/glibc-2.16-strtod-overflow.patch
 
+  # detect FMA supprt
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=a5cfcf08
+  patch -p1 -i ${srcdir}/glibc-2.16-detect-fma.patch
+  
+  # prevent overflow in globc
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=6c62f108
+  patch -p1 -i ${srcdir}/glibc-2.16-glob-use-size_t.patch
+
   # ldconfig does not need to look in /usr/lib64 or /usr/libx32 on Arch Linux
   sed -i s#add_system_dir#do_not_add_system_dir# 
sysdeps/unix/sysv/linux/x86_64/dl-cache.h
 

Deleted: glibc-2.15-revert-c5a0802a.patch
===
--- glibc-2.15-revert-c5a0802a.patch2012-10-23 22:51:30 UTC (rev 169583)
+++ glibc-2.15-revert-c5a0802a.patch2012-10-23 22:53:07 UTC (rev 169584)
@@ -1,226 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 
b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
 a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S   
2011-12-22 18:04:12.937212834 +
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S   
2011-12-22 18:04:42.10478 +
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
-   cmpl$PI_BIT, %eax
-   jne 18f
- 
--90:
-   movl$(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
-   movl%ebp, %edx
-   xorl%esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
-   sete16(%esp)
-   je  19f
- 
--  cmpl$-EAGAIN, %eax
--  je  91f
--
-   /* Normal and PI futexes dont mix. Use normal futex functions only
-  if the kernel does not support the PI futex functions.  */
-   cmpl$-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
-   call__lll_unlock_wake
-   jmp 11b
--
--91:
--.LcleanupSTART2:
--  /* FUTEX_WAIT_REQUEUE_PI returned 

[arch-commits] Commit in glibc/trunk (6 files)

2011-09-08 Thread Allan McRae
Date: Thursday, September 8, 2011 @ 16:57:06
  Author: allan
Revision: 137531

upgpkg: glibc 2.14-6

new upstream snapshot from 2.14 branch, fix dlcose issue (e.g. FS#25459), 
better fix for DNS assertion issues (FS#24615)

Added:
  glibc/trunk/glibc-2.13-dlclose-search-reset.patch
  glibc/trunk/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
  glibc/trunk/glibc-2.14-revert-4769ae77.patch
(from rev 136750, glibc/trunk/glibc-2.14-revert-4462fad3.patch)
Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/glibc-2.14-fix-resolver-crash-typo.patch
  glibc/trunk/glibc-2.14-revert-4462fad3.patch

--+
 PKGBUILD |   25 +-
 glibc-2.13-dlclose-search-reset.patch|  196 +
 glibc-2.14-avoid-assertion-on-empty-dns-answer.patch |   26 ++
 glibc-2.14-fix-resolver-crash-typo.patch |   22 -
 glibc-2.14-revert-4462fad3.patch |   37 ---
 glibc-2.14-revert-4769ae77.patch |   37 +++
 6 files changed, 273 insertions(+), 70 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-08 19:55:05 UTC (rev 137530)
+++ PKGBUILD2011-09-08 20:57:06 UTC (rev 137531)
@@ -6,8 +6,8 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=5
-_glibcdate=20110617
+pkgrel=6
+_glibcdate=20110908
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -27,23 +27,24 @@
 glibc-2.12.1-static-shared-getpagesize.patch
 glibc-2.12.2-ignore-origin-of-privileged-program.patch
 glibc-2.13-futex.patch
+glibc-2.13-dlclose-search-reset.patch
 glibc-2.14-libdl-crash.patch
-#glibc-2.14-fix-resolver-crash-typo.patch
-glibc-2.14-revert-4462fad3.patch
+glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
 glibc-2.14-reexport-rpc-interface.patch
 glibc-2.14-reinstall-nis-rpc-headers.patch
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('e441d745609d93c907b72548ba646dad'
+md5sums=('069069eb9100cc7affd7ad884cb3c3e9'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
  'a3ac6f318d680347bb6e2805d42b73b2'
  'b042647ea7d6f22ad319e12e796bd13e'
  '7d0154b7e17ea218c9fa953599d24cc4'
+ '22d09c58718fb3d1d31c3a6c14ca6886'
  'cea62cc6b903d222c5f26e05a3c0e0e6'
- '46e56492cccb1c9172ed3a235cf43c6c'
+ '13728807283f111e5d9d38cf38e0a461'
  'c5de2a946215d647c8af5432ec4b0da0'
  '55febbb72139ac7b65757df085024b83'
  'b587ee3a70c9b3713099295609afde49'
@@ -83,15 +84,17 @@
   # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
   patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
 
+  # https://bugzilla.redhat.com/show_bug.cgi?id=593675
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=2f811bf8 (only 
fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.13-dlclose-search-reset.patch
+
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only 
fedora branch...)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg6.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
-  # This fixes the main segfault but not the assert fail (FS#24615)
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=57912a71 
-  #patch -Np1 -i ${srcdir}/glibc-2.14-fix-resolver-crash-typo.patch
-  # resort to reverting the bad commit completely for the moment
-  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
+  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only 
fedora branch...)
+  patch -Np1 -i ${srcdir}/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
 
   # re-export RPC interface until libtirpc is ready as a replacement
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only 
fedora branch...)

Added: glibc-2.13-dlclose-search-reset.patch
===
--- glibc-2.13-dlclose-search-reset.patch   (rev 0)
+++ glibc-2.13-dlclose-search-reset.patch   2011-09-08 20:57:06 UTC (rev 
137531)
@@ -0,0 +1,196 @@
+From 2f811bf88bed4a6c0dec8778847ba441736d509d Mon Sep 17 00:00:00 2001
+From: Andreas Schwab sch...@redhat.com
+Date: Wed, 26 May 2010 18:28:59 +0200
+Subject: [PATCH] Fix scope handling during dl_close
+
+---
+ ChangeLog  |   12 
+ elf/Makefile   |   10 +-
+ elf/dl-close.c |7 +++
+ elf/unload8.c  |   33 +
+ elf/unload8mod1.c  |7 +++
+ elf/unload8mod1x.c |1 +
+ elf/unload8mod2.c  |7 +++
+ elf/unload8mod3.c  |   27 +++
+ 8 files changed, 103 insertions(+), 1 deletions(-)
+ create mode 100644 elf/unload8.c
+ create mode 100644