From 141731e1b88e5e7fb3cea0d2fa15be86c3072167 Mon Sep 17 00:00:00 2001
From: Jeremy Huntwork <jhuntwork@linuxfromscratch.org>
Date: Fri, 14 Oct 2005 14:55:00 +0000
Subject: Added the bzip2 security and install docs patches

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.1.1/BOOK@7009 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  5 +++++
 chapter03/patches.xml   | 14 ++++++++++++++
 chapter06/bzip2.xml     | 11 +++++++++++
 3 files changed, 30 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 69bae9433..c9af4270e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -27,6 +27,8 @@ First a summary, then a detailed log.</para>
 <listitem><para>Added:</para>
 <itemizedlist>
 <listitem><para>texinfo-4.8-tempfile_fix-1.patch</para></listitem>
+<listitem><para>bzip2-1.0.3-install_docs-1.patch</para></listitem>
+<listitem><para>bzip2-1.0.3-bzgrep_security-1.patch</para></listitem>
 </itemizedlist>
 </listitem>
 
@@ -36,6 +38,9 @@ First a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>October 14th, 2005 [jhuntwork]: Added the bzip2 security
+and install docs patches.</para></listitem> 	
+
 <listitem><para>October 14th, 2005 [jhuntwork]: Added the tempfile patch
 for texinfo.</para></listitem> 	
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7972df910..e6f31e55f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -29,6 +29,20 @@ needed to build an LFS system:</para>
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>Bzip2 Documentation Patch - 1 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&bzip2-docs-patch;"/></para>
+</listitem>
+</varlistentry>
+
+<varlistentry>
+<term>Bzip2 Bzgrep Security Fixes Patch - 1 KB:</term>
+<listitem>
+<para><ulink url="&patches-root;&bzip2-bzgrep-patch;"/></para>
+</listitem>
+</varlistentry>
+
 <varlistentry>
 <term>Coreutils Suppress Uptime, Kill, Su Patch - 15 KB:</term>
 <listitem>
diff --git a/chapter06/bzip2.xml b/chapter06/bzip2.xml
index f8907d789..cc4e011fc 100644
--- a/chapter06/bzip2.xml
+++ b/chapter06/bzip2.xml
@@ -30,6 +30,17 @@ GCC, Glibc, and Make</seg></seglistitem>
 <sect2 role="installation">
 <title>Installation of Bzip2</title>
 
+<para>Apply a patch to install the documentation for this package:</para>
+
+<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>Prepare Bzip2 for compilation with:</para>
 
 <screen><userinput>make -f Makefile-libbz2_so
-- 
cgit v1.2.3-54-g00ecf