From 427c00b72ceed2155844ede83a29e027ec6d70a1 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Wed, 17 Feb 2016 02:29:08 +0000
Subject: [PATCH] Add patches for mpfr, binutils, glibc, bash

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/systemd@11017 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  9 +++++++++
 chapter01/whatsnew.xml  | 24 ++++++++++++++++++++++++
 chapter03/patches.xml   | 16 ++++++++++++++++
 chapter06/gcc.xml       |  8 ++++----
 chapter06/glibc.xml     |  4 ++++
 general.ent             |  4 ++--
 patches.ent             | 28 +++++++++++++++++++---------
 7 files changed, 78 insertions(+), 15 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5fe887f65..dd3a5919d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -35,6 +35,15 @@
       </itemizedlist>
     </listitem>
 -->
+    <listitem>
+      <para>2016-02-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Add patches for mpfr, binutils, gcc, glibc, and bash</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2016-02-15</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a9e809ef7..93fcaa2c3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -238,6 +238,30 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
+    <listitem>
+      <para>&bash-fixes-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&binutils-upstream-patch;</para>
+    </listitem>
+
+<!--    <listitem>
+      <para>&gcc-upstream-patch;</para>
+    </listitem> -->
+
+    <listitem>
+      <para>&glibc-largefile-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&glibc-upstream-patch2;</para>
+    </listitem>
+
+    <listitem>
+      <para>&mpfr-upstream-patch;</para>
+    </listitem>
+
     <!--<listitem>
       <para>&glibc-largefile-patch;</para>
     </listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 0549579a1..4ec3464d8 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -57,6 +57,14 @@
       </listitem>
     </varlistentry>
 
+<!--    <varlistentry>
+      <term>Gcc Upstream Patch - <token>&gcc-upstream-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&gcc-upstream-patch;"/></para>
+        <para>MD5 sum: <literal>&gcc-upstream-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry> -->
+
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
@@ -81,6 +89,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc Upstream Patch - <token>&glibc-upstream-patch2-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-upstream-patch2;"/></para>
+        <para>MD5 sum:  <literal>&glibc-upstream-patch2-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index a61ff68fe..1f276439c 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of GCC</title>
-<!--
-    <para>First apply some fixes from the upstream repository:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen>
--->
+<!--    <para>First apply some fixes from the upstream repository:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&gcc-upstream-patch;</userinput></screen> -->
+
     <para>The GCC documentation recommends building GCC in a dedicated build directory:</para>
 
 <screen><userinput remap="pre">mkdir -v build
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 9b00a7b23..e55fcc836 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -75,6 +75,10 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-largefile-patch;</userinput></screen>
 
+    <para>Finally, update some recent changes from the upstream repository:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch2;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc 
     in a dedicated build directory:</para>
 
diff --git a/general.ent b/general.ent
index b3f45a1dd..3a1235c3b 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-<!ENTITY version         "20160214-systemd">
+<!ENTITY version         "20160216-systemd">
 <!ENTITY short-version   "systemd">  <!-- Used in dbus chapter, change to x.y for release -->
-<!ENTITY releasedate     "February 14, 2016">
+<!ENTITY releasedate     "February 16, 2016">
 <!ENTITY copyrightdate   "1999-2016"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "7.9">
 <!ENTITY generic-version "systemd"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index a350fbe78..291cc1a25 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,17 +2,17 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-2.patch">
-<!ENTITY bash-fixes-patch-md5 "fd2d7ca532f9ea53d678a6bc79354681">
-<!ENTITY bash-fixes-patch-size "13 KB">
+<!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-3.patch">
+<!ENTITY bash-fixes-patch-md5 "e183ab08f0a51a7c5a2e974eb1ecbc46">
+<!ENTITY bash-fixes-patch-size "15 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">
 
-<!ENTITY binutils-upstream-patch "binutils-&binutils-version;-upstream_fix-1.patch">
-<!ENTITY binutils-upstream-patch-md5 "a13223621449e0d6934a608f646f13a9">
-<!ENTITY binutils-upstream-patch-size "3.0 KB">
+<!ENTITY binutils-upstream-patch "binutils-&binutils-version;-upstream_fix-2.patch">
+<!ENTITY binutils-upstream-patch-md5 "33662839ab819acb58796c4c2db20631">
+<!ENTITY binutils-upstream-patch-size "13 KB">
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
@@ -22,6 +22,12 @@
 <!ENTITY coreutils-i18n-patch-md5 "c6334ed5b03062ef7e9649e8ceb2cfc1">
 <!ENTITY coreutils-i18n-patch-size "148 KB">
 
+<!--
+<!ENTITY gcc-upstream-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
+<!ENTITY gcc-upstream-patch-md5 "56d86c16ea62e024e6eebbdc9dc63700">
+<!ENTITY gcc-upstream-patch-size "251 KB">
+-->
+
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
@@ -34,13 +40,17 @@
 <!ENTITY glibc-upstream-patch-md5 "cfb3cb46074a833ac5729be79e4f2592">
 <!ENTITY glibc-upstream-patch-size "1.9 KB">
 
+<!ENTITY glibc-upstream-patch2 "glibc-&glibc-version;-upstream_fixes-1.patch">
+<!ENTITY glibc-upstream-patch2-md5 "2357ae19ff8b1bfc527214d19d328903">
+<!ENTITY glibc-upstream-patch2-size "52 KB">
+
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY mpfr-upstream-patch "mpfr-&mpfr-version;-upstream_fixes-1.patch">
-<!ENTITY mpfr-upstream-patch-md5 "2044abd90351861311c9aafcfb0ce864">
-<!ENTITY mpfr-upstream-patch-size "81 KB">
+<!ENTITY mpfr-upstream-patch "mpfr-&mpfr-version;-upstream_fixes-2.patch">
+<!ENTITY mpfr-upstream-patch-md5 "ef2f0b72f7e2dcc7775303bd3b850bca">
+<!ENTITY mpfr-upstream-patch-size "128 KB">
 
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
 <!ENTITY readline-fixes-patch-md5 "6b0d9f4e79319d56a7fee9b35e5cfd1b">