From aa242b107f51b4aeec66a0ec27d023fa355886c6 Mon Sep 17 00:00:00 2001
From: Zack Winkles <winkie@linuxfromscratch.org>
Date: Mon, 7 Jun 2004 19:42:59 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3765 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 +++-
 chapter03/patches.xml   | 7 -------
 chapter06/net-tools.xml | 5 ++---
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8edb34723..fc447e57d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -70,7 +70,6 @@ first a summary, then a detailed log.</para>
 <listitem><para>mktemp-1.5-add_tempfile-1.patch</para></listitem>
 <listitem><para>module-init-tools-3.0</para></listitem>
 <listitem><para>net-tools-1.60-gcc34-2.patch</para></listitem>
-<listitem><para>net-tools-1.60-kernel_headers-1.patch</para></listitem>
 <listitem><para>readline-4.3</para></listitem>
 <listitem><para>readline-4.3-gnu_fixes-1.patch</para></listitem>
 <listitem><para>sysklogd-1.4.1-kernel_headers-1.patch</para></listitem>
@@ -104,6 +103,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>June 7, 2004 [winkie]: Dropped Net-tools patch for kernel
+headers in favor of a simple sed.</para></listitem>
+
 <listitem><para>June 7, 2004 [winkie]: Normalized <quote>sed</quote> usage
 throughout the book.</para></listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index b2ef5dfb1..79d4ab310 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -119,13 +119,6 @@ following:</para>
 </listitem>
 </varlistentry>
 
-<varlistentry>
-<term>Net-tools Kernel Headers Patch - 1 KB:</term>
-<listitem>
-<para><ulink url="&patches-root;net-tools-&net-tools-version;-kernel_headers-1.patch"/></para>
-</listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Perl Libc Patch - 1 KB:</term>
 <listitem>
diff --git a/chapter06/net-tools.xml b/chapter06/net-tools.xml
index de02cbc44..1b910acf5 100644
--- a/chapter06/net-tools.xml
+++ b/chapter06/net-tools.xml
@@ -43,10 +43,9 @@ fix by applying the following patch:</para>
 
 <screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-gcc34-2.patch</userinput></screen>
 
-<para>Net-tools has issues with the Linux 2.6 kernel series - fix these issues
-by applying the following patch:</para>
+<para>Fix an issue that arises when building against Linux 2.6:</para>
 
-<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-kernel_headers-1.patch</userinput></screen>
+<screen><userinput>sed -i 's@x25_address@struct &amp;@' lib/x25_sr.c</userinput></screen>
 
 <para>Now prepare Net-tools for compilation (if you intend to accept the
 defaults, you can skip all the questions by running <userinput>yes "" |