From ad4b2565385561c6ff56f1f91c1e40115cf939d7 Mon Sep 17 00:00:00 2001
From: root <root@rshg047.dnsready.net>
Date: Sun, 12 Jun 2011 22:59:55 +0000
Subject: Sun Jun 12 22:59:55 UTC 2011

---
 multilib-testing/lib32-glibc/PKGBUILD              | 12 +++++--
 .../lib32-glibc/glibc-2.14-revert-4462fad3.patch   | 37 ++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch

(limited to 'multilib-testing/lib32-glibc')

diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index f5958c7da..e1ed19461 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 48898 2011-06-07 12:25:15Z heftig $
+# $Id: PKGBUILD 49129 2011-06-11 13:29:12Z heftig $
 # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.14
-pkgrel=1
+pkgrel=2
 _glibcdate=20110605
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
@@ -26,6 +26,7 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver
         glibc-2.12.2-ignore-origin-of-privileged-program.patch
         glibc-2.13-futex.patch
         glibc-2.14-libdl-crash.patch
+        glibc-2.14-revert-4462fad3.patch
         lib32-glibc.conf)
 md5sums=('a96742599fc8a99e52b9e344f39a1000'
          '4dadb9203b69a3210d53514bb46f41c3'
@@ -35,6 +36,7 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000'
          'b042647ea7d6f22ad319e12e796bd13e'
          '7d0154b7e17ea218c9fa953599d24cc4'
          'cea62cc6b903d222c5f26e05a3c0e0e6'
+         '46e56492cccb1c9172ed3a235cf43c6c'
          '6e052f1cb693d5d3203f50f9d4e8c33b')
 
 build() {
@@ -65,6 +67,10 @@ build() {
   # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
+  # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684
+  # as it causes crashes  (FS#24615)
+  patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch
+
   cd ${srcdir}
   mkdir glibc-build
   cd glibc-build
@@ -119,7 +125,7 @@ package() {
                       usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
                       usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
                       usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib32/{pt_chown,gconv/*.so}
+                      usr/lib32/{pt_chown,{audit,gconv}/*.so}
 
   # Dynamic linker
   install -d -m755 ${pkgdir}/lib
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch
new file mode 100644
index 000000000..d71e37492
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch
@@ -0,0 +1,37 @@
+diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
+--- glibc-orig//resolv/res_send.c	2011-06-10 18:59:03.041436996 +1000
++++ glibc/resolv/res_send.c	2011-06-10 19:08:09.379309323 +1000
+@@ -549,7 +549,7 @@
+ 				    ns, ansp, ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 		} else {
+ 			/* Use datagrams. */
+@@ -559,7 +559,7 @@
+ 				    ansp2, nansp2, resplen2);
+ 			if (n < 0)
+ 				return (-1);
+-			if (n == 0 && (buf2 == NULL || resplen2 == 0))
++			if (n == 0)
+ 				goto next_ns;
+ 			if (v_circuit)
+ 			  // XXX Check whether both requests failed or
+@@ -1275,14 +1275,10 @@
+ 				(*thisresplenp > *thisanssizp)
+ 				? *thisanssizp : *thisresplenp);
+ 
+-			if (recvresp1 || (buf2 != NULL && recvresp2)) {
+-			  *resplen2 = 0;
++			if (recvresp1 || (buf2 != NULL && recvresp2))
+ 			  return resplen;
+-			}
+ 			if (buf2 != NULL)
+ 			  {
+-			    /* No data from the first reply.  */
+-			    resplen = 0;
+ 			    /* We are waiting for a possible second reply.  */
+ 			    if (hp->id == anhp->id)
+ 			      recvresp1 = 1;
-- 
cgit v1.2.3-54-g00ecf