Author: aurel32 Date: 2009-05-05 07:45:53 +0000 (Tue, 05 May 2009) New Revision: 3451
Added: glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-broken-dns.diff Modified: glibc-package/branches/eglibc-2.9/debian/changelog glibc-package/branches/eglibc-2.9/debian/patches/any/cvs-broken-dns.diff glibc-package/branches/eglibc-2.9/debian/patches/hurd-i386/local-pthread_posix-option.diff glibc-package/branches/eglibc-2.9/debian/patches/kfreebsd/local-sys_queue_h.diff glibc-package/branches/eglibc-2.9/debian/patches/series Log: merge changes from trunk, revisions 3438-3450 Modified: glibc-package/branches/eglibc-2.9/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.9/debian/changelog 2009-05-05 06:02:28 UTC (rev 3450) +++ glibc-package/branches/eglibc-2.9/debian/changelog 2009-05-05 07:45:53 UTC (rev 3451) @@ -17,6 +17,22 @@ -- Aurelien Jarno <[email protected]> Mon, 04 May 2009 17:38:04 +0200 +glibc (2.9-10) unstable; urgency=low + + [ Samuel Thibault ] + * hurd-i386/local-pthread_posix-option.diff: Set _POSIX_TIMEOUTS to 200112 + too, to fix gthread compilation in gcc-4.4 + + [ Petr Salinger ] + * fix up GNU/kFreeBSD specific macro LIST_FOREACH_SAFE. + + [ Aurelien Jarno ] + * any/cvs-broken-dns.diff: backport more parts from upstream. + * any/submitted-broken-dns.diff: new patch to not raise an error if one + query returns NOTIMP or FORMERR and the other NOERROR. Closes: #526823. + + -- Aurelien Jarno <[email protected]> Tue, 05 May 2009 01:39:50 +0200 + glibc (2.9-9) unstable; urgency=low * mips/cvs-context.diff: add missing part from upstream. @@ -37,7 +53,7 @@ UTF-16 surrogates in iconv. Closes: #525299. * any/local-getaddrinfo-interface.diff: ignore addresses with no interface assigned while sorting with rule 7. Closes: #521439. - * any/cvs-broken_dns.diff: new patch from CVS to provide a fallback for + * any/cvs-broken-dns.diff: new patch from CVS to provide a fallback for broken DNS server while doing unified IPv4/IPv6 requests. The first lookup will be slow, but subsequent requests will fallback to the previous behaviour. This can be enabled by default by setting 'single-request' in Modified: glibc-package/branches/eglibc-2.9/debian/patches/any/cvs-broken-dns.diff =================================================================== --- glibc-package/branches/eglibc-2.9/debian/patches/any/cvs-broken-dns.diff 2009-05-05 06:02:28 UTC (rev 3450) +++ glibc-package/branches/eglibc-2.9/debian/patches/any/cvs-broken-dns.diff 2009-05-05 07:45:53 UTC (rev 3451) @@ -13,6 +13,17 @@ only get one reply before timeout switch to mode where we send the second request only after the first answer has been received +2008-12-29 Ulrich Drepper <[email protected]> + + * sysdeps/posix/getaddrinfo.c (gaih_inet): When the + gethostbyname4_r function call succeeded, just leave the loop. + +2008-12-02 Ulrich Drepper <[email protected]> + + * sysdeps/posix/getaddrinfo.c (gaih_inet): In case we use + gethostbyname4_r, we don't have a separate IPv6 status, so copy + the no_data variable. + diff --git a/resolv/res_send.c b/resolv/res_send.c index f75a26e..25a854f 100644 --- a/resolv/res_send.c @@ -119,3 +130,25 @@ #define RES_DEFAULT (RES_RECURSE|RES_DEFNAMES|RES_DNSRCH|RES_NOIP6DOTINT) +diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c +index 72fbdb0..d346c62 100644 +--- a/sysdeps/posix/getaddrinfo.c ++++ b/sysdeps/posix/getaddrinfo.c +@@ -714,6 +714,8 @@ gaih_inet (const char *name, const struct gaih_service *service, + status = DL_CALL_FCT (fct4, (name, pat, tmpbuf, + tmpbuflen, &rc, &herrno, + NULL)); ++ if (status == NSS_STATUS_SUCCESS) ++ break; + if (status != NSS_STATUS_TRYAGAIN + || rc != ERANGE || herrno != NETDB_INTERNAL) + { +@@ -733,6 +735,8 @@ gaih_inet (const char *name, const struct gaih_service *service, + tmpbuflen, 2 * tmpbuflen); + } + ++ no_inet6_data = no_data; ++ + if (status == NSS_STATUS_SUCCESS) + { + if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL) Added: glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-broken-dns.diff =================================================================== --- glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-broken-dns.diff (rev 0) +++ glibc-package/branches/eglibc-2.9/debian/patches/any/submitted-broken-dns.diff 2009-05-05 07:45:53 UTC (rev 3451) @@ -0,0 +1,18 @@ +2009-05-05 Aurelien Jarno <[email protected]> + + * resolv/res_query.c (__libc_res_nquery): If one query returns NOTIMP + or FORMERR and the other NOERROR, don't raise an error. + +--- a/resolv/res_query.c ++++ b/resolv/res_query.c +@@ -289,6 +289,10 @@ __libc_res_nquery(res_state statp, + break; + case FORMERR: + case NOTIMP: ++ if ((hp->rcode == NOERROR && ntohs (hp->ancount) != 0) ++ || (hp2->rcode == NOERROR ++ && ntohs (hp2->ancount) != 0)) ++ goto success; + case REFUSED: + default: + RES_SET_H_ERRNO(statp, NO_RECOVERY); Modified: glibc-package/branches/eglibc-2.9/debian/patches/hurd-i386/local-pthread_posix-option.diff =================================================================== --- glibc-package/branches/eglibc-2.9/debian/patches/hurd-i386/local-pthread_posix-option.diff 2009-05-05 06:02:28 UTC (rev 3450) +++ glibc-package/branches/eglibc-2.9/debian/patches/hurd-i386/local-pthread_posix-option.diff 2009-05-05 07:45:53 UTC (rev 3451) @@ -7,12 +7,25 @@ --- a/sysdeps/mach/hurd/bits/posix_opt.h +++ b/sysdeps/mach/hurd/bits/posix_opt.h -@@ -62,7 +62,7 @@ +@@ -61,8 +61,8 @@ + #undef _POSIX_SYNC_IO /* File supports O_SYNC et al? */ - /* We do not have the POSIX threads interface. */ +-/* We do not have the POSIX threads interface. */ -#define _POSIX_THREADS -1 ++/* Tell we have POSIX threads. */ +#define _POSIX_THREADS 200112L /* We have the reentrant functions described in POSIX. */ #define _POSIX_REENTRANT_FUNCTIONS 1 +@@ -108,8 +108,8 @@ + /* We have a POSIX shell. */ + #define _POSIX_SHELL 1 + +-/* We cannot support the Timeouts option without _POSIX_THREADS. */ +-#define _POSIX_TIMEOUTS -1 ++/* We support the Timeouts option. */ ++#define _POSIX_TIMEOUTS 200112L + + /* The `spawn' function family is supported. */ + #define _POSIX_SPAWN 200809L Modified: glibc-package/branches/eglibc-2.9/debian/patches/kfreebsd/local-sys_queue_h.diff =================================================================== --- glibc-package/branches/eglibc-2.9/debian/patches/kfreebsd/local-sys_queue_h.diff 2009-05-05 06:02:28 UTC (rev 3450) +++ glibc-package/branches/eglibc-2.9/debian/patches/kfreebsd/local-sys_queue_h.diff 2009-05-05 07:45:53 UTC (rev 3451) @@ -18,7 +18,7 @@ (var) = ((var)->field.le_next)) +#define LIST_FOREACH_SAFE(var, head, field, tvar) \ -+ for (((var) = ((head)->lh_first); \ ++ for ((var) = ((head)->lh_first); \ + (var) && ((tvar) = ((var)->field.le_next), 1); \ + (var) = (tvar)) + Modified: glibc-package/branches/eglibc-2.9/debian/patches/series =================================================================== --- glibc-package/branches/eglibc-2.9/debian/patches/series 2009-05-05 06:02:28 UTC (rev 3450) +++ glibc-package/branches/eglibc-2.9/debian/patches/series 2009-05-05 07:45:53 UTC (rev 3451) @@ -204,3 +204,4 @@ any/submitted-cross-zic.diff any/submitted-nss-nsswitch.diff any/submitted-install-map-files.diff +any/submitted-broken-dns.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
