Merged latest change from trunk.

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@10831 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

5 files changed, 21 insertions, 9 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a12953e13..fb79877b5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,12 @@
       <para>2015-02-06</para>
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Add bash patches through patch-033.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update mpfr patches through patch-11.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to util-linux-2.26-rc2. Intermediate 
           fix prior to stable util-linux-2.26.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 4c4b33fd9..e65088835 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -239,11 +239,13 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <!--
     <listitem>
       <para>&bash-fixes-patch;</para>
     </listitem>
-    -->
+
+    <listitem>
+      <para>&mpfr-fixes-patch;</para>
+    </listitem>
 
     <listitem>
       <para>&perl-fix-patch;</para>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 5ee89419d..8f65d70b4 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -17,7 +17,7 @@
   needed to build an LFS system:</para>
 
   <variablelist role="materials">
-<!--
+
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
@@ -25,7 +25,7 @@
         <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
     <varlistentry>
       <term>Bc Memory Leak Patch - <token>&bc-memory-leak-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 2756e35e9..72e36e32a 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -39,12 +39,12 @@
 
   <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                    \
diff --git a/patches.ent b/patches.ent
index 748b847b5..4d3df5f6b 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,6 +2,10 @@
 
 <!-- Start of Common Patches -->
 
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "e2571929a43fdf76ae1eb683fe86b5c0">
+<!ENTITY bash-fixes-patch-size "8.8 KB">
+
 <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch">
 <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8">
 <!ENTITY bc-memory-leak-patch-size "1.4 KB">
@@ -22,9 +26,9 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-2.patch">
-<!ENTITY mpfr-fixes-patch-md5 "2b2aa4371a4e848411639356fd82becf">
-<!ENTITY mpfr-fixes-patch-size "40 KB">
+<!ENTITY mpfr-fixes-patch "mpfr-&mpfr-version;-upstream_fixes-3.patch">
+<!ENTITY mpfr-fixes-patch-md5 "5ba8bafe42920d6e570567529629bc59">
+<!ENTITY mpfr-fixes-patch-size "38 KB">
 
 <!ENTITY perl-fix-patch "perl-&perl-version;-infinite_recurse_fix-1.patch">
 <!ENTITY perl-fix-patch-md5 "579dfed34e97e0a2fe21b74aa53946ac">