From 6e786a29d580f47935d4fdda35b1f58a12f2cb7f Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 28 Oct 2006 22:06:22 +0000
Subject: Upgrade to Bash-3.2

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7837 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  5 +++++
 chapter01/whatsnew.xml  | 10 ++++++++--
 chapter03/patches.xml   |  6 +++---
 chapter05/bash.xml      |  6 +++---
 chapter06/bash.xml      |  6 +++---
 packages.ent            | 10 +++++-----
 patches.ent             |  6 +++---
 7 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 44c54b6cc..692964a83 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2006-10-28</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Bash-3.2, including dropping the current
+          &quot;fixes&quot; patch and adding a patch from upstream that fixes a
+          bug when parsing comments.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Automake-1.10.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 4e3900cef..ed343842a 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -28,9 +28,9 @@
     <listitem>
       <para>Automake &automake-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Bash &bash-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Berkeley DB &db-version;</para>
     </listitem>-->
@@ -201,6 +201,9 @@
   <itemizedlist>
     <title>Added:</title>
 
+    <listitem>
+      <para>&bash-comment-patch;</para>
+    </listitem>
     <listitem>
       <para>&linux-unifdef-patch;</para>
     </listitem>
@@ -212,6 +215,9 @@
   <itemizedlist>
     <title>Removed:</title>
 
+    <listitem>
+      <para>bash-3.1-fixes-8.patch </para>
+    </listitem>
     <listitem>
       <para>glibc-2.3.6-inotify-1.patch </para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 5268eb9f5..9d6b4cc1f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -19,10 +19,10 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
+      <term>Bash Comment Parser Patch - <token>&bash-comment-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>
+        <para>Download: <ulink url="&patches-root;&bash-comment-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-comment-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 87093c89b..eb04334bf 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -37,10 +37,10 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
-    <para>Upstream developers have fixed several issues since the initial
-    release of Bash-&bash-version;.  Apply those fixes:</para>
+    <para>Apply a fix for a bug that causes some comments to be parsed
+    incorrectly:</para>
 
-<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-comment-patch;</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 53ea0a66b..f1e8ab475 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -41,10 +41,10 @@
 sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
     Makefile.in</userinput></screen>
 
-    <para>Upstream developers have fixed several issues since the initial
-     release of Bash-&bash-version;.  Apply those fixes:</para>
+    <para>Apply a fix for a bug that causes some comments to be parsed
+    incorrectly:</para>
 
-<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+<screen><userinput>patch -Np1 -i ../&bash-comment-patch;</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>
 
diff --git a/packages.ent b/packages.ent
index e48b96331..8e01a6c0e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -23,19 +23,19 @@
 <!ENTITY automake-ch6-du "7.9 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY bash-version "3.1">
-<!ENTITY bash-size "2,475 KB">
+<!ENTITY bash-version "3.2">
+<!ENTITY bash-size "2,471 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "ef5304c4b22aaa5088972c792ed45d72">
+<!ENTITY bash-md5 "00bfa16d58e034e3c2aa27f390390d30">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-ch5-du "22 MB">
 <!ENTITY bash-ch5-sbu "0.4 SBU">
 <!ENTITY bash-ch6-du "25.8 MB">
 <!ENTITY bash-ch6-sbu "0.4 SBU">
 <!ENTITY bash-doc-version "&bash-version;">
-<!ENTITY bash-doc-size "2,013 KB">
+<!ENTITY bash-doc-size "2,143 KB">
 <!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
-<!ENTITY bash-doc-md5 "a8c517c6a7b21b8b855190399c5935ae">
+<!ENTITY bash-doc-md5 "0e904cb46ca873fcfa65df19b024bec9">
 <!ENTITY bash-doc-home " ">
 
 <!ENTITY binutils-version "2.17">
diff --git a/patches.ent b/patches.ent
index bdffa2fdf..e4225de09 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-8.patch">
-<!ENTITY bash-fixes-patch-md5 "bc337045fa4c5839babf0306cc9df6d0">
-<!ENTITY bash-fixes-patch-size "23 KB">
+<!ENTITY bash-comment-patch "bash-&bash-version;-parse_comment-1.patch">
+<!ENTITY bash-comment-patch-md5 "6420d890711431ebeb63b5a9f3d9764d">
+<!ENTITY bash-comment-patch-size "1.5 KB">
 
 
 <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch">
-- 
cgit v1.2.3-54-g00ecf