Upgrade to Bzip2-1.0.6. Fixes #2759.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9389 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

6 files changed, 23 insertions, 21 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 190e8720a..813c30f9e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
       <para>2010-09-22</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] Upgrade to Bzip2-1.0.6. Fixes
+          <ulink url="&lfs-ticket-root;2759">#2759</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] Add patch to fix &quot;Unknown HZ value&quot; error
           in some procps tools. Thanks to DJ Lucas for the report and
           patch. Fixes
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 32e117e1c..aa5b7ecd5 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -43,9 +43,9 @@
     <!--<listitem> 
       <para>Bison &bison-version;</para>
     </listitem> -->
-    <!--<listitem>
+    <listitem>
       <para>Bzip2 &bzip2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Coreutils &coreutils-version;</para>
     </listitem>-->
@@ -224,6 +224,10 @@
     </listitem>
 
     <listitem>
+      <para>bzip2-1.0.6-install_docs-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>procps-3.2.8-fix_HZ_errors-1.patch</para>
     </listitem>
 
@@ -233,6 +237,14 @@
     <title>Removed:</title>
 
     <listitem>
+      <para>bzip2-1.0.5-install_docs-1.patch</para>
+    </listitem>
+
+    <listitem>
+      <para>bzip2-1.0.5-version_fixes-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>perl-5.12.1-libc-1.patch</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1031b2727..6a1df4b4f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -35,14 +35,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Bzip2 Version Fixes Patch - <token>&bzip2-version-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&bzip2-version-patch;"/></para>
-        <para>MD5 sum: <literal>&bzip2-version-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Coreutils Internationalization Fixes Patch - <token>&coreutils-i18n-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&coreutils-i18n-patch;"/></para>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index c1702c36a..97840c588 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -43,11 +43,9 @@
   <sect2 role="installation">
     <title>Installation of Bzip2</title>
 
-    <para>Apply 2 patches that will install the documentation for this package
-    and correct some hard-coded version numbers:</para>
+    <para>Apply a patch that will install the documentation for this package:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch;
-patch -Np1 -i ../&bzip2-version-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
 
    <para>The following command ensures installation of symbolic links are relative:</para>
 
diff --git a/packages.ent b/packages.ent
index e96a4f31c..b64df5982 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,10 +58,10 @@
 <!ENTITY bison-ch6-du "19.2 MB">
 <!ENTITY bison-ch6-sbu "1.1 SBU">
 
-<!ENTITY bzip2-version "1.0.5">
-<!ENTITY bzip2-size "822 KB">
+<!ENTITY bzip2-version "1.0.6">
+<!ENTITY bzip2-size "764 KB">
 <!ENTITY bzip2-url "http://www.bzip.org/&bzip2-version;/bzip2-&bzip2-version;.tar.gz">
-<!ENTITY bzip2-md5 "3c15a0c8d1d3ee1c46a1634d00617b1a">
+<!ENTITY bzip2-md5 "00b516f4704d4a7cb50a1d97e6e8e15b">
 <!ENTITY bzip2-home "http://www.bzip.org/">
 <!ENTITY bzip2-ch5-du "4.8 MB">
 <!ENTITY bzip2-ch5-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index a27d88c36..f37b337f5 100644
--- a/patches.ent
+++ b/patches.ent
@@ -11,10 +11,6 @@
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
-<!ENTITY bzip2-version-patch "bzip2-&bzip2-version;-version_fixes-1.patch">
-<!ENTITY bzip2-version-patch-md5 "5ef00b9da463b399f3d67ecfa276e7ea">
-<!ENTITY bzip2-version-patch-size "5.3 KB">
-
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
 <!ENTITY coreutils-i18n-patch-md5 "e806ba5734411d1384f1e56169f31b22">