Upgrade to Bash-4.0. Fixes #2351.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8821 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

11 files changed, 44 insertions, 44 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 53393c996..d1d801e89 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,16 @@
 -->
 
     <listitem>
+      <para>2009-03-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgraded to Bash-4.0.  Fixes
+          <ulink url="&lfs-ticket-root;2351">#2351</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2009-02-17</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 254c4c9fd..ed1c85029 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -209,7 +209,7 @@
     <title>Added:</title>
 
     <listitem>
-      <para>&bash-fixes-patch;</para>
+      <para>&automake-test-patch;</para>
     </listitem>
 
     <listitem>
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 28d925a1b..e48a909a6 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -42,15 +42,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bash Documentation (&bash-doc-version;) - <token>&bash-doc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bash-doc-home;"/></para>
-        <para>Download: <ulink url="&bash-doc-url;"/></para>
-        <para>MD5 sum: <literal>&bash-doc-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Berkeley DB (&db-version;) - <token>&db-size;</token>:</term>
       <listitem>
         <para>Home page: <ulink url="&db-home;"/></para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6883f27a8..a6eb472a9 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -19,6 +19,14 @@
   <variablelist role="materials">
 
     <varlistentry>
+      <term>Automake Test Fix Patch - <token>&automake-test-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&automake-test-patch;"/></para>
+        <para>MD5 sum: <literal>&automake-test-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Berkeley DB Upstream Fixes Patch - <token>&db-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&db-fixes-patch;"/></para>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 26fe314ee..10dd9988d 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -45,8 +45,7 @@
 
     <para>Prepare Bash for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc \
-   ac_cv_func_working_mktime=yes</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -61,14 +60,6 @@
           more stable.</para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><parameter>ac_cv_func_working_mktime=yes</parameter></term>
-        <listitem>
-          <para>This parameter bypasses the search for mktime in configure
-          and uses the version in glibc. The is necessary due to a change in
-          gcc that has not been incorporated into this package yet.</para>
-        </listitem>
-      </varlistentry>
 
     </variablelist>
 
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 4d50b9637..8147bc6c6 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,6 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
+    <para>Fix a bug in the testsuite that can lead to a spurious failure:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&automake-test-patch;</userinput></screen>
+
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 281ce99ca..98d966c06 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -40,23 +40,23 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
-    <para>If you downloaded the Bash documentation tarball and wish to install
-    HTML documentation, issue the following commands:</para>
-
-<screen><userinput remap="pre">tar -xvf ../bash-doc-&bash-doc-version;.tar.gz
-sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
-    Makefile.in</userinput></screen>
-
     <para>Prepare Bash for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc \
-    --with-installed-readline ac_cv_func_working_mktime=yes</userinput></screen>
+    --htmldir=/usr/share/doc/bash-&bash-version; --without-bash-malloc \
+    --with-installed-readline</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
+        <term><parameter>--htmldir</parameter></term>
+        <listitem>
+          <para>This option designates the directory into which HTML formatted
+          documentation will be installed.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
         <term><parameter>--with-installed-readline</parameter></term>
         <listitem>
           <para>This option tells Bash to use the <filename
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index c02a73728..2815a7242 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -36,12 +36,12 @@
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="grep.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libtool.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="perl.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="autoconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="automake.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bash.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bzip2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="diffutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="file.xml"/>
diff --git a/general.ent b/general.ent
index c35c12cf9..291092005 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090306">
-<!ENTITY releasedate "March 6, 2009">
+<!ENTITY version "SVN-200903011">
+<!ENTITY releasedate "March 11, 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/packages.ent b/packages.ent
index 77285a5f9..9f720bdde 100644
--- a/packages.ent
+++ b/packages.ent
@@ -23,20 +23,15 @@
 <!ENTITY automake-ch6-du "7.9 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY bash-version "3.2.48">
-<!ENTITY bash-size "2,482 KB">
+<!ENTITY bash-version "4.0">
+<!ENTITY bash-size "6,085 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "2f619b9499882aa9d142f0d51e27ce9a">
+<!ENTITY bash-md5 "a90a1b5a6db4838483f05438e05e8eb9">
 <!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 "3.2">
-<!ENTITY bash-doc-size "2,143 KB">
-<!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
-<!ENTITY bash-doc-md5 "0e904cb46ca873fcfa65df19b024bec9">
-<!ENTITY bash-doc-home " ">
 
 <!ENTITY binutils-version "2.19.1">
 <!ENTITY binutils-size "15,865 KB">
diff --git a/patches.ent b/patches.ent
index 3c8cefa3e..22f4f0166 100644
--- a/patches.ent
+++ b/patches.ent
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
 <!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-9.patch">
-<!ENTITY bash-fixes-patch-md5 "b575f9ef3936fe794f39e961ff6aa03c">
-<!ENTITY bash-fixes-patch-size "75 KB">
+
+<!ENTITY automake-test-patch "automake-&automake-version;-test_fix-1.patch">
+<!ENTITY automake-test-patch-md5 "58f56fad6fbbcbc3b193761487d8e573">
+<!ENTITY automake-test-patch-size "1.2 KB">
 
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">