packages: glibc/glibc-git.patch - RES_USE_INET6 upstream fix

[arekm]

Author: arekm                        Date: Sat Jul  2 19:15:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- RES_USE_INET6 upstream fix

---- Files affected:
packages/glibc:
   glibc-git.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/glibc/glibc-git.patch
diff -u packages/glibc/glibc-git.patch:1.7 packages/glibc/glibc-git.patch:1.8
--- packages/glibc/glibc-git.patch:1.7	Tue Jun 28 10:08:11 2011
+++ packages/glibc/glibc-git.patch	Sat Jul  2 21:15:07 2011
@@ -539,3 +539,38 @@
  
    if (dataset != NULL && !alloca_used)
      {
+commit 89f654c57b3b9a6aee480e25e37f88f06c898901
+Author: Andreas Schwab <schwab at redhat.com>
+Date:   Thu Jun 30 06:33:32 2011 -0400
+
+    Make sure RES_USE_INET6 is always restored
+
+diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
+index 05c883d..6d574c5 100644
+--- a/sysdeps/posix/getaddrinfo.c
++++ b/sysdeps/posix/getaddrinfo.c
+@@ -818,6 +818,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 	      tmpbuf = malloc (tmpbuflen);
+ 	      if (tmpbuf == NULL)
+ 		{
++		  _res.options |= old_res_options & RES_USE_INET6;
+ 		  result = -EAI_MEMORY;
+ 		  goto free_and_return;
+ 		}
+@@ -862,6 +863,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 						2 * tmpbuflen);
+ 			  if (newp == NULL)
+ 			    {
++			      _res.options |= old_res_options & RES_USE_INET6;
+ 			      result = -EAI_MEMORY;
+ 			      goto free_and_return;
+ 			    }
+@@ -981,6 +983,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 				      canonbuf = malloc (max_fqdn_len);
+ 				      if (canonbuf == NULL)
+ 					{
++					  _res.options
++					    |= old_res_options & RES_USE_INET6;
+ 					  result = -EAI_MEMORY;
+ 					  goto free_and_return;
+ 					}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/glibc/glibc-git.patch?r1=1.7&r2=1.8&f=u