Bug 69: glibc-2.2.4

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

8 files changed, 24 insertions, 43 deletions

diff --git a/Attic/appendixc/glibc-patch.xml b/Attic/appendixc/glibc-patch.xml
deleted file mode 100644
index 089cf82b4..000000000
--- a/Attic/appendixc/glibc-patch.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-Glibc-patch (&glibc-version;):
-<ulink url="ftp://ftp.gnu.org/gnu/glibc/">ftp://ftp.gnu.org/gnu/glibc/</ulink>
-
diff --git a/Attic/appendixc/packages.xml b/Attic/appendixc/packages.xml
index eefbe5fe5..775d4feda 100644
--- a/Attic/appendixc/packages.xml
+++ b/Attic/appendixc/packages.xml
@@ -27,7 +27,6 @@ package quicker.</para>
 &ac-texinfo;
 &ac-textutils;
 &ac-glibc;
-&ac-glibc-patch;
 &ac-glibc-threads;
 &ac-makedev;
 &ac-manpages;
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5d250ad82..04a5260b5 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -10,18 +10,21 @@
 <itemizedlist>
 
 <listitem><para>MAKEDEV-1-1</para></listitem> 
+<listitem><para>autoconf-2.52</para></listitem>
+<listitem><para>automake-1.4-p5</para></listitem>
 <listitem><para>binutils-2.11.2</para></listitem>
 <listitem><para>e2fsprogs-1.22</para></listitem>
 <listitem><para>file-3.36</para></listitem>
+<listitem><para>gcc-2.95.3</para></listitem>
+<listitem><para>gettext-0.10.39</para></listitem>
+<listitem><para>glibc-2.2.4</para></listitem>
 <listitem><para>groff-1.17.2</para></listitem>
 <listitem><para>linux-2.4.9</para></listitem>
+<listitem><para>man-pages-1.39</para></listitem>
 <listitem><para>sysvinit-2.81</para></listitem>
-<listitem><para>autoconf-2.52</para></listitem>
-<listitem><para>automake-1.4-p5</para></listitem>
 <listitem><para>util-linux-2.11h</para></listitem>
-<listitem><para>man-pages-1.39</para></listitem>
-<listitem><para>gettext-0.10.39</para></listitem>
-<listitem><para>gcc-2.95.3</para></listitem>
+
+
 </itemizedlist>
 
 </para></listitem>
diff --git a/chapter04/glibc-patch.xml b/chapter04/glibc-patch.xml
deleted file mode 100644
index 4c9b525bd..000000000
--- a/chapter04/glibc-patch.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-Glibc-patch (&glibc-version;) - &glibc-patch-size;:
-<ulink
-url="&ftp;/glibc-&glibc-version;-nss.diff.bz2">&ftp;/glibc-&glibc-version;-nss.diff.bz2</ulink>
-<ulink 
-url="&http;/glibc-&glibc-version;-nss.diff.bz2">&http;/glibc-&glibc-version;.-nss.diff.bz2</ulink>
-
diff --git a/chapter04/packages.xml b/chapter04/packages.xml
index e532c22fb..e5b4f8cd7 100644
--- a/chapter04/packages.xml
+++ b/chapter04/packages.xml
@@ -27,7 +27,6 @@
 &c3-patch;
 &c3-makedev;
 &c3-glibc;
-&c3-glibc-patch;
 &c3-glibc-threads;
 &c3-manpages;
 &c3-manpages-patch;
diff --git a/chapter06/glibc-exp.xml b/chapter06/glibc-exp.xml
index 822d8d83d..dfb3bae3c 100644
--- a/chapter06/glibc-exp.xml
+++ b/chapter06/glibc-exp.xml
@@ -1,10 +1,6 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><userinput>patch -Np0 -i ../glibc-2.2.3-nss.diff</userinput>: This
-patch is needed to fix a couple of nasty nis bugs in glibc which can
-cause problems.</para>
-
 <para><userinput>mknod -m 0666 /dev/null c 1 3:</userinput> Glibc needs a
 null device to compile properly. All other devices will be created in the
 next section.</para>
@@ -17,30 +13,29 @@ will have Glibc default to using /lib and /usr/lib which is fine
 right now).</para>
 
 <para><userinput>sed 's|$(PERL)|/usr/bin/perl|' 
-../glibc-2.2.3/malloc/Makefile &gt; tmp~:</userinput> This sed command
-searches through <filename>../glibc-2.2.3/malloc/Makefile</filename> and
+../glibc-&glibc-version;/malloc/Makefile &gt; tmp~:</userinput> This sed command
+searches through <filename>../glibc-&glibc-version;/malloc/Makefile</filename> and
 converts all occurances of <filename>$(PERL)</filename> to
 <filename>/usr/bin/perl</filename>.  The output is then written to the
 file <filename>tmp~</filename>.  This is done because Glibc can't
 autodetect perl since it's not installed yet at the time when we install
 Glibc.</para>
 
-<para><userinput>mv tmp~ ../glibc-2.2.3/malloc/Makefile:</userinput> The file
+<para><userinput>mv tmp~ ../glibc-&glibc-version;/malloc/Makefile:</userinput> The file
 <filename>tmp~</filename> is now moved back to
-<filename>../glibc-2.2.3/malloc/Makefile</filename>.  We do this because
+<filename>../glibc-&glibc-version;/malloc/Makefile</filename>.  We do this because
 when using sed, we can't write straight back to this file so we need to
 use a temporary file in between.</para>
 
