From 6e61a8c0c4d2a5ffe3be41413201f3071866cec9 Mon Sep 17 00:00:00 2001
From: Roman Rakus <rrakus@redhat.com>
Date: Mar 31 2011 14:44:53 +0000
Subject: Remove bash-4.2-xdupmbstowcs2-patch, which introduced another bugs


Signed-off-by: Roman Rakus <rrakus@redhat.com>

---

diff --git a/bash-4.2-xdupmbstowcs2-patch b/bash-4.2-xdupmbstowcs2-patch
deleted file mode 100644
index a16e477..0000000
--- a/bash-4.2-xdupmbstowcs2-patch
+++ /dev/null
@@ -1,19 +0,0 @@
-*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c	2010-05-30 18:36:27.000000000 -0400
---- lib/glob/xmbsrtowcs.c	2011-03-14 14:22:11.000000000 -0400
-***************
-*** 174,180 ****
-        wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state);
-  
-        /* Conversion failed. */
-!       if (wcslength == (size_t)-1)
-  	{
-  	  free (wsbuf);
-  	  *destp = NULL;
---- 174,180 ----
-        wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state);
-  
-        /* Conversion failed. */
-!       if (wcslength == 0 || wcslength == (size_t)-1)
-  	{
-  	  free (wsbuf);
-  	  *destp = NULL;
diff --git a/bash.spec b/bash.spec
index c42235d..b1396b4 100644
--- a/bash.spec
+++ b/bash.spec
@@ -6,7 +6,7 @@
 Version: %{baseversion}%{patchleveltag}
 Name: bash
 Summary: The GNU Bourne Again shell
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Shells
 License: GPLv3+
 Url: http://www.gnu.org/software/bash
@@ -63,9 +63,6 @@ Patch120: bash-4.2-rc2-logout.patch
 # Static analyzis shows some issues in bash-2.05a-interpreter.patch
 Patch121: bash-4.2-coverity.patch
 
-# 684293, Fix the infinite loop with invalid wide char
-Patch122: bash-4.2-xdupmbstowcs2-patch
-
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: texinfo bison
@@ -124,7 +121,6 @@ This package contains documentation files for %{name}.
 %patch119 -p1 -b .broken_pipe
 %patch120 -p1 -b .logout
 %patch121 -p1 -b .coverity
-%patch122 -p0 -b .xdupmbstowcs2
 
 echo %{version} > _distribution
 echo %{release} > _patchlevel
@@ -312,6 +308,9 @@ end
 #%doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
+* Thu Mar 31 2011 Roman Rakus <rrakus@redhat.com> - 4.2.8-2
+- Remove bash-4.2-xdupmbstowcs2-patch, which introduced another bugs
+
 * Tue Mar 15 2011 Roman Rakus <rrakus@redhat.com> - 4.2.8-1
 - Patchlevel 8