[arch-commits] Commit in glibc/trunk (PKGBUILD glibc-2.14-revert-4462fad3.patch)

[Allan McRae]

    Date: Saturday, June 11, 2011 @ 04:46:22
  Author: allan
Revision: 127202

upgpkg: glibc 2.14-2
fix crash - FS#24615

Added:
  glibc/trunk/glibc-2.14-revert-4462fad3.patch
Modified:
  glibc/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   13 ++++++++-----
 glibc-2.14-revert-4462fad3.patch |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-11 08:34:09 UTC (rev 127201)
+++ PKGBUILD	2011-06-11 08:46:22 UTC (rev 127202)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.14
-pkgrel=1
+pkgrel=2
 _glibcdate=20110605
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
@@ -27,6 +27,7 @@
         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
         nscd
         locale.gen.txt
         locale-gen)
@@ -38,6 +39,7 @@
          'b042647ea7d6f22ad319e12e796bd13e'
          '7d0154b7e17ea218c9fa953599d24cc4'
          'cea62cc6b903d222c5f26e05a3c0e0e6'
+         '46e56492cccb1c9172ed3a235cf43c6c'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -79,6 +81,10 @@
   # 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
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -165,8 +171,5 @@
                       lib/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
                       lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
                       lib/{libmemusage,libpcprofile,libSegFault}.so \
-                      usr/lib/{pt_chown,gconv/*.so}
-
-# add usr/lib/audit/sotruss-lib.so, usr/bin/sotruss
-
+                      usr/lib/{pt_chown,{audit,gconv}/*.so}
 }

Added: glibc-2.14-revert-4462fad3.patch
===================================================================
--- glibc-2.14-revert-4462fad3.patch	                        (rev 0)
+++ glibc-2.14-revert-4462fad3.patch	2011-06-11 08:46:22 UTC (rev 127202)
@@ -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;