-<para><userinput>sed 's/root/0' ../glibc-2.2.3/login/Makefile &gt;
+<para><userinput>sed 's/root/0' ../glibc-&glibc-version;/login/Makefile &gt;
 tmp~:</userinput> This sed command replaces all occurances of
 <filename>root</filename> in
-<filename>../glibc-2.2.3/login/Makefile</filename> with 0.  This is
+<filename>../glibc-&glibc-version;/login/Makefile</filename> with 0.  This is
 because as we don't have glibc on the LFS system yet, usernames can't 
 be resolved to their user id's.  Therefore, we replace the username 
 root with the id 0. </para>
 
-<para><userinput>mv tmp~ ../glibc-2.2.3/login/Makefile:</userinput> As above,
-we are using a temporary file (<filename>tmp~</filename>) to store the
+<para><userinput>mv tmp~ ../glibc-&glibc-version;/login/Makefile:</userinput> Asabove, we are using a temporary file (<filename>tmp~</filename>) to store the
 edited Makefile and then copying it back over the original.</para>
 
 <para><userinput>--enable-add-ons:</userinput> This enables the add-on that
diff --git a/chapter06/glibc-inst.xml b/chapter06/glibc-inst.xml
index be7bf6b7a..0b52729e9 100644
--- a/chapter06/glibc-inst.xml
+++ b/chapter06/glibc-inst.xml
@@ -1,17 +1,14 @@
 <sect2>
 <title>Installation of Glibc</title>
 
-<para>Before starting to install glibc, unpack the glibc-2.2.3-nss.diff
-file in the $LFS/usr/src tree.  Then, once glibc has been unpacked as usual 
-and you have cd'ed into the
-glibc-&glibc-version; directory, unpack glibc-linuxthreads inside
+<para>Before starting to install glibc, you must cd into the
+glibc-&glibc-version; directory and unpack glibc-linuxthreads inside
 the glibc-&glibc-version; directory, not in /usr/src as you normally
 would do.</para>
 
 <para>Install Glibc by running the following commands:</para>
 
-<para><screen><userinput>patch -Np0 -i ../glibc-2.2.3-nss.diff &amp;&amp;</userinput>
-<userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
+<para><screen><userinput>mknod -m 0666 /dev/null c 1 3 &amp;&amp;</userinput>
 <userinput>touch /etc/ld.so.conf &amp;&amp;</userinput>
 <userinput>mkdir ../glibc-build &amp;&amp;</userinput>
 <userinput>cd ../glibc-build &amp;&amp;</userinput>
diff --git a/index.xml b/index.xml
index 670220cd9..80b5405f3 100644
--- a/index.xml
+++ b/index.xml
@@ -90,7 +90,6 @@
 <!ENTITY c3-gettext SYSTEM "chapter3/gettext.xml">
 <!ENTITY c3-makedev SYSTEM "chapter3/makedev.xml">
 <!ENTITY c3-glibc SYSTEM "chapter3/glibc.xml">
-<!ENTITY c3-glibc-patch SYSTEM "chapter3/glibc-patch.xml">
 <!ENTITY c3-glibc-threads SYSTEM "chapter3/glibc-threads.xml">
 <!ENTITY c3-manpages SYSTEM "chapter3/manpages.xml">
 <!ENTITY c3-manpages-patch SYSTEM "chapter3/manpages-patch.xml">
@@ -483,7 +482,6 @@
 <!ENTITY ac-gettext SYSTEM "appendixc/gettext.xml">
 <!ENTITY ac-makedev SYSTEM "appendixc/makedev.xml">
 <!ENTITY ac-glibc SYSTEM "appendixc/glibc.xml">
-<!ENTITY ac-glibc-patch SYSTEM "appendixc/glibc-patch.xml">
 <!ENTITY ac-glibc-threads SYSTEM "appendixc/glibc-threads.xml">
 <!ENTITY ac-manpages SYSTEM "appendixc/manpages.xml">
 <!ENTITY ac-manpages-patch SYSTEM "appendixc/manpages-patch.xml">
@@ -519,9 +517,9 @@
 <!ENTITY ac-netkitbase SYSTEM "appendixc/netkitbase.xml">
 <!ENTITY ac-nettools SYSTEM "appendixc/nettools.xml">
 
-<!ENTITY all-version "cvs-20010816-1240">
-<!ENTITY all-size-kb "76,820 KB">
-<!ENTITY all-size-mb "75.02 MB">
+<!ENTITY all-version "cvs-20010816-1400">
+<!ENTITY all-size-kb "77,660 KB">
+<!ENTITY all-size-mb "75.84 MB">
 
 <!ENTITY bootscripts-version "lfs-bootscripts-cvs-20010806-0420">
 
@@ -654,10 +652,9 @@
 <!ENTITY gettext-compsize "11MB">
 <!ENTITY gettext-time "1 minute">
 
-<!ENTITY glibc-version "2.2.3">
-<!ENTITY glibc-size "11,091 KB">
-<!ENTITY glibc-patch-size "1 KB">
-<!ENTITY glibc-threads-size "158.93 KB">
+<!ENTITY glibc-version "2.2.4">
+<!ENTITY glibc-size "11,932 KB">
+<!ENTITY glibc-threads-size "161 KB">
 <!ENTITY glibc-compsize "372 MB">
 <!ENTITY glibc-time "46 minutes">