From 103104699f694123316875b35804e3d0a599be91 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Fri, 21 May 2010 22:31:57 +0000
Subject: Add latest upstream patches for Bash. Fixes #2665.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9280 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 2 +-
 patches.ent             | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 565f75b50..1a9800a68 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2010-05-21</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Added latest upstream patches for Bash.  Fixes
+          <ulink url="&lfs-ticket-root;2665">#2665</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to MPC-0.8.2. Fixes
           <ulink url="&lfs-ticket-root;2664">#2664</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index da22b87b8..21ac6e333 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -214,7 +214,7 @@
     <title>Added:</title>
 
     <listitem>
-      <para>bash-4.1-fixes-1.patch</para>
+      <para>bash-4.1-fixes-2.patch</para>
     </listitem>
 
     <listitem>
diff --git a/patches.ent b/patches.ent
index 5733e11c3..84634f86c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,9 +2,9 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
-<!ENTITY bash-fixes-patch-md5 "677396905ccdbc9dbe72745fd73f4bae">
-<!ENTITY bash-fixes-patch-size "3.8 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-2.patch">
+<!ENTITY bash-fixes-patch-md5 "7813f0e42d41dc4443dc3d161ad24987">
+<!ENTITY bash-fixes-patch-size "5.1 KB">
 
 
 <!ENTITY bison-gcc-patch "bison-&bison-version;-gcc-1.patch">
-- 
cgit v1.2.3-54-g00ecf