From cd0f51912650a68813b013e75471b27f1ff43ffd Mon Sep 17 00:00:00 2001
From: Jeremy Utley <jeremy@linuxfromscratch.org>
Date: Fri, 15 Oct 2004 03:08:36 +0000
Subject: Upgraded to 20041011 glibc snapshot, added bash patch to fix
 execution problem with new glibc, upgraded to util-linux 2.12h, removed
 util-linux-sfdisk patch which is no longer necessary.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@4289 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml  | 11 ++++++++---
 chapter03/packages.xml   |  2 +-
 chapter03/patches.xml    | 13 +++++++------
 chapter05/bash.xml       |  5 +++++
 chapter06/bash.xml       |  5 +++++
 chapter06/util-linux.xml |  6 ------
 general.ent              |  8 ++++----
 7 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 86ffec8f0..ba828c196 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -28,7 +28,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>flex-2.5.31</para></listitem>
 <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>
 <listitem><para>lfs-bootscripts-2.2.3</para></listitem>
@@ -43,7 +43,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>sed-4.1.2</para></listitem>
 <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>
 </listitem>
@@ -51,6 +51,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>Added:</para>
 <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>
 <listitem><para>gcc-3.4.2-linkonce-1.patch</para></listitem>
@@ -70,7 +71,6 @@ first a summary, then a detailed log.</para>
 <listitem><para>udev-config-1.permissions</para></listitem>
 <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>
 </itemizedlist>
@@ -92,6 +92,11 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </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>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index e4c972440..55eeabccf 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -134,7 +134,7 @@
 <varlistentry>
 <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>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 945c35c02..402cdaab3 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -22,6 +22,13 @@ following:</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>
+
 <varlistentry>
 <term>Coreutils Suppress Uptime, Kill, Su Patch - 16 KB:</term>
 <listitem>
@@ -138,12 +145,6 @@ following:</para>
 </listitem>
 </varlistentry>
 
-<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>
diff --git a/chapter05/bash.xml b/chapter05/bash.xml
index 18a399aee..7b741aef9 100644
--- a/chapter05/bash.xml
+++ b/chapter05/bash.xml
@@ -27,6 +27,11 @@
 <sect2 role="installation">
 <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>
 
 <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen>
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index 2dd8d81ea..3e65cb5ee 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -33,6 +33,11 @@ sometimes will only show 33 characters on a line and then wraps to the next line
 
 <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>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin \
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 4c1ecf2db..37ca200d9 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -43,12 +43,6 @@ mkdir -p /var/lib/hwclock</userinput></screen>
 <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>
 
 <screen><userinput>./configure</userinput></screen>
diff --git a/general.ent b/general.ent
index c1166d151..70a6f93b0 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?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">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -33,7 +33,7 @@
 <!ENTITY gawk-version "3.1.4">
 <!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">
 <!ENTITY grub-version "0.95">
@@ -68,7 +68,7 @@
 <!ENTITY tar-version "1.14">
 <!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">
 <!ENTITY zlib-version "1.2.1">
-- 
cgit v1.2.3-54-g00ecf