From 358d3cb19cf3c62fb0dccb22c02b00030dfbb11a Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sat, 28 Oct 2006 22:10:12 +0000
Subject: [PATCH] Upgrade to Inetutils-1.5

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7842 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 7 +++++--
 chapter03/patches.xml   | 8 --------
 chapter06/inetutils.xml | 5 -----
 packages.ent            | 6 +++---
 patches.ent             | 8 ++------
 6 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 8d365aa8c..92610fd8f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2006-10-28</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Inetutils-1.5, including dropping the now
+          unnecessary &quot;GCC 4 fixes&quot; patch.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Groff-1.18.1.4.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a45a69e57..0a90f8d0c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -94,9 +94,9 @@
     <!--<listitem>
       <para>IANA-Etc &iana-etc-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Inetutils &inetutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>IPRoute2 &iproute2-version;</para>
     </listitem>-->
@@ -227,6 +227,9 @@
     <listitem>
       <para>glibc-2.3.6-linux_types-1.patch</para>
     </listitem>
+    <listitem>
+      <para>inetutils-gcc4_fixes-3.patch</para>
+    </listitem>
     <listitem>
       <para>linux-2.6.17.13-utf8_input-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index f48c1074e..350136839 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -130,14 +130,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Inetutils GCC-4.x Fix Patch - <token>&inetutils-gcc4_fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&inetutils-gcc4_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&inetutils-gcc4_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Inetutils No-Server-Man-Pages Patch - <token>&inetutils-man_pages-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/inetutils.xml b/chapter06/inetutils.xml
index 87bd5e35c..1bf49f0e6 100644
--- a/chapter06/inetutils.xml
+++ b/chapter06/inetutils.xml
@@ -34,11 +34,6 @@
   <sect2 role="installation">
     <title>Installation of Inetutils</title>
 
-    <para>Apply a patch to Inetutils to enable it to compile with
-    GCC-&gcc-version;:</para>
-
-<screen><userinput>patch -Np1 -i ../&inetutils-gcc4_fixes-patch;</userinput></screen>
-
     <para>All programs that come with Inetutils will not be installed.
     However, the Inetutils build system will insist on installing all the
     man pages anyway. The following patch will correct this
diff --git a/packages.ent b/packages.ent
index 74dd5d549..19a29bf32 100644
--- a/packages.ent
+++ b/packages.ent
@@ -249,10 +249,10 @@
 <!ENTITY iana-etc-ch6-du "2.1 MB">
 <!ENTITY iana-etc-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY inetutils-version "1.4.2">
-<!ENTITY inetutils-size "1,019 KB">
+<!ENTITY inetutils-version "1.5">
+<!ENTITY inetutils-size "1,364 KB">
 <!ENTITY inetutils-url "&gnu;inetutils/inetutils-&inetutils-version;.tar.gz">
-<!ENTITY inetutils-md5 "df0909a586ddac2b7a0d62795eea4206">
+<!ENTITY inetutils-md5 "9e0f1ac040de3168ea785f44e42d585e">
 <!ENTITY inetutils-home "&gnu-software;inetutils/">
 <!ENTITY inetutils-ch6-du "8.9 MB">
 <!ENTITY inetutils-ch6-sbu "0.2 SBU">
diff --git a/patches.ent b/patches.ent
index d5392142c..cd189ec2a 100644
--- a/patches.ent
+++ b/patches.ent
@@ -67,13 +67,9 @@
 <!ENTITY gzip-security_fix-patch-size "2 KB">
 
 
-<!ENTITY inetutils-gcc4_fixes-patch "inetutils-&inetutils-version;-gcc4_fixes-3.patch">
-<!ENTITY inetutils-gcc4_fixes-patch-md5 "5204fbc503c9fb6a8e353583818db6b9">
-<!ENTITY inetutils-gcc4_fixes-patch-size "1.3 KB">
-
 <!ENTITY inetutils-man_pages-patch "inetutils-&inetutils-version;-no_server_man_pages-1.patch">
-<!ENTITY inetutils-man_pages-patch-md5 "eb477f532bc6d26e7025fcfc4452511d">
-<!ENTITY inetutils-man_pages-patch-size "4.1 KB">
+<!ENTITY inetutils-man_pages-patch-md5 "9d5677f8529af9a321630572716d4d2e">
+<!ENTITY inetutils-man_pages-patch-size "4.8 KB">
 
 
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">