[glibc/f17] Resolves: 804630 - Fix option rotate with single IPV6 server (#804630)

[Patsy Franklin]

commit ef1896c59a660b074f942a9915247fb644c1b498
Author: Patsy Franklin <pfrankli at redhat.com>
Date:   Thu Jun 7 20:27:45 2012 -0400

    Resolves: 804630
    - Fix option rotate with single IPV6 server (#804630)

 glibc-rh804630.patch |   23 +++++++++++++++++++++++
 glibc.spec           |    9 ++++++++-
 2 files changed, 31 insertions(+), 1 deletions(-)
---
diff --git a/glibc-rh804630.patch b/glibc-rh804630.patch
new file mode 100644
index 0000000..75dbe94
--- /dev/null
+++ b/glibc-rh804630.patch
@@ -0,0 +1,23 @@
+diff -rup c/resolv/res_send.c d/resolv/res_send.c
+--- c/resolv/res_send.c	2012-01-01 05:16:32.000000000 -0700
++++ d/resolv/res_send.c	2012-03-30 12:39:30.862467628 -0600
+@@ -409,6 +409,7 @@ __libc_res_nsend(res_state statp, const
+ 	 */
+ 	if (EXT(statp).nsinit == 0) {
+ 		unsigned char map[MAXNS];
++		unsigned int ext_total_nscount;
+ 
+ 		memset (map, MAXNS, sizeof (map));
+ 		for (n = 0; n < MAXNS; n++) {
+@@ -422,8 +423,9 @@ __libc_res_nsend(res_state statp, const
+ 			}
+ 		}
+ 		n = statp->nscount;
+-		if (statp->nscount > EXT(statp).nscount)
+-			for (n = EXT(statp).nscount, ns = 0;
++		ext_total_nscount = EXT(statp).nscount + EXT(statp).nscount6;
++		if (statp->nscount > ext_total_nscount)
++			for (n = ext_total_nscount, ns = 0;
+ 			     n < statp->nscount; n++) {
+ 				while (ns < MAXNS
+ 				       && EXT(statp).nsmap[ns] != MAXNS)
diff --git a/glibc.spec b/glibc.spec
index ddb363a..698916b 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 43%{?dist}
+Release: 44%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -203,6 +203,9 @@ Patch2058: %{name}-rh823905.patch
 # See http://sourceware.org/ml/libc-alpha/2012-06/msg00074.html
 Patch2059: %{name}-rh767693-2.patch
 
+# Upstream BZ 13027
+Patch2060: %{name}-rh804630.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
 Obsoletes: nss_db
@@ -481,6 +484,7 @@ popd
 %patch2057 -p1
 %patch2058 -p1
 %patch2059 -p1
+%patch2060 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -1333,6 +1337,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Thu Jun  7 2012 Patsy Franklin <patsy at redhat.com> - 2.15.44
+  - Fix option rotate with single IPV6 server (#804630)
+
 * Thu Jun  7 2012 Patsy Franklin <patsy at redhat.com> - 2.15.43
   - Do not override TTL of CNAME with TTL of its alias. (#808014)