From 9c73bc302240efec59a1dfb5d24d0fefb3412c96 Mon Sep 17 00:00:00 2001
From: Zack Winkles <winkie@linuxfromscratch.org>
Date: Wed, 16 Jun 2004 13:24:37 +0000
Subject: [PATCH] Upgraded to Linux 2.6.7 and dropped the FPU exceptions patch

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3800 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 6 ++++--
 chapter03/patches.xml   | 8 --------
 chapter08/kernel.xml    | 4 ----
 general.ent             | 2 +-
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a7e9a023c..47cbfc5de 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -28,7 +28,7 @@ first a summary, then a detailed log.</para>
 <listitem><para>groff-1.19.1</para></listitem>
 <listitem><para>hotplug-2004_04_01</para></listitem>
 <listitem><para>lfs-bootscripts-2.1.2-pre1</para></listitem>
-<listitem><para>linux-2.6.6</para></listitem>
+<listitem><para>linux-2.6.7</para></listitem>
 <listitem><para>m4-1.4.1</para></listitem>
 <listitem><para>man-pages-1.67</para></listitem>
 <listitem><para>psmisc-21.5</para></listitem>
@@ -47,7 +47,6 @@ first a summary, then a detailed log.</para>
 <listitem><para>hotplug-2004_04_01-device-2.patch</para></listitem>
 <listitem><para>hotplug-2004_04_01-isapnp-2.patch</para></listitem>
 <listitem><para>inetutils-1.4.2-kernel_headers-1.patch</para></listitem>
-<listitem><para>linux-2.6.6-fpu-1.patch</para></listitem>
 <listitem><para>linux-libc-headers-2.6.6.0</para></listitem>
 <listitem><para>module-init-tools-3.0</para></listitem>
 <listitem><para>net-tools-1.60-gcc34-2.patch</para></listitem>
@@ -76,6 +75,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 16, 2004 [winkie]: Upgraded to Linux 2.6.7 and dropped the
+FPU patch.</para></listitem>
+
 <listitem><para>June 16, 2004 [alexander]: Removed the fileencodings line due to
 a bug which causes Vim to default to UTF-8.</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 56fd738ef..3ce981839 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -98,14 +98,6 @@ following:</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Linux FPU Exceptions Security Fix - 1 KB:</term>
-<listitem>
-<para><ulink
-url="&patches-root;linux-&linux-version;-fpu-1.patch"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Man 80-Columns Patch - 1 KB:</term>
 <listitem>
diff --git a/chapter08/kernel.xml b/chapter08/kernel.xml
index 88bc484f8..ec83aa0d8 100644
--- a/chapter08/kernel.xml
+++ b/chapter08/kernel.xml
@@ -43,10 +43,6 @@ recommends that this command be issued prior to <emphasis>each</emphasis>
 kernel compilation. You shouldn't rely on the source tree being clean after
 un-tarring.</para>
 
-<para>Fix an exploitable bug in FPU exception handling code:</para>
-
-<screen><userinput>patch -Np1 -i ../linux-&linux-version;-fpu-1.patch</userinput></screen>
-
 <para>Also, assure that the kernel does not attempt to pass hotplugging events
 to userspace until userspace specifies that it is ready:</para>
 
diff --git a/general.ent b/general.ent
index b0d98acd0..80d97f24b 100644
--- a/general.ent
+++ b/general.ent
@@ -45,7 +45,7 @@
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
 <!ENTITY libtool-version "1.5.6">
-<!ENTITY linux-version "2.6.6">
+<!ENTITY linux-version "2.6.7">
 <!ENTITY linux-libc-headers-version "2.6.6.0">
 <!ENTITY m4-version "1.4.1">
 <!ENTITY make-version "3.80">