From d4ce7bec6411372296d14a0bbbc52a38069f9319 Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Sat, 15 Sep 2007 20:14:04 +0000
Subject: Add latest upstream patches for Bash. Fixes #2067. Thanks to Matt
 Burgess for the patch.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8371 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter01/whatsnew.xml  | 12 ++++++------
 general.ent             |  4 ++--
 patches.ent             |  6 +++---
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 863511440..70ea60d6e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
     </listitem>
 -->
 
+    <listitem>
+       <para>2007-09-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add latest upstream patches for Bash. Fixes
+          <ulink url="&lfs-ticket-root;2067">#2067</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
      <listitem>
       <para>2007-09-07</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c4ebe02f7..57345bede 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -204,22 +204,22 @@
 
   </itemizedlist>-->
 
-  <!--<itemizedlist>
+  <itemizedlist>
     <title>Added:</title>
 
     <listitem>
-      <para>PLACEHOLDER</para>
+      <para>&bash-fixes-patch;</para>
     </listitem>
 
-  </itemizedlist>-->
+  </itemizedlist>
 
-  <!--<itemizedlist>
+  <itemizedlist>
     <title>Removed:</title>
 
     <listitem>
-      <para>PLACEHOLDER</para>
+      <para>bash-3.2-fixes-5.patch</para>
     </listitem>
 
-  </itemizedlist>-->
+  </itemizedlist>
 
 </sect1>
diff --git a/general.ent b/general.ent
index 960564b9d..a3fefd5c3 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20070907">
-<!ENTITY releasedate "September 07, 2007">
+<!ENTITY version "SVN-20070915">
+<!ENTITY releasedate "September 15, 2007">
 <!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 84422afd8..76711f291 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-5.patch">
-<!ENTITY bash-fixes-patch-md5 "70e2c3983575a8e82f8601a417e126f0">
-<!ENTITY bash-fixes-patch-size "32 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-6.patch">
+<!ENTITY bash-fixes-patch-md5 "b81a6b53cd361b3b2291a762dcba87d0">
+<!ENTITY bash-fixes-patch-size "24 KB">
 
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
-- 
cgit v1.2.3-54-g00ecf