From e577c86e71cb6a9614b468e3afeef9602176ad6b Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Tue, 19 Feb 2008 19:54:40 +0000
Subject: Upgrade grep to 2.5.3, fixes #2054.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8487 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter06/grep.xml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

(limited to 'chapter06')

diff --git a/chapter06/grep.xml b/chapter06/grep.xml
index 2111da256..22d65df95 100644
--- a/chapter06/grep.xml
+++ b/chapter06/grep.xml
@@ -41,14 +41,17 @@
     <title>Installation of Grep</title>
 
     <para>The current Grep package has many bugs, especially in the support of
-    multibyte locales. RedHat fixed some of them with the following patch:</para>
+    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:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&grep-debian-patch;</userinput></screen>
 
-    <para>In order for the tests added by this patch to pass, the permissions for
-    the test file have to be changed:</para>
+    <para>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:</para>
 
-<screen><userinput remap="pre">chmod +x tests/fmbtest.sh</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&grep-fixes-patch;</userinput></screen>
 
     <para>Prepare Grep for compilation:</para>
 
@@ -60,7 +63,14 @@
 
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check</userinput></screen>
+<screen><userinput remap="test">make check || true</userinput></screen>
+
+    <para>There are known test failures in the <command>foad1.sh</command> and
+    <command>fmbtest.sh</command> tests.  The &quot;|| true&quot; 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.</para>
 
     <para>Install the package:</para>
 
-- 
cgit v1.2.3-54-g00ecf