[glibc/f17] Resolves: #841318 - Remove two extraneous lines from the previous patch for BZ841318.

[Patsy Franklin]

commit 7a23eb4b36a3523f0e40904cc21e8ddbaec5b0f2
Author: Patsy Franklin <pfrankli at redhat.com>
Date:   Fri Aug 3 01:41:39 2012 -0400

    Resolves: #841318
    - Remove two extraneous lines from the previous patch for BZ841318.

 glibc-rh841318-2.patch |   13 +++++++++++++
 glibc.spec             |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/glibc-rh841318-2.patch b/glibc-rh841318-2.patch
new file mode 100644
index 0000000..3c37d3a
--- /dev/null
+++ b/glibc-rh841318-2.patch
@@ -0,0 +1,13 @@
+diff -Nrup a/stdio-common/vfprintf.c b/stdio-common/vfprintf.c
+--- a/stdio-common/vfprintf.c	2012-08-03 00:02:42.253538998 -0400
++++ b/stdio-common/vfprintf.c	2012-08-03 00:50:08.969629495 -0400
+@@ -1682,8 +1682,6 @@ do_positional:
+  	    /* Now set SPECS_MALLOCED if needed.  */
+  	   if (!__libc_use_alloca (nspecs_size))
+  	     specs_malloced = true;
+-	    /* Copy the old array's elements to the new space.  */
+-	    memmove (specs, old, nspecs * sizeof (*specs));
+ 	  }
+ 
+ 	/* Parse the format specifier.  */
+Binary files a/stdio-common/.vfprintf.c.swp and b/stdio-common/.vfprintf.c.swp differ
diff --git a/glibc.spec b/glibc.spec
index 5354682..a4153b8 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 53%{?dist}
+Release: 54%{?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
@@ -96,6 +96,7 @@ Patch0044: %{name}-stap-libm.patch
 
 # Needs to be submitted upstream
 Patch0066:  %{name}-rh841318.patch
+Patch0067:  %{name}-rh841318-2.patch
 
 #
 # Patches from upstream
@@ -499,6 +500,7 @@ popd
 %patch2064 -p1
 %patch2065 -p1
 %patch0066 -p1
+%patch0067 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -1365,6 +1367,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Aug 3 2012 Patsy Franklin <pfrankli at redhat.com> - 2.15.54
+  - Remove two extraneous lines from previous patch for BZ841318 (#841318)
+
 * Wed Jul 26 2012 Jeff Law <law at redhat.com> - 2.15.53
   - Revert patch for BZ696143, it made it impossible to use IPV6
     addresses explicitly in getaddrinfo, which in turn broke