r4279 - in glibc-package/branches/eglibc-2.11/debian: . patches patches/any
Author: aurel32
Date: 2010-05-24 16:18:37 +0000 (Mon, 24 May 2010)
New Revision: 4279
Removed:
glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff
Modified:
glibc-package/branches/eglibc-2.11/debian/changelog
glibc-package/branches/eglibc-2.11/debian/patches/series
Log:
- Remove debian/patches/any/submitted-gethostbyname3.diff (merged)
Modified: glibc-package/branches/eglibc-2.11/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/changelog 2010-05-24 15:57:30 UTC (rev 4278)
+++ glibc-package/branches/eglibc-2.11/debian/changelog 2010-05-24 16:18:37 UTC (rev 4279)
@@ -26,8 +26,9 @@
- Update debian/patches/any/local-libgcc-compat-main.diff
- Remove debian/patches/any/submitted-confname.h.diff (merged)
- Remove debian/patches/any/submitted-getent-gshadow.diff (merged)
+ - Remove debian/patches/any/submitted-getaddrinfo-nodata.diff (merged)
+ - Remove debian/patches/any/submitted-gethostbyname3.diff (merged)
- Update debian/patches/any/submitted-missing-etc-hosts.diff.
- - Remove debian/patches/any/submitted-getaddrinfo-nodata.diff (merged)
- Remove debian/patches/arm/cvs-setjmp-longjmp-fpu.diff (merged)
- Update debian/patches/hppa/cvs-nptl-compat.diff.
- Update debian/patches/hppa/local-stack-grows-up.diff from
Deleted: glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff 2010-05-24 15:57:30 UTC (rev 4278)
+++ glibc-package/branches/eglibc-2.11/debian/patches/any/submitted-gethostbyname3.diff 2010-05-24 16:18:37 UTC (rev 4279)
@@ -1,18 +0,0 @@
-2009-11-24 Aurelien Jarno <aurelien@aurel32.net>
-
- * resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname3_r): Return an
- error for ETIMEDOUT.
-
-diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index 818a40a..1eba413 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -204,7 +204,7 @@ _nss_dns_gethostbyname3_r (const char *name, int af, struct hostent *result,
- h_errno = TRY_AGAIN;
- }
- else
-- status = (errno == ECONNREFUSED
-+ status = ((errno == ECONNREFUSED || errno == ETIMEDOUT)
- ? NSS_STATUS_UNAVAIL : NSS_STATUS_NOTFOUND);
- *h_errnop = h_errno;
- if (h_errno == TRY_AGAIN)
Modified: glibc-package/branches/eglibc-2.11/debian/patches/series
===================================================================
--- glibc-package/branches/eglibc-2.11/debian/patches/series 2010-05-24 15:57:30 UTC (rev 4278)
+++ glibc-package/branches/eglibc-2.11/debian/patches/series 2010-05-24 16:18:37 UTC (rev 4279)
@@ -215,7 +215,6 @@
any/submitted-localedef-mmap.diff
any/submitted-missing-etc-hosts.diff
any/submitted-bits-fcntl_h-at.diff
-any/submitted-gethostbyname3.diff
any/local-ntp-update.diff
#any/cvs-futimens.diff
any/cvs-resolv-bindv6only.diff
Reply to: