[c-ares/f14/master] fix ares_get_servers

[Jakub Hrozek]

commit f42ed598312ac235bd3296f458fd6011edf7d080
Author: Jakub Hrozek <jhrozek at redhat.com>
Date:   Wed Aug 25 10:36:42 2010 +0200

    fix ares_get_servers

 ...-break-that-caused-get_ares_servers-to-fa.patch |   28 ++++++++++++++++++++
 c-ares.spec                                        |    8 +++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Add-missing-break-that-caused-get_ares_servers-to-fa.patch b/0001-Add-missing-break-that-caused-get_ares_servers-to-fa.patch
new file mode 100644
index 0000000..964757d
--- /dev/null
+++ b/0001-Add-missing-break-that-caused-get_ares_servers-to-fa.patch
@@ -0,0 +1,28 @@
+From 293cd3170019015b6ce40f9fa5efc45bd89dad1a Mon Sep 17 00:00:00 2001
+From: Ben Greear <greearb at candelatech.com>
+Date: Tue, 24 Aug 2010 16:48:47 -0700
+Subject: [PATCH] Add missing break that caused get_ares_servers to fail.
+
+Reported-by: Ning Dong <flintning at 163.com>
+Signed-off-by: Ben Greear <greearb at candelatech.com>
+---
+ ares_data.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/ares_data.c b/ares_data.c
+index 6b6fae8..a2477be 100644
+--- a/ares_data.c
++++ b/ares_data.c
+@@ -145,7 +145,8 @@ void *ares_malloc_data(ares_datatype type)
+         ptr->data.addr_node.next = NULL;
+         ptr->data.addr_node.family = 0;
+         memset(&ptr->data.addr_node.addrV6, 0,
+-          sizeof(ptr->data.addr_node.addrV6));
++               sizeof(ptr->data.addr_node.addrV6));
++        break;
+ 
+       default:
+         free(ptr);
+-- 
+1.7.2.1
+
diff --git a/c-ares.spec b/c-ares.spec
index 76a06ec..c9bac31 100644
--- a/c-ares.spec
+++ b/c-ares.spec
@@ -1,7 +1,7 @@
 Summary: A library that performs asynchronous DNS operations
 Name: c-ares
 Version: 1.7.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://c-ares.haxx.se/
@@ -9,6 +9,9 @@ Source0: http://c-ares.haxx.se/c-ares-%{version}.tar.gz
 Source1: LICENSE
 Patch0: %{name}-1.7.0-optflags.patch
 Patch1: c-ares-multilib.patch
+# upstream patches from 1.4 development
+Patch2: 0001-Add-missing-break-that-caused-get_ares_servers-to-fa.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -66,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/ares_*
 
 %changelog
+* Wed Aug 25 2010 Jakub Hrozek <jhrozek at redhat.com> - 1.7.3-2
+- fix ares_get_servers
+
 * Tue Jun 15 2010 Jakub Hrozek <jhrozek at redhat.com> - 1.7.3-1
 - Upgrade to new upstream release 1.7.3 (obsoletes search/domain patch)
 - Fix conflict of -devel packages on multilib architectures (#602880)