From 7e8e2c0e63e05e552457e66d7a0f9de7334ddc01 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 24 Feb 2007 14:45:43 +0000
Subject: Add upstream fixes for Glibc, bringing it up to date with the 2.5
 release branch

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 9d3b54394..47f41e5a9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2007-02-24</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add an upstream patch for Glibc.  Fixes
+          <ulink url="&lfs-ticket-root;1930">#1930</ulink></para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to GCC-4.1.2.  Fixes
           <ulink url="&lfs-ticket-root;1960">#1960</ulink></para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 2aa46be0f..68aa575d0 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -207,6 +207,9 @@
     <listitem>
       <para>&db-fixes-patch;</para>
     </listitem>
+    <listitem>
+      <para>&glibc-branch_update-patch;</para>
+    </listitem>
     <listitem>
       <para>&inetutils-man_pages-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 2447ee854..93f63fb38 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -98,6 +98,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Glibc Branch Update Patch - <token>&glibc-branch_update-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&glibc-branch_update-patch;"/></para>
+        <para>MD5 sum: <literal>&glibc-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Grep RedHat Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index bb33360af..95e5cfdf4 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -82,6 +82,11 @@ mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
         scripts/test-installation.pl</userinput></screen>
 
+    <para>Apply a patch to obtain various fixes that the upstream maintainers
+    have provided:</para>
+
+<screen><userinput>patch -Np1 -i ../&glibc-branch_update-patch;</userinput></screen>
+
     <para>The Glibc documentation recommends building Glibc outside of the source
     directory in a dedicated build directory:</para>
 
diff --git a/patches.ent b/patches.ent
index 441a04004..4aeb3b129 100644
--- a/patches.ent
+++ b/patches.ent
@@ -49,6 +49,11 @@
 <!ENTITY gcc-specs-patch-size "14.8 KB">
 
 
+<!ENTITY glibc-branch_update-patch "glibc-&glibc-version;-branch_update-2.patch">
+<!ENTITY glibc-branch_update-patch-md5 "e09685a7f6d8ba60a70c03a091130ea9">
+<!ENTITY glibc-branch_update-patch-size "1,646 KB">
+
+
 <!ENTITY grep-fixes-patch "grep-&grep-version;-redhat_fixes-2.patch">
 <!ENTITY grep-fixes-patch-md5 "2c67910be2d0a54714f63ce350e6d8a6">
 <!ENTITY grep-fixes-patch-size "55 KB">
-- 
cgit v1.2.3-54-g00ecf