Merge r8264 from trunk

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

7 files changed, 8 insertions, 29 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a3317997f..87941a382 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,9 @@
       <para>2007-07-31</para>
       <itemizedlist>
         <listitem>
+          <para>[dnicholson] - Updated to glibc-2.5.1.</para>
+        </listitem>
+        <listitem>
           <para>[dnicholson] - Updated udev-config rules to 20070731 to work
           with Linux-2.6.22.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 43d5f5158..d4abafc8b 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -208,9 +208,6 @@
       <para>&db-fixes-patch;</para>
     </listitem>
     <listitem>
-      <para>&glibc-branch_update-patch;</para>
-    </listitem>
-    <listitem>
       <para>&inetutils-man_pages-patch;</para>
     </listitem>
     <listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index e05ab8bdd..4606f80e6 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -99,14 +99,6 @@
     </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>
         <para>Download: <ulink url="&patches-root;&grep-fixes-patch;"/></para>
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 0161c59ae..bd6dceea6 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -37,11 +37,6 @@
   <sect2 role="installation">
     <title>Installation of Glibc</title>
 
-    <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/chapter06/glibc.xml b/chapter06/glibc.xml
index ed4335942..896c0cf2e 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -82,11 +82,6 @@ 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 <command>ldd</command> shell script contains Bash-specific
     syntax. Change it's default program interpreter to <command>/bin/bash</command>
     in case another <command>/bin/sh</command> is installed as described in the
diff --git a/packages.ent b/packages.ent
index d38c0b3ef..d9cfefdfe 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.5">
-<!ENTITY glibc-size "14,963 KB">
+<!ENTITY glibc-version "2.5.1">
+<!ENTITY glibc-size "15,060 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2">
-<!ENTITY glibc-md5 "1fb29764a6a650a4d5b409dda227ac9f">
+<!ENTITY glibc-md5 "10ea72e2c4d56c6aa13dabb7c4f9b195">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!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-size "123 KB">
 <!ENTITY glibc-libidn-url "&gnu;glibc/glibc-libidn-&glibc-libidn-version;.tar.bz2">
-<!ENTITY glibc-libidn-md5 "8787868ba8962d9b125997ec2f25ac01">
+<!ENTITY glibc-libidn-md5 "51b46f055908a5f8e409c4200d828093">
 <!ENTITY glibc-libidn-home " ">
 
 <!ENTITY grep-version "2.5.1a">
diff --git a/patches.ent b/patches.ent
index 4040ab4bf..75f6e0c82 100644
--- a/patches.ent
+++ b/patches.ent
@@ -49,9 +49,6 @@
 <!ENTITY gcc-specs-patch-size "14.8 KB">
 
 
-<!ENTITY glibc-branch_update-patch "glibc-&glibc-version;-branch_update-3.patch">
-<!ENTITY glibc-branch_update-patch-md5 "cbad3863a39eed9e52af083c5035f283">
-<!ENTITY glibc-branch_update-patch-size "2,538 KB">
 
 
 <!ENTITY grep-fixes-patch "grep-&grep-version;-redhat_fixes-2.patch">