From c0ad0ec4ad231d7d4d13e673db729393c0ada18d Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 14 Aug 2011 22:33:55 +0000
Subject: [PATCH] Add a patch to fix a couple of bugs in Glibc-2.14.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9586 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 3 +++
 chapter03/patches.xml   | 8 ++++++++
 chapter06/glibc.xml     | 4 ++++
 patches.ent             | 4 ++++
 5 files changed, 23 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7c096e27f..86c42576f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2011-08-14</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Added a patch to fix a couple of bugs in Glibc-2.14.
+          </para>
+        </listitem>
         <listitem>
           <para>[matthew] - Update to GDBM-1.9.1. Fixes
           <ulink url="&lfs-ticket-root;2913">#2913</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 9e84bcc05..16748e769 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -245,6 +245,9 @@
     <listitem>
       <para>Glib-&glib-version;</para>
     </listitem>
+    <listitem>
+      <para>&glibc-fixes-patch;</para>
+    </listitem>
     <listitem>
       <para>&glibc-gcc_fix-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f12174bbc..0e61f3124 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -74,6 +74,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc Bug Fixes Patch - <token>&glibc-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Glibc GCC Build Fix Patch - <token>&glibc-gcc_fix-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 9745908f5..e920c2ac6 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -100,6 +100,10 @@ unset DL</userinput></screen>
 
 <screen><userinput remap="pre">sed -i 's|@BASH@|/bin/bash|' elf/ldd.bash.in</userinput></screen>
 
+    <para>Fix a couple of bugs in Glibc that can cause crashes and core dumps:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fixes-patch;</userinput></screen>
+
     <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen>
diff --git a/patches.ent b/patches.ent
index 0a2b57574..d95469c1a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -40,6 +40,10 @@
 <!ENTITY gcc-startfiles-patch-size "1.5 KB">
 
 
+<!ENTITY glibc-fixes-patch "glibc-&glibc-version;-fixes-1.patch">
+<!ENTITY glibc-fixes-patch-md5 "133f204725e3487a355e1e55390a42e9">
+<!ENTITY glibc-fixes-patch-size "2.7 KB">
+
 <!ENTITY glibc-gcc_fix-patch "glibc-&glibc-version;-gcc_fix-1.patch">
 <!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd">
 <!ENTITY glibc-gcc_fix-patch-size "2.5 KB">