Index: chapter01/changelog.xml
===================================================================
--- chapter01/changelog.xml	(revision 12043d221f954d6cace8059a0b2075f6c32b36a5)
+++ chapter01/changelog.xml	(revision cd0f51912650a68813b013e75471b27f1ff43ffd)
@@ -29,5 +29,5 @@
 <listitem><para>gawk-3.1.4</para></listitem>
 <listitem><para>gcc-3.4.2</para></listitem>
-<listitem><para>glibc-2.3.4-20040828</para></listitem>
+<listitem><para>glibc-20041011</para></listitem>
 <listitem><para>groff-1.19.1</para></listitem>
 <listitem><para>iana-etc-1.02</para></listitem>
@@ -44,5 +44,5 @@
 <listitem><para>tar-1.14</para></listitem>
 <listitem><para>tcl-8.4.7</para></listitem>
-<listitem><para>util-linux-2.12g</para></listitem>
+<listitem><para>util-linux-2.12h</para></listitem>
 <listitem><para>vim-6.3</para></listitem>
 </itemizedlist>
@@ -52,4 +52,5 @@
 <itemizedlist>
 <listitem><para>bash-3.0-fixes-1.patch</para></listitem>
+<listitem><para>bash-3.0-avoid_WCONTINUED-1.patch</para></listitem>
 <listitem><para>coreutils-5.2.1-suppress_hostname_uptime_kill_su-1.patch</para></listitem>
 <listitem><para>flex-2.5.31-debian_fixes-2.patch</para></listitem>
@@ -71,5 +72,4 @@
 <listitem><para>udev-config-1.rules</para></listitem>
 <listitem><para>util-linux-2.12a-kernel_headers-1.patch</para></listitem>
-<listitem><para>util-linux-2.12d-sfdisk-1.patch</para></listitem>
 <listitem><para>vim-6.3 language files</para></listitem>
 <listitem><para>zlib-1.2.1-security-1.patch</para></listitem>
@@ -93,4 +93,9 @@
 </listitem>
 
+<listitem><para>October 14th, 2004 [jeremy]: Upgraded Glibc to 20041011
+snapshot, added Bash patch to fix execution problems with the new glibc,
+upgraded to Util-linux-2.12h, removed the sfdisk patch which has been
+incorporated upstream</para></listitem>
+
 <listitem><para>October 12th, 2004 [jeremy]: Added the new DESTDIR patch
 developed by David Jensen to the udev instructions</para></listitem>
Index: chapter03/packages.xml
===================================================================
--- chapter03/packages.xml	(revision 12043d221f954d6cace8059a0b2075f6c32b36a5)
+++ chapter03/packages.xml	(revision cd0f51912650a68813b013e75471b27f1ff43ffd)
@@ -135,5 +135,5 @@
 <term>Glibc (&glibc-version;) - 13,800 KB: -- <emphasis>(see Note 1 below)</emphasis></term>
 <listitem>
-<para><ulink url="ftp://ftp.linuxfromscratch.org/pub/lfs/lfs-packages/unstable/glibc-2.3.4-20040828.tar.bz2"/></para>
+<para><ulink url="ftp://sources.redhat.com/pub/glibc/snapshots/"/></para>
 </listitem>
 </varlistentry>
Index: chapter03/patches.xml
===================================================================
--- chapter03/patches.xml	(revision 12043d221f954d6cace8059a0b2075f6c32b36a5)
+++ chapter03/patches.xml	(revision cd0f51912650a68813b013e75471b27f1ff43ffd)
@@ -20,4 +20,11 @@
 <listitem>
 <para><ulink url="&patches-root;bash-&bash-version;-fixes-1.patch"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Bash Avoid Wcontinued Patch - 1KB:</term>
+<listitem>
+<para><ulink url="&patches-root;bash-&bash-version;-avoid_WCONTINUED-1.patch"/></para>
 </listitem>
 </varlistentry>
@@ -140,10 +147,4 @@
 
 <varlistentry>
-<term>Util-Linux Sfdisk Patch - 1 KB:</term> <listitem>
-<para><ulink url="&patches-root;util-linux-&util-linux-version;-sfdisk-2.patch"/></para>
-</listitem>
-</varlistentry>
-
-<varlistentry>
 <term>Zlib Security Patch - 1KB:</term> <listitem>
 <para><ulink url="&patches-root;zlib-&zlib-version;-security-1.patch"/></para>
Index: chapter05/bash.xml
===================================================================
--- chapter05/bash.xml	(revision 12043d221f954d6cace8059a0b2075f6c32b36a5)
+++ chapter05/bash.xml	(revision cd0f51912650a68813b013e75471b27f1ff43ffd)
@@ -28,4 +28,9 @@
 <title>Installation of Bash</title>
 
+<para>Bash has a problem when compiled against newer versions of glibc, causing
+it to hang inappropriately.  This patch fixes the problem:</para>
+
+<screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
+
 <para>Prepare Bash for compilation:</para>
 
Index: chapter06/bash.xml
===================================================================
--- chapter06/bash.xml	(revision 12043d221f954d6cace8059a0b2075f6c32b36a5)
+++ chapter06/bash.xml	(revision cd0f51912650a68813b013e75471b27f1ff43ffd)
@@ -33,4 +33,9 @@
 
 <screen><userinput>patch -Np1 -i ../bash-&bash-version;-fixes-1.patch</userinput></screen>
+
+<para>Bash also has issues when compiled against newer versions of glibc.  The
+following patch resolves this problem:</para>
+
+<screen><userinput>patch -Np1 -i ../bash-&bash-version;-avoid_WCONTINUED-1.patch</userinput></screen>
 
 <para>Prepare Bash for compilation:</para>
Index: chapter06/util-linux.xml
===================================================================
--- chapter06/util-linux.xml	(revision 12043d221f954d6cace8059a0b2075f6c32b36a5)
+++ chapter06/util-linux.xml	(revision cd0f51912650a68813b013e75471b27f1ff43ffd)
@@ -43,10 +43,4 @@
 <sect2 role="installation">
 <title>Installation of Util-linux</title>
-
-<para>GCC-&gcc-version; miscompiles <command>sfdisk</command> if the
-default optimisation level is used.  The following patch prevents the
-problematic optimisation pass from being used.</para>
-
-<screen><userinput>patch -Np1 -i ../util-linux-&util-linux-version;-sfdisk-2.patch</userinput></screen>
 
 <para>Prepare Util-linux for compilation:</para>
Index: general.ent
===================================================================
--- general.ent	(revision 12043d221f954d6cace8059a0b2075f6c32b36a5)
+++ general.ent	(revision cd0f51912650a68813b013e75471b27f1ff43ffd)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20041012">
-<!ENTITY releasedate "October 12, 2004">
+<!ENTITY version "SVN-20041014">
+<!ENTITY releasedate "October 14, 2004">
 <!ENTITY milestone "6.1">
 
@@ -34,5 +34,5 @@
 <!ENTITY gcc-version "3.4.2">
 <!ENTITY gettext-version "0.14.1">
-<!ENTITY glibc-version "2.3.4-20040828">
+<!ENTITY glibc-version "20041011">
 <!ENTITY grep-version "2.5.1">
 <!ENTITY groff-version "1.19.1">
@@ -69,5 +69,5 @@
 <!ENTITY tcl-version "8.4.7">
 <!ENTITY texinfo-version "4.7">
-<!ENTITY util-linux-version "2.12g">
+<!ENTITY util-linux-version "2.12h">
 <!ENTITY udev-version "035">
 <!ENTITY vim-version "6.3">
