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

@@ -36,6 +36,16 @@
     </listitem>
 -->
 
+    <listitem>
+      <para>2008-02-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Updated Grep to 2.5.3, thanks to Matthew for the fix
+	  for automated builds.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2008-02-17</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -86,9 +86,9 @@
     <listitem>
       <para>Glibc &glibc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Groff &groff-version;</para>
     </listitem>-->
@@ -212,6 +212,14 @@
       <para>&bash-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&grep-debian-patch;</para>
+    </listitem>
+
+    <listitem>
+      <para>&grep-fixes-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
@@ -245,6 +253,10 @@
       <para>gcc-4.1.2-specs-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>grep-2.5.1-redhat_fixes-2.patch</para>
+   </listitem>
+
     <listitem>
       <para>man-db-2.4.4-fixes-1.patch</para>
     </listitem>

chapter03/patches.xml

@@ -83,7 +83,15 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Grep RedHat Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
+      <term>Grep Debian Patch - <token>&grep-debian-patch-size;</token>;</term>
+      <listitem>
+	<para>Download: <ulink url="&patches-root;&grep-debian-patch;"/></para>
+	<para>MD5 sum: <literal>&grep-debian-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term>Grep Upstream Fixes Patch - <token>&grep-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&grep-fixes-patch;"/></para>
         <para>MD5 sum: <literal>&grep-fixes-patch-md5;</literal></para>

chapter06/grep.xml

@@ -41,15 +41,18 @@
     <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-debian-patch;</userinput></screen>
+
+    <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">patch -Np1 -i ../&grep-fixes-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>
-
-<screen><userinput remap="pre">chmod +x tests/fmbtest.sh</userinput></screen>
-
     <para>Prepare Grep for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin</userinput></screen>
@@ -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>
 

general.ent

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20080217">
-<!ENTITY releasedate "February 17, 2008">
+<!ENTITY version "SVN-20080219">
+<!ENTITY releasedate "February 19, 2008">
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
 

packages.ent

@@ -207,14 +207,14 @@
 <!ENTITY glibc-libidn-md5 "226809992fb1f3dc6ea23e0f26952ea4">
 <!ENTITY glibc-libidn-home " ">
 
-<!ENTITY grep-version "2.5.1a">
-<!ENTITY grep-size "516 KB">
+<!ENTITY grep-version "2.5.3">
+<!ENTITY grep-size "604 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
-<!ENTITY grep-md5 "52202fe462770fa6be1bb667bd6cf30c">
+<!ENTITY grep-md5 "27061ce1fde82876970b6549a156da8b">
 <!ENTITY grep-home "&gnu-software;grep/">
-<!ENTITY grep-ch5-du "4.8 MB">
+<!ENTITY grep-ch5-du "6.9 MB">
 <!ENTITY grep-ch5-sbu "0.1 SBU">
-<!ENTITY grep-ch6-du "4.8 MB">
+<!ENTITY grep-ch6-du "7.2 MB">
 <!ENTITY grep-ch6-sbu "0.1 SBU">
 
 <!ENTITY groff-version "1.18.1.4">

patches.ent

@@ -40,9 +40,13 @@
 <!ENTITY expect-spawn-patch-size "6.8 KB">
 
 
-<!ENTITY grep-fixes-patch "grep-&grep-version;-redhat_fixes-2.patch">
-<!ENTITY grep-fixes-patch-md5 "2c67910be2d0a54714f63ce350e6d8a6">
-<!ENTITY grep-fixes-patch-size "55 KB">
+<!ENTITY grep-debian-patch "grep-&grep-version;-debian_fixes-1.patch">
+<!ENTITY grep-debian-patch-md5 "337d017202d7e3b08d428a89da3ee572">
+<!ENTITY grep-debian-patch-size "27 KB">
+
+<!ENTITY grep-fixes-patch "grep-&grep-version;-upstream_fixes-1.patch">
+<!ENTITY grep-fixes-patch-md5 "44f9c5e7df7746e6115be47e5a068ab8">
+<!ENTITY grep-fixes-patch-size "5.8 KB">
 
 
 <!ENTITY groff-debian-patch "groff-&groff-version;-debian_fixes-1.patch">