From 58fad2ba6b9aebef45f16a67225f5f43a7875787 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Mon, 1 Mar 2010 21:50:38 +0000
Subject: Upgrade to Diffutils-2.9. Fixes #2577.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4138ff95b..5603de930 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,11 @@
     <listitem>
       <para>2010-03-01</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Diffutils-2.9. Fixes
+          <ulink url="&lfs-ticket-root;2577">#2577</ulink>. This also drops
+          the i18n patch as it has been rejected upstream.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgrade to GMP-5.0.1. Fixes
           <ulink url="&lfs-ticket-root;2572">#2572</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a97ac9f5c..e1b9a4a50 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -49,9 +49,9 @@
     <!--<listitem>
       <para>DejaGNU &dejagnu-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Diffutils &diffutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
     </listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 6bb535544..a070701ff 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -42,14 +42,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Diffutils Internationalization Fixes Patch - <token>&diffutils-i18n-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&diffutils-i18n-patch;"/></para>
-        <para>MD5 sum: <literal>&diffutils-i18n-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 4ad5ea535..25c4443da 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -41,20 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>POSIX requires the <command>diff</command> command to treat whitespace
-    characters according to the current locale. The following patch fixes the
-    non-compliance issue:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&diffutils-i18n-patch;</userinput></screen>
-
-    <para>The above patch will cause the Diffutils build system to attempt to
-    rebuild the <filename>diff.1</filename> man page using the unavailable
-    program <command>help2man</command>. The result is an unreadable man page for
-    <command>diff</command>. We can avoid this by updating the timestamp on
-    the file <filename>man/diff.1</filename>:</para>
-
-<screen><userinput remap="pre">touch man/diff.1</userinput></screen>
-
     <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/packages.ent b/packages.ent
index ea8002f76..7f5da884f 100644
--- a/packages.ent
+++ b/packages.ent
@@ -85,10 +85,10 @@
 <!ENTITY dejagnu-ch5-du "6.1 MB">
 <!ENTITY dejagnu-ch5-sbu "less than 0.1 SBU">
 
-<!ENTITY diffutils-version "2.8.1">
-<!ENTITY diffutils-size "762 KB">
+<!ENTITY diffutils-version "2.9">
+<!ENTITY diffutils-size "1,732 KB">
 <!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.gz">
-<!ENTITY diffutils-md5 "71f9c5ae19b60608f6c7f162da86a428">
+<!ENTITY diffutils-md5 "d6bc1bdc874ddb14cfed4d1655a0dbbe">
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
 <!ENTITY diffutils-ch5-du "6.1 MB">
 <!ENTITY diffutils-ch5-sbu "0.1 SBU">
-- 
cgit v1.2.3-54-g00ecf