rpm/glibc
SHA256
1
0
Fork 0
forked from pool/glibc
Code Pull Requests Activity

Accepting request 142601 from home:matz2:branches:Base:System

Browse Source 
- Fix getaddrinfo-ipv6-sanity.diff to apply again.

OBS-URL: https://build.opensuse.org/request/show/142601
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=231
This commit is contained in:
Andreas Jaeger 2012-11-23 15:16:20 +00:00 committed by Git OBS Bridge
parent de8414d511
commit 554abb20de
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
getaddrinfo-ipv6-sanity.diff
View File

@ -1,8 +1,8 @@
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c Index: glibc-2.16.90/sysdeps/posix/getaddrinfo.c
index 1a023f9..c8af8b9 100644 ===================================================================
--- a/sysdeps/posix/getaddrinfo.c --- glibc-2.16.90.orig/sysdeps/posix/getaddrinfo.c 2012-11-20 03:45:45.000000000 +0100
+++ b/sysdeps/posix/getaddrinfo.c +++ glibc-2.16.90/sysdeps/posix/getaddrinfo.c 2012-11-23 15:32:33.000000000 +0100
@@ -269,7 +269,7 @@ extern service_user *__nss_hosts_database attribute_hidden; @@ -269,7 +269,7 @@ extern service_user *__nss_hosts_databas
static int static int
gaih_inet (const char *name, const struct gaih_service *service, gaih_inet (const char *name, const struct gaih_service *service,
const struct addrinfo *req, struct addrinfo **pai, const struct addrinfo *req, struct addrinfo **pai,
@ -11,10 +11,10 @@ index 1a023f9..c8af8b9 100644
{ {
const struct gaih_typeproto *tp = gaih_inet_typeproto; const struct gaih_typeproto *tp = gaih_inet_typeproto;
struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv; struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
@@ -832,7 +832,10 @@ gaih_inet (const char *name, const struct gaih_service *service, @@ -839,7 +839,10 @@ gaih_inet (const char *name, const struc
no_data = 0; if (req->ai_family == PF_UNSPEC)
nss_gethostbyname4_r fct4 fct4 = __nss_lookup_function (nip, "gethostbyname4_r");
= __nss_lookup_function (nip, "gethostbyname4_r");
- if (fct4 != NULL) - if (fct4 != NULL)
+ /* If we don't want ipv6, don't use gethostbyname4_r, + /* If we don't want ipv6, don't use gethostbyname4_r,
+ as it's using T_UNSPEC to libc_res_nsearch, which always + as it's using T_UNSPEC to libc_res_nsearch, which always
@ -23,7 +23,7 @@ index 1a023f9..c8af8b9 100644
{ {
int herrno; int herrno;
@@ -935,7 +938,7 @@ gaih_inet (const char *name, const struct gaih_service *service, @@ -942,7 +945,7 @@ gaih_inet (const char *name, const struc
if (fct != NULL) if (fct != NULL)
{ {
if (req->ai_family == AF_INET6 if (req->ai_family == AF_INET6
@ -32,7 +32,7 @@ index 1a023f9..c8af8b9 100644
{ {
gethosts (AF_INET6, struct in6_addr); gethosts (AF_INET6, struct in6_addr);
no_inet6_data = no_data; no_inet6_data = no_data;
@@ -2418,7 +2421,11 @@ getaddrinfo (const char *name, const char *service, @@ -2462,7 +2465,11 @@ getaddrinfo (const char *name, const cha
if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET
|| hints->ai_family == AF_INET6) || hints->ai_family == AF_INET6)
{ {

5
glibc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Nov 23 14:33:37 UTC 2012 - matz@suse.com
- Fix getaddrinfo-ipv6-sanity.diff to apply again.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 20 08:06:49 UTC 2012 - aj@suse.de Tue Nov 20 08:06:49 UTC 2012 - aj@suse.de

2
glibc.spec
View File

@ -466,7 +466,7 @@ rm nscd/s-stamp
%patch300 -p1 %patch300 -p1
%patch301 -p1 %patch301 -p1
#%patch302 -p1 %patch302 -p1
%patch304 -p1 %patch304 -p1
%patch305 -p1 %patch305 -p1
%patch306 -p1 %patch306 -p1