Reverted changes from 4729 and 4730

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

4 files changed, 28 insertions, 52 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8f4c138d7..84307c6a0 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -26,31 +26,30 @@ first a summary, then a detailed log.</para>
 <listitem><para>E2fsprogs 1.36</para></listitem>
 <listitem><para>Expect 5.43.0</para></listitem>
 <listitem><para>File 4.13</para></listitem>
-<listitem><para>Findutils 4.2.19</para></listitem>
+<listitem><para>Findutils 4.2.18</para></listitem>
 <listitem><para>GCC 3.4.3</para></listitem>
 <listitem><para>Gettext 0.14.2</para></listitem>
-<listitem><para>Glibc 2.3.4</para></listitem>
+<listitem><para>Glibc 20041011</para></listitem>
 <listitem><para>Grep 2.5.1a</para></listitem>
 <listitem><para>Grub 0.96</para></listitem>
 <listitem><para>Iana-Etc 1.04</para></listitem>
 <listitem><para>Iproute2 2.6.9-041019</para></listitem>
 <listitem><para>LFS-Bootscripts 3.1.0</para></listitem>
 <listitem><para>Libtool 1.5.14</para></listitem>
-<listitem><para>Linux 2.6.11.2</para></listitem>
+<listitem><para>Linux 2.6.10</para></listitem>
 <listitem><para>Linux-libc-headers 2.6.10.0</para></listitem>
 <listitem><para>Man 1.5p</para></listitem>
 <listitem><para>Man-pages 2.01</para></listitem>
 <listitem><para>Module-init-tools 3.1</para></listitem>
 <listitem><para>Perl 5.8.6</para></listitem>
 <listitem><para>Procps 3.2.5</para></listitem>
-<listitem><para>Psmisc 21.6</para></listitem>
 <listitem><para>Sed 4.1.4</para></listitem>
 <listitem><para>Shadow 4.0.7</para></listitem>
 <listitem><para>Sysvinit 2.86</para></listitem>
 <listitem><para>Tar 1.15.1</para></listitem>
 <listitem><para>Texinfo 4.8</para></listitem>
 <listitem><para>Tcl 8.4.9</para></listitem>
-<listitem><para>Udev 054</para></listitem>
+<listitem><para>Udev 050</para></listitem>
 <listitem><para>Util-linux 2.12q</para></listitem>
 <listitem><para>Zlib 1.2.2</para></listitem>
 </itemizedlist>
@@ -61,7 +60,9 @@ first a summary, then a detailed log.</para>
 <listitem><para>bash-3.0-fixes-3.patch</para></listitem>
 <listitem><para>bash-3.0-avoid_WCONTINUED-1.patch</para></listitem>
 <listitem><para>Hotplug 2004_09_23</para></listitem>
+<listitem><para>iproute2-2.6.9_041019-find_update-1.patch</para></listitem>
 <listitem><para>Libol 0.3.15</para></listitem>
+<listitem><para>linux-2.6.10-security_fix-1.patch</para></listitem>
 <listitem><para>Syslog-ng 1.6.6</para></listitem>
 <listitem><para>util-linux-2.12p-cramfs-1.patch</para></listitem>
 <listitem><para>vim-6.0-security_fix-1.patch</para></listitem>
@@ -80,11 +81,6 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
-<listitem><para>March 11, 2005 [jim]: Added /var/log/hotplug for capturing
-of hotplug events. Added /lib/firmware for firmware loading with hotplug
-Upgrades psmisc to 21.6. Upgraded Kernel to 2.6.11.2. Upgraded IPRoute2
-to 2.6.11-050310. Removed unused patches from patches list</para></listitem>
-
 <listitem><para>March 10, 2005 [matt]: gettext no longer installs
 libgettext{lib,src}.a (Jack Brown)</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 262bcbedc..71cabfc5f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -100,6 +100,20 @@ needed to build an LFS system:</para>
 </varlistentry>
 
 <varlistentry>
+<term>IPRoute2 Find Update Patch - 1 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;iproute2-&iproute2-patch-version;-find_update-1.patch"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Linux 2.6.10 Security Vulnerability Patch - 1 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;linux-&linux-version;-security_fix-1.patch"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
 <term>Mktemp Tempfile Patch - 3 KB:</term>
 <listitem>
 <para><ulink url="&patches-root;mktemp-&mktemp-version;-add_tempfile-1.patch"/></para>
diff --git a/chapter06/hotplug.xml b/chapter06/hotplug.xml
index f099482d5..b4d40583d 100644
--- a/chapter06/hotplug.xml
+++ b/chapter06/hotplug.xml
@@ -49,18 +49,6 @@ using the script included with LFS-Bootscripts:</para>
 that reason, remove the network hotplug agent:</para>
 
 <screen><userinput>rm -f /etc/hotplug/net.agent</userinput></screen>
-
-<para>For logging of hotplug events we will create a directory and a
-blank file. This file will show all the information passed to hotplug:</para>
-
-<screen><userinput>mkdir /var/log/hotplug
-touch /var/log/hotplug/events</userinput></screen>
-
-<para>For firmware to be loaded by hotplug we will create the necessary
-directory:</para>
-
-<screen><userinput>mkdir /lib/firmware</userinput></screen>
-
 </sect2>
 
 
@@ -73,7 +61,7 @@ directory:</para>
 <seglistitem><seg>hotplug</seg>
 <seg>/etc/hotplug/*.rc, /etc/hotplug/*.agent</seg>
 <seg>/etc/hotplug/hotplug.functions, /etc/hotplug/blacklist, /etc/hotplug/{pci,usb}, 
-/etc/hotplug/usb.usermap, /etc/hotplug.d, /var/log/hotplug/events</seg></seglistitem>
+/etc/hotplug/usb.usermap, /etc/hotplug.d</seg></seglistitem>
 </segmentedlist>
 
 <variablelist><bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -163,16 +151,6 @@ call for each USB device, based on its vendor, id and other attributes.
 </listitem>
 </varlistentry>
 
-<varlistentry id="hotplug-events">
-<term><filename>/var/log/hotplug/events</filename></term>
-<listitem>
-<indexterm zone="ch-system-hotplug events"><primary
-sortas="e-/var/log/hotplug/events">/var/log/hotplug/events</primary></indexterm>
-<para>This file contains all the events since bootup that hotplug has called.
-</para>
-</listitem>
-</varlistentry>
-
 <varlistentry id="hotplug-hotplug.d">
 <term><filename class="directory">/etc/hotplug.d</filename></term>
 <listitem>
@@ -184,18 +162,6 @@ that are interested in receiving hotplug events. E.g.,
 </para>
 </listitem>
 </varlistentry>
-
-<varlistentry id="hotplug-firmware">
-<term><filename class="directory">/lib/firmware</filename></term>
-<listitem>
-<indexterm zone="ch-system-hotplug hotplug-firmware"><primary
-sortas="e-/lib/firmware">/lib/firmware</primary></indexterm>
-<para>This directory contains the firmware for devices that
-need to have there firmware loaded before use.
-</para>
-</listitem>
-</varlistentry>
-
 </variablelist>
 </sect2>
 </sect1>
diff --git a/general.ent b/general.ent
index 323a0cc53..92ca8305a 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!ENTITY version "SVN-20050310">
-<!ENTITY releasedate "March 11, 2005">
+<!ENTITY releasedate "March 10, 2005">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -32,7 +32,7 @@
 <!ENTITY e2fsprogs-version "1.36">
 <!ENTITY expect-version "5.43.0">
 <!ENTITY file-version "4.13">
-<!ENTITY findutils-version "4.2.19">
+<!ENTITY findutils-version "4.2.18">
 <!ENTITY flex-version "2.5.31">
 <!ENTITY gawk-version "3.1.4">
 <!ENTITY gcc-version "3.4.3">
@@ -45,15 +45,15 @@
 <!ENTITY hotplug-version "2004_09_23">
 <!ENTITY iana-etc-version "1.04">
 <!ENTITY inetutils-version "1.4.2">
-<!ENTITY iproute2-version "2.6.11-050310">
-<!ENTITY iproute2-patch-version "2.6.9_050310">
+<!ENTITY iproute2-version "2.6.9-041019">
+<!ENTITY iproute2-patch-version "2.6.9_041019">
 <!ENTITY kbd-version "1.12">
 <!ENTITY less-version "382">
 <!ENTITY lfs-bootscripts-version "3.1.0">
 <!ENTITY libol-version "0.3.15">
 <!ENTITY libol-dl-version "0.3">
 <!ENTITY libtool-version "1.5.14">
-<!ENTITY linux-version "2.6.11.2">
+<!ENTITY linux-version "2.6.10">
 <!ENTITY linux-dl-version "2.6">
 <!ENTITY linux-libc-headers-version "2.6.10.0">
 <!ENTITY m4-version "1.4.2">
@@ -66,7 +66,7 @@
 <!ENTITY patch-version "2.5.4">
 <!ENTITY perl-version "5.8.6">
 <!ENTITY procps-version "3.2.5">
-<!ENTITY psmisc-version "21.6">
+<!ENTITY psmisc-version "21.5">
 <!ENTITY readline-version "5.0">
 <!ENTITY sed-version "4.1.4">
 <!ENTITY shadow-version "4.0.7">
@@ -76,7 +76,7 @@
 <!ENTITY tar-version "1.15.1">
 <!ENTITY tcl-version "8.4.9">
 <!ENTITY texinfo-version "4.8">
-<!ENTITY udev-version "054">
+<!ENTITY udev-version "050">
 <!ENTITY util-linux-version "2.12q">
 <!ENTITY vim-version "6.3">
 <!ENTITY zlib-version "1.2.2">