From 7ad8b08ffc6126477fc98cba7ca5ce5e9f0c8452 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 24 Jan 2010 09:46:14 +0000
Subject: [PATCH] Upgrade to Gzip-1.4. Fixes #2551.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c70e08c98..028aa5d89 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2010-01-24</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Gzip-1.4. Fixes
+          <ulink url="&lfs-ticket-root;2551">#2551</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgrade to Udev-150. Fixes
           <ulink url="&lfs-ticket-root;2547">#2547</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 66f8023c3..3c7d99431 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -218,10 +218,6 @@
       <para>coreutils-8.4-uname-1.patch</para>
     </listitem>
 
-    <listitem>
-      <para>gzip-1.3.13-zdiff-1.patch</para>
-    </listitem>
-
     <listitem>
       <para>patch-2.6.1-test_fix-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 9e5785c2e..4393e7672 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -114,14 +114,6 @@
       </listitem>
     </varlistentry>
 -->
-    <varlistentry>
-      <term>Gzip Zdiff Patch - <token>&gzip-zdiff-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gzip-zdiff-patch;"/></para>
-        <para>MD5 sum: <literal>&gzip-zdiff-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 467471388..7b5a5e20a 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -41,11 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
 
-    <para>Fix a bug in gzip, whereby zdiff doesn't work correctly when invoked
-    on two compressed inputs:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&gzip-zdiff-patch;</userinput></screen>
-
     <para>Prepare Gzip for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 574cb26d2..f78f34b95 100644
--- a/packages.ent
+++ b/packages.ent
@@ -235,10 +235,10 @@
 <!ENTITY grub-ch6-du "27.5 MB">
 <!ENTITY grub-ch6-sbu "0.4 SBU">
 
-<!ENTITY gzip-version "1.3.13">
-<!ENTITY gzip-size "795 KB">
+<!ENTITY gzip-version "1.4">
+<!ENTITY gzip-size "886 KB">
 <!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.gz">
-<!ENTITY gzip-md5 "c54a31b93e865f6a4410b2dc64662706">
+<!ENTITY gzip-md5 "e381b8506210c794278f5527cba0e765">
 <!ENTITY gzip-home "http://www.gzip.org/">
 <!ENTITY gzip-ch5-du "3.3 MB">
 <!ENTITY gzip-ch5-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 937f427f1..e3f989ded 100644
--- a/patches.ent
+++ b/patches.ent
@@ -59,11 +59,6 @@
 <!ENTITY grub-geometry-patch-size "28 KB">
 
 
-<!ENTITY gzip-zdiff-patch "gzip-&gzip-version;-zdiff-1.patch">
-<!ENTITY gzip-zdiff-patch-md5 "3736ea34a678e6411bbdc4b2797eb5be">
-<!ENTITY gzip-zdiff-patch-size "17.5 KB">
-
-
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">