Add latest upstream patches for Bash-4.2. Fixes #2841.

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

6 files changed, 29 insertions, 91 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d5af68297..085554bbc 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
       <para>2011-03-14</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Add latest upstream patches for Bash-4.2. Fixes
+          <ulink url="&lfs-ticket-root;2841">#2841</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Upgrade to M4-1.4.16. Fixes
           <ulink url="&lfs-ticket-root;2840">#2840</ulink>.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 5fce2d47a..cb948a7d5 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -218,103 +218,14 @@
 
   <itemizedlist>
     <title>Added:</title>
-    <listitem><para></para></listitem>  <!-- satify build -->
-  <!--
-    <listitem>
-      <para>bzip2-&bzip2-version;-install_docs-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-&coreutils-version;-i18n-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-&coreutils-version;-uname-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>gcc-&gcc-version;-startfiles_fix-1.patch</para>
-    </listitem>
-
     <listitem>
-      <para>glibc-&glibc-version;-gcc_fix-1.patch</para>
+      <para>bash-&bash-version;-fixes-1.patch</para>
     </listitem>
-
-    <listitem>
-      <para>perl-&perl-version;-libc-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>procps-&procps-version;-fix_HZ_errors-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>xz-&xz-version;</para>
-    </listitem>
-
-    <listitem>
-      <para>util-linux-&util-linux-version;</para>
-    </listitem>
-  -->
-
   </itemizedlist>
 
   <itemizedlist>
     <title>Removed:</title>
-    <listitem><para></para></listitem>  <!-- satify build -->
-  <!--
-    <listitem>
-      <para>bash-4.1-fixes-2.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>bzip2-1.0.5-install_docs-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>bzip2-1.0.5-version_fixes-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-8.5-i18n-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-8.5-uname-2.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>expect-5.44.1.15-no_tk-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>gcc-4.5.1-startfiles_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.12.1-gcc_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.12.1-makefile_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>man-db-2.5.7-fix_man_assertion-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>perl-5.12.1-libc-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>tar-1.23-overflow_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>util-linux-ng-2.18</para>
-    </listitem>
-  -->
+    <listitem><para></para></listitem>  <!-- satisfy build -->
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 39b733043..838067a86 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -19,6 +19,14 @@
   <variablelist role="materials">
 
     <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>
         <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 700e266d2..db5d5b4d7 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -43,6 +43,11 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
+    <para>First, apply the following patch to fix various bugs that have been
+    addressed upstream:</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 bbd645adf..1e92190da 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -40,6 +40,11 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
+    <para>First, apply the following patch to fix various bugs that have been
+    addressed upstream:</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/patches.ent b/patches.ent
index b8ea9d856..ad912d0cf 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,6 +2,11 @@
 
 <!-- Start of Common Patches -->
 
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "abae789c2807cb7c7c4c452fa3986f85">
+<!ENTITY bash-fixes-patch-size "11 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">