From e577c86e71cb6a9614b468e3afeef9602176ad6b Mon Sep 17 00:00:00 2001 From: Ken Moffat Date: Tue, 19 Feb 2008 19:54:40 +0000 Subject: [PATCH] Upgrade grep to 2.5.3, fixes #2054. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8487 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter01/changelog.xml | 10 ++++++++++ chapter01/whatsnew.xml | 16 ++++++++++++++-- chapter03/patches.xml | 10 +++++++++- chapter06/grep.xml | 24 +++++++++++++++++------- general.ent | 4 ++-- packages.ent | 10 +++++----- patches.ent | 10 +++++++--- 7 files changed, 64 insertions(+), 20 deletions(-) diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 335e6a7d3..6f3a3a0e5 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -36,6 +36,16 @@ --> + + 2008-02-19 + + + [ken] - Updated Grep to 2.5.3, thanks to Matthew for the fix + for automated builds. + + + + 2008-02-17 diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 2aa41ea56..5914dbdb5 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -86,9 +86,9 @@ Glibc &glibc-version; - + @@ -212,6 +212,14 @@ &bash-fixes-patch; + + &grep-debian-patch; + + + + &grep-fixes-patch; + + &readline-fixes-patch; @@ -245,6 +253,10 @@ gcc-4.1.2-specs-1.patch + + grep-2.5.1-redhat_fixes-2.patch + + man-db-2.4.4-fixes-1.patch diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 54d639812..2d1a4b938 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -83,7 +83,15 @@ - Grep RedHat Fixes Patch - &grep-fixes-patch-size;: + Grep Debian Patch - &grep-debian-patch-size;; + + Download: + MD5 sum: &grep-debian-patch-md5; + + + + + Grep Upstream Fixes Patch - &grep-fixes-patch-size;: Download: MD5 sum: &grep-fixes-patch-md5; diff --git a/chapter06/grep.xml b/chapter06/grep.xml index 2111da256..22d65df95 100644 --- a/chapter06/grep.xml +++ b/chapter06/grep.xml @@ -41,15 +41,18 @@ Installation of Grep The current Grep package has many bugs, especially in the support of - multibyte locales. RedHat fixed some of them with the following patch: + multibyte locales. The following consolidated patch from Debian fixes some of them, + improves the number of individual tests which are passed, and much improves the + speed in UTF-8 locales: + +patch -Np1 -i ../&grep-debian-patch; + + Upstream have fixed some of the documentation, and changed some of the + tests and the expected results in the newest test scripts. This means that + not so many of the individual tests fail: patch -Np1 -i ../&grep-fixes-patch; - In order for the tests added by this patch to pass, the permissions for - the test file have to be changed: - -chmod +x tests/fmbtest.sh - Prepare Grep for compilation: ./configure --prefix=/usr --bindir=/bin @@ -60,7 +63,14 @@ To test the results, issue: -make check +make check || true + + There are known test failures in the foad1.sh and + fmbtest.sh tests. The "|| true" construct is + used to avoid build automated build scripts failing due to the test failures. + A good run will show 2 failures from 14 tests, but if you look at the + output you will see in excess of forty individual tests which failed - these + are all in the new tests added since the previous version. Install the package: diff --git a/general.ent b/general.ent index 089483ac7..8bef3f0ed 100644 --- a/general.ent +++ b/general.ent @@ -1,6 +1,6 @@ - - + + diff --git a/packages.ent b/packages.ent index 24a496ae1..a889412ef 100644 --- a/packages.ent +++ b/packages.ent @@ -207,14 +207,14 @@ - - + + - + - + - + diff --git a/patches.ent b/patches.ent index fba13d080..b88716dad 100644 --- a/patches.ent +++ b/patches.ent @@ -40,9 +40,13 @@ - - - + + + + + + +