Author: aurel32
Date: 2015-12-02 23:05:46 +0000 (Wed, 02 Dec 2015)
New Revision: 6747
Removed:
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/patches/series
Log:
debian/patches/any/submitted-resolv-ipv6-nameservers.diff: drop, now
useless.
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 23:01:32 UTC
(rev 6746)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 23:05:46 UTC
(rev 6747)
@@ -17,6 +17,8 @@
* debian/rules.d/build.mk: abort if the log file does not contain any
testsuite result.
* debian/patches/localedata/submitted-locale-bo.diff: drop, now useless.
+ * debian/patches/any/submitted-resolv-ipv6-nameservers.diff: drop, now
+ useless.
-- Aurelien Jarno <aure...@debian.org> Wed, 02 Dec 2015 01:10:00 +0100
Deleted:
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
===================================================================
---
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
2015-12-02 23:01:32 UTC (rev 6746)
+++
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
2015-12-02 23:05:46 UTC (rev 6747)
@@ -1,30 +0,0 @@
-2014-06-13 Aurelien Jarno <aurel...@aurel32.net>
-
- [BZ #17053]
- * resolv/res_send.c (__libc_res_nsend): Check for both IPv4 and
- IPv6 name servers before ignoring the request.
- (send_dg): Check for both IPv4 and IPv6 name servers to compute
- time for the total operation.
-
-diff --git a/resolv/res_send.c b/resolv/res_send.c
-index af42b8a..82242bd 100644
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -347,7 +347,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int
buflen,
- {
- int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
-
-- if (statp->nscount == 0) {
-+ if ((statp->nscount + EXT(statp).nscount6) == 0) {
- __set_errno (ESRCH);
- return (-1);
- }
-@@ -1013,7 +1013,7 @@ send_dg(res_state statp,
- */
- int seconds = (statp->retrans << ns);
- if (ns > 0)
-- seconds /= statp->nscount;
-+ seconds /= (statp->nscount + EXT(statp).nscount6);
- if (seconds <= 0)
- seconds = 1;
- bool single_request_reopen = (statp->options & RES_SNGLKUPREOP) != 0;
Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-02
23:01:32 UTC (rev 6746)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-12-02
23:05:46 UTC (rev 6747)
@@ -235,6 +235,5 @@
any/local-libpic.diff
any/local-bootstrap-headers.diff
any/submitted-argp-attribute.diff
-any/submitted-resolv-ipv6-nameservers.diff
any/local-static-dlopen-search-path.diff
any/local-math-logb.diff
