[glibc/f15] 2.14-3

[Andreas Schwab]

commit 382444fc1407a67b824220501cf45fb55e1756ca
Author: Andreas Schwab <schwab at redhat.com>
Date:   Tue Jun 21 17:12:12 2011 +0200

    2.14-3

 glibc-fedora.patch |   25 +++++++++++++++++++++++--
 sources            |    2 +-
 2 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/glibc-fedora.patch b/glibc-fedora.patch
index fae4b23..e37df0c 100644
--- a/glibc-fedora.patch
+++ b/glibc-fedora.patch
@@ -4108,7 +4108,15 @@
  weak_alias (__getrlimit, getrlimit)
 --- glibc-2.14-12-g5babac1/sysdeps/posix/getaddrinfo.c
 +++ glibc-2.14-3/sysdeps/posix/getaddrinfo.c
-@@ -889,7 +889,29 @@ gaih_inet (const char *name, const struct gaih_service *service,
+@@ -881,16 +881,48 @@ gaih_inet (const char *name, const struct gaih_service *service,
+ 			}
+ 		    }
+ 
+-		  no_inet6_data = no_data;
+-
+ 		  if (status == NSS_STATUS_SUCCESS)
+ 		    {
+ 		      if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL)
  			canon = (*pat)->name;
  
  		      while (*pat != NULL)
@@ -4133,13 +4141,26 @@
 +				got_ipv6 = true;
 +			      pat = &(*pat)->next;
 +			    }
++			  else if (*pat == at)
++			    {
++			      if ((*pat)->next != NULL)
++				memcpy (*pat, (*pat)->next, sizeof (**pat));
++			      else
++				{
++				  no_data = 1;
++				  break;
++				}
++			    }
 +			  else
 +			    *pat = (*pat)->next;
 +			}
  		    }
++
++		  no_inet6_data = no_data;
  		}
  	      else
-@@ -1335,10 +1357,12 @@ static const struct scopeentry
+ 		{
+@@ -1335,10 +1367,12 @@ static const struct scopeentry
      /* Link-local addresses: scope 2.  */
      { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
      { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },
diff --git a/sources b/sources
index 1973f07..203da2e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-c430a5a8a9f762b94e5c1c3b202fe0c1  glibc-2.14-12-g5babac1-fedora.tar.xz
+4f1cbb5c58b8ca754714c65763d54068  glibc-2.14-12-g5babac1-fedora.tar.xz
 96a48cb0acb030c77e224c7748684652  glibc-2.14-12-g5babac1.tar.xz
 05c85905b43021a81318c3aa81718019  glibc-ports-2.14.tar.xz