diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 190e8720a..813c30f9e 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,10 @@ 2010-09-22 + + [matthew] Upgrade to Bzip2-1.0.6. Fixes + #2759. + [matthew] Add patch to fix "Unknown HZ value" error in some procps tools. Thanks to DJ Lucas for the report and 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 @@ - + @@ -223,6 +223,10 @@ perl-5.12.2-libc-1.patch + + bzip2-1.0.6-install_docs-1.patch + + procps-3.2.8-fix_HZ_errors-1.patch @@ -232,6 +236,14 @@ Removed: + + bzip2-1.0.5-install_docs-1.patch + + + + bzip2-1.0.5-version_fixes-1.patch + + perl-5.12.1-libc-1.patch diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 1031b2727..6a1df4b4f 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -34,14 +34,6 @@ - - Bzip2 Version Fixes Patch - &bzip2-version-patch-size;: - - Download: - MD5 sum: &bzip2-version-patch-md5; - - - Coreutils Internationalization Fixes Patch - &coreutils-i18n-patch-size;: 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 @@ Installation of Bzip2 - Apply 2 patches that will install the documentation for this package - and correct some hard-coded version numbers: + Apply a patch that will install the documentation for this package: -patch -Np1 -i ../&bzip2-docs-patch; -patch -Np1 -i ../&bzip2-version-patch; +patch -Np1 -i ../&bzip2-docs-patch; The following command ensures installation of symbolic links are relative: diff --git a/packages.ent b/packages.ent index e96a4f31c..b64df5982 100644 --- a/packages.ent +++ b/packages.ent @@ -58,10 +58,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index a27d88c36..f37b337f5 100644 --- a/patches.ent +++ b/patches.ent @@ -11,10 +11,6 @@ - - - -