From b5c8c82ea1959472c861af9d1a460d72e694e65b Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 10 May 2009 11:54:49 +0000
Subject: [PATCH] Use latest upstream Bash patches.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8854 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 9 +++++++++
 chapter03/patches.xml   | 8 ++++++++
 chapter05/bash.xml      | 5 +++++
 chapter06/bash.xml      | 5 +++++
 general.ent             | 4 ++--
 patches.ent             | 5 +++++
 6 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ba2f5fab4..bd4a5d0a7 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,15 @@
 
 -->
 
+    <listitem>
+      <para>2009-05-10</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add upstream Bash fixes patch.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2009-04-27</para>
       <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index d7b522570..ee33ec8d7 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -34,6 +34,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 10dd9988d..e3245f2cb 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -43,6 +43,11 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
+    <para>Apply fixes for several bugs discovered since the initial release of
+    Bash-&bash-version;:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 98d966c06..345cafe25 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -40,6 +40,11 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
+    <para>Apply fixes for several bugs discovered since the initial release of
+    Bash-&bash-version;:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \
diff --git a/general.ent b/general.ent
index eeda8d435..8caf6b0fc 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090427">
-<!ENTITY releasedate "April  27, 2009">
+<!ENTITY version "SVN-20090510">
+<!ENTITY releasedate "May 10, 2009">
 <!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index d519b3b86..d56212240 100644
--- a/patches.ent
+++ b/patches.ent
@@ -7,6 +7,11 @@
 <!ENTITY automake-test-patch-size "1.2 KB">
 
 
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "d498afc3d31fa1aa529ad027c2bb7e5d">
+<!ENTITY bash-fixes-patch-size "25 KB">
+
+
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">