packages: glibc/glibc-git.patch - upstream fix for nscd

[arekm]

Author: arekm                        Date: Tue Jun 28 08:08:16 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- upstream fix for nscd

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

---- Diffs:

================================================================
Index: packages/glibc/glibc-git.patch
diff -u packages/glibc/glibc-git.patch:1.6 packages/glibc/glibc-git.patch:1.7
--- packages/glibc/glibc-git.patch:1.6	Thu Jun 23 12:52:02 2011
+++ packages/glibc/glibc-git.patch	Tue Jun 28 10:08:11 2011
@@ -518,3 +518,24 @@
        /* If we have information about deprecated and temporary addresses
  	 sort the array now.  */
        if (in6ai != NULL)
+commit 034807a9cbddfa9e7d35df4cdb2ecce569a00851
+Author: Ulrich Drepper <drepper at gmail.com>
+Date:   Mon Jun 27 13:10:44 2011 -0400
+
+    Fix handling of RES_USE_INET6 big in nscd
+    
+    This fixes BZ #12350 also for nscd.
+
+diff --git a/nscd/aicache.c b/nscd/aicache.c
+index 3190a13..6c8d83a 100644
+--- a/nscd/aicache.c
++++ b/nscd/aicache.c
+@@ -534,7 +534,7 @@ next_nip:
+    }
+ 
+  out:
+-  _res.options = old_res_options;
++  _res.options |= old_res_options & RES_USE_INET6;
+ 
+   if (dataset != NULL && !alloca_used)
+     {
================================================================

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