From bb8dd5eefd039364d369aeaefa211e47ceb9dc3d Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 4 Oct 2006 16:43:56 +0000
Subject: [PATCH] Upgrade to Glibc-2.5

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 99dbb636c..4ace9846c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -49,6 +49,9 @@
     <listitem>
       <para>2006-10-02</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Glibc-2.5.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Coreutils-6.3.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 01370edc8..af3ee435e 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -198,13 +198,13 @@
 
   </itemizedlist>-->
 
-  <itemizedlist>
+  <!--<itemizedlist>
     <title>Added:</title>
 
     <listitem>
-      <para>&glibc-iconv_fix-patch;</para>
+      <para>PLACEHOLDER</para>
     </listitem>
-  </itemizedlist>
+  </itemizedlist>-->
 
   <itemizedlist>
     <title>Removed:</title>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 908675256..3e2bca37e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -106,14 +106,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Glibc Iconv Fix Patch - <token>&glibc-iconv_fix-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&glibc-iconv_fix-patch;"/></para>
-        <para>MD5 sum: <literal>&glibc-iconv_fix-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 cceafb0e2..da5be5032 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -64,12 +64,6 @@
 <screen><userinput>tar -xf ../glibc-libidn-&glibc-version;.tar.bz2
 mv glibc-libidn-&glibc-version; libidn</userinput></screen>
 
-    <para>Apply the following patch to fix an assertion failure when
-    opening two conversion descriptors with the same tocode and fromcode
-    parameters (see the iconv_open man page):</para>
-
-<screen><userinput>patch -Np1 -i ../&glibc-iconv_fix-patch;</userinput></screen>
-
     <para>In the vi_VN.TCVN locale, <command>bash</command> enters an infinite loop
     at startup. It is unknown whether this is a <command>bash</command> bug or a
     Glibc problem. Disable installation of this locale in order to avoid the
diff --git a/packages.ent b/packages.ent
index 839c13ac4..5018183ca 100644
--- a/packages.ent
+++ b/packages.ent
@@ -190,19 +190,19 @@
 <!ENTITY gettext-ch6-du "65 MB">
 <!ENTITY gettext-ch6-sbu "1 SBU">
 
-<!ENTITY glibc-version "2.4">
-<!ENTITY glibc-size "14,847 KB">
+<!ENTITY glibc-version "2.5">
+<!ENTITY glibc-size "14,963 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "7e9a88dcd41fbc53801dbe5bdacaf245">
+<!ENTITY glibc-md5 "1fb29764a6a650a4d5b409dda227ac9f">
 <!ENTITY glibc-home "&gnu-software;libc/">
-<!ENTITY glibc-ch5-du "325 MB">
-<!ENTITY glibc-ch5-sbu "6 SBU">
-<!ENTITY glibc-ch6-du "510 MB testsuite included">
-<!ENTITY glibc-ch6-sbu "13.5 SBU testsuite included">
+<!ENTITY glibc-ch5-du "342 MB">
+<!ENTITY glibc-ch5-sbu "7 SBU">
+<!ENTITY glibc-ch6-du "556 MB testsuite included">
+<!ENTITY glibc-ch6-sbu "19.5 SBU testsuite included">
 <!ENTITY glibc-libidn-version "&glibc-version;">
 <!ENTITY glibc-libidn-size "100 KB">
 <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
-<!ENTITY glibc-libidn-md5 "e2d892b40d654c523ab26a26b7dd86a1">
+<!ENTITY glibc-libidn-md5 "8787868ba8962d9b125997ec2f25ac01">
 <!ENTITY glibc-libidn-home " ">
 
 <!ENTITY grep-version "2.5.1a">
diff --git a/patches.ent b/patches.ent
index 71d06c08e..ac65e7eb5 100644
--- a/patches.ent
+++ b/patches.ent
@@ -53,11 +53,6 @@
 <!ENTITY gcc-specs-patch-size "14.8 KB">
 
 
-<!ENTITY glibc-iconv_fix-patch "glibc-&glibc-version;-iconv_fix-1.patch">
-<!ENTITY glibc-iconv_fix-patch-md5 "9c8e681226ccf7a1f25c6467674f915e">
-<!ENTITY glibc-iconv_fix-patch-size "2.6 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">