From f639fa966c13e39b8d1e3f66e350ad0f0c21770e Mon Sep 17 00:00:00 2001 From: Matthew Burgess Date: Wed, 31 Jan 2007 18:02:20 +0000 Subject: [PATCH] Upgrade to Bzip2-1.0.4. Fixes #1943. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7893 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 ++++++++++ chapter01/whatsnew.xml | 4 ++-- chapter03/patches.xml | 8 -------- chapter06/bzip2.xml | 15 +-------------- general.ent | 4 ++-- packages.ent | 6 +++--- patches.ent | 6 +----- 7 files changed, 19 insertions(+), 34 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 8fb308ab8..aea99983f 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,16 @@ --> + + 2007-01-31 + + + [matthew] - Upgrade to Bzip2-1.0.4. Fixes + #1943. + + + + 2007-01-13 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index ed1f7239a..6ce58f747 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -40,9 +40,9 @@ Bison &bison-version; - + Coreutils &coreutils-version; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 5bc3bbb7e..4512538dd 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -26,14 +26,6 @@ - - Bzip2 Bzgrep Security Fixes Patch - &bzip2-bzgrep-patch-size;: - - Download: - MD5 sum: &bzip2-bzgrep-patch-md5; - - - Bzip2 Documentation Patch - &bzip2-docs-patch-size;: 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 @@ patch -Np1 -i ../&bzip2-docs-patch; - The bzgrep command does not escape '|' and '&' - in filenames passed to it. This allows arbitrary commands to be executed - with the privileges of the user running bzgrep. Apply - the following to address this: - -patch -Np1 -i ../&bzip2-bzgrep-patch; - - The bzdiff script still uses the deprecated - tempfile program. Update it to use - mktemp instead: - -sed -i 's@tempfile -d /tmp -p bz@mktemp -p /tmp@' bzdiff - Prepare Bzip2 for compilation with: make -f Makefile-libbz2_so @@ -85,7 +72,7 @@ make clean Install the programs: -make install +make PREFIX=/usr install Install the shared bzip2 binary into the /bin directory, make diff --git a/general.ent b/general.ent index f62b850e0..aa9c4e04c 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - - + + diff --git a/packages.ent b/packages.ent index 28c5ddaf9..5900a1975 100644 --- a/packages.ent +++ b/packages.ent @@ -62,10 +62,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index 8f0d67ab1..6662b37ce 100644 --- a/patches.ent +++ b/patches.ent @@ -6,12 +6,8 @@ - - - - - +