From f639fa966c13e39b8d1e3f66e350ad0f0c21770e Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Wed, 31 Jan 2007 18:02:20 +0000
Subject: Upgrade to Bzip2-1.0.4.  Fixes #1943.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7893 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/bzip2.xml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index 69d4d9b12..d3fa46c49 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -41,19 +41,6 @@
 
 <screen><userinput>patch -Np1 -i ../&bzip2-docs-patch;</userinput></screen>
 
-    <para>The <command>bzgrep</command> command does not escape '|' and '&amp;'
-    in filenames passed to it. This allows arbitrary commands to be executed
-    with the privileges of the user running <command>bzgrep</command>. Apply
-    the following to address this:</para>
-
-<screen><userinput>patch -Np1 -i ../&bzip2-bzgrep-patch;</userinput></screen>
-
-    <para>The <command>bzdiff</command> script still uses the deprecated
-    <command>tempfile</command> program. Update it to use
-    <command>mktemp</command> instead:</para>
-
-<screen><userinput>sed -i 's@tempfile -d /tmp -p bz@mktemp -p /tmp@' bzdiff</userinput></screen>
-
     <para>Prepare Bzip2 for compilation with:</para>
 
 <screen><userinput>make -f Makefile-libbz2_so
@@ -85,7 +72,7 @@ make clean</userinput></screen>
 
     <para>Install the programs:</para>
 
-<screen><userinput>make install</userinput></screen>
+<screen><userinput>make PREFIX=/usr install</userinput></screen>
 
     <para>Install the shared <command>bzip2</command> binary into the
     <filename class="directory">/bin</filename> directory, make
-- 
cgit v1.2.3-54-g00ecf