From 529b9a0dd04f2633761c8097f92d9973b22f3439 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Fri, 9 Feb 2007 20:48:00 +0000
Subject: [PATCH] Upgrade to Gzip-1.3.11. Fixes #1951.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7916 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter06/gzip.xml      | 28 +++++-----------------------
 general.ent             |  4 ++--
 packages.ent            |  6 +++---
 4 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4e2155f93..48ca0b23c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,16 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2007-02-09</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Gzip-1.3.11. Fixes
+          <ulink url="&lfs-ticket-root;1951">#1951</ulink></para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2007-02-07</para>
       <itemizedlist>
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index de57c742b..1d83207c7 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -37,7 +37,7 @@
 
     <para>Prepare Gzip for compilation:</para>
 
-<screen><userinput>./configure --prefix=/usr</userinput></screen>
+<screen><userinput>./configure --prefix=/usr --bindir=/bin</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -50,16 +50,9 @@
 
 <screen><userinput>make install</userinput></screen>
 
-    <para>Move the <command>gzip</command> program to the <filename
-    class="directory">/bin</filename> directory and create some commonly used
-    symlinks to it:</para>
+    <para>Move some programs that do not need to be on the root filesystem.</para>
 
-<screen><userinput>mv -v /usr/bin/gzip /bin
-rm -v /usr/bin/{gunzip,zcat}
-ln -sv gzip /bin/gunzip
-ln -sv gzip /bin/zcat
-ln -sv gzip /bin/compress
-ln -sv gunzip /bin/uncompress</userinput></screen>
+<screen><userinput>mv -v /bin/{gzexe,uncompress,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin</userinput></screen>
 
   </sect2>
 
@@ -70,9 +63,8 @@ ln -sv gunzip /bin/uncompress</userinput></screen>
       <segtitle>Installed programs</segtitle>
 
       <seglistitem>
-        <seg>compress (link to gzip), gunzip (link to gzip), gzexe, gzip,
-        uncompress (link to gunzip), zcat (link to gzip), zcmp, zdiff,
-        zegrep, zfgrep, zforce, zgrep, zless, zmore, and znew</seg>
+        <seg>gunzip, gzexe, gzip, uncompress, zcat, zcmp, zdiff, zegrep, zfgrep,
+        zforce, zgrep, zless, zmore, and znew</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -81,16 +73,6 @@ ln -sv gunzip /bin/uncompress</userinput></screen>
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="compress">
-        <term><command>compress</command></term>
-        <listitem>
-          <para>Compresses and decompresses files</para>
-          <indexterm zone="ch-system-gzip compress">
-            <primary sortas="b-compress">compress</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="gunzip">
         <term><command>gunzip</command></term>
         <listitem>
diff --git a/general.ent b/general.ent
index 7dfe616dd..aab4f7f88 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20070207">
-<!ENTITY releasedate "February 7, 2007">
+<!ENTITY version "SVN-20070209">
+<!ENTITY releasedate "February 9, 2007">
 <!ENTITY milestone "6.3">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 
diff --git a/packages.ent b/packages.ent
index b67003de4..5aed1d7f4 100644
--- a/packages.ent
+++ b/packages.ent
@@ -231,10 +231,10 @@
 <!ENTITY grub-ch6-du "10.2 MB">
 <!ENTITY grub-ch6-sbu "0.2 SBU">
 
-<!ENTITY gzip-version "1.3.10">
-<!ENTITY gzip-size "417 KB">
+<!ENTITY gzip-version "1.3.11">
+<!ENTITY gzip-size "422 KB">
 <!ENTITY gzip-url "&alpha-gnu;gzip/gzip-&gzip-version;.tar.gz">
-<!ENTITY gzip-md5 "8b6f74a5060f984dceb0fee877aed854">
+<!ENTITY gzip-md5 "a41a6a4b11f941cb7fc13df320f3af5f">
 <!ENTITY gzip-home "http://www.gzip.org/">
 <!ENTITY gzip-ch5-du "2.2 MB">
 <!ENTITY gzip-ch5-sbu "less than 0.1 SBU">