From 0e9bf8be6ad883928185ec216c38ea406fdd1edf Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Fri, 17 Feb 2012 11:17:21 -0700
Subject: [PATCH] Fixup 730856 bits

---
 glibc-rh730856.patch | 2 +-
 glibc.spec           | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/glibc-rh730856.patch b/glibc-rh730856.patch
index 0010c19..14270ed 100644
--- a/glibc-rh730856.patch
+++ b/glibc-rh730856.patch
@@ -26,7 +26,7 @@ diff -rup a/resolv/res_query.c b/resolv/res_query.c
 +	if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
  	  {
 -	    /* Special case of partial answer.  */
--	    assert (n == 0 || hp != hp2);
+-	    assert (hp != hp2);
 -	    hp = hp2;
 +	    hp2 = hp;
  	  }
diff --git a/glibc.spec b/glibc.spec
index 812c477..acad7b4 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -49,7 +49,7 @@ Patch2: %{name}-ia64-lib64.patch
 Patch3: %{name}-rh757881.patch
 # From upstream.
 Patch4: %{name}-rh740506.patch
-# Not sure of upstream status
+# Aurelien submitted upstream, Uli has largely ignored
 Patch5: %{name}-rh730856.patch
 # Reverting an upstream patch.  I don't think this has been discussed upstream yet.
 # Caused a variety of problems for Fedora & Debian
@@ -92,10 +92,8 @@ Patch28: %{name}-rh790292.patch
 Patch29: %{name}-rh790298.patch
 # Submitted upstream BZ 13698
 Patch30: %{name}-rh791161.patch
-# Aurelien submitted upstream, Uli has largely ignored
-Patch31 : %{name}-rh730856.patch
 # Submitted upstream BZ 12377
-Patch32 : %{name}-rh697149.patch
+Patch31 : %{name}-rh697149.patch
 
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -346,7 +344,6 @@ rm -rf %{glibcportsdir}
 %patch29 -p1
 %patch30 -p1
 %patch31 -p1
-%patch32 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at