From 5b822933d385b69d811caa8469ab7c7354891d1d Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Thu, 28 Mar 2013 17:39:51 +0000
Subject: Upgrade to Diffutils-3.3. Fixes #3315.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4cbb9f731..7c09add0c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2013-03-28</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Diffutils-3.3. Fixes
+          <ulink url="&lfs-ticket-root;3315">#3315</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to File-5.14. Fixes
           <ulink url="&lfs-ticket-root;3313">#3313</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index b62494530..26c972856 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -55,9 +55,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/chapter05/diffutils.xml b/chapter05/diffutils.xml
index 94ec7c49c..62ba35874 100644
--- a/chapter05/diffutils.xml
+++ b/chapter05/diffutils.xml
@@ -43,10 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>Fix an incompatibility between this package and Glibc-&glibc-version;:</para>
-
-<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</userinput></screen>
-
     <para>Prepare Diffutils for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>
diff --git a/chapter06/diffutils.xml b/chapter06/diffutils.xml
index 6c6400045..0d8bd5c77 100644
--- a/chapter06/diffutils.xml
+++ b/chapter06/diffutils.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Diffutils</title>
 
-    <para>Fix an incompatibility between this package and Glibc-&glibc-version;</para>
-
-<screen><userinput remap="pre">sed -i -e '/gets is a/d' lib/stdio.in.h</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 848cd623d..6cbae60b8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -94,10 +94,10 @@
 <!ENTITY dejagnu-ch5-du "4.1 MB">
 <!ENTITY dejagnu-ch5-sbu "less than 0.1 SBU">
 
-<!ENTITY diffutils-version "3.2">
-<!ENTITY diffutils-size "1,976 KB">
-<!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.gz">
-<!ENTITY diffutils-md5 "22e4deef5d8949a727b159d6bc65c1cc">
+<!ENTITY diffutils-version "3.3">
+<!ENTITY diffutils-size "1,170 KB">
+<!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.xz">
+<!ENTITY diffutils-md5 "99180208ec2a82ce71f55b0d7389f1b3">
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
 <!ENTITY diffutils-ch5-du "8.5 MB">
 <!ENTITY diffutils-ch5-sbu "0.2 SBU">
-- 
cgit v1.2.3-54-g00ecf