Upgrade to Grep-2.6.1. Fixes #2617.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9237 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

chapter01/changelog.xml

@@ -39,6 +39,10 @@
     <listitem>
       <para>2010-03-27</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Grep-2.6.1. Fixes
+          <ulink url="&lfs-ticket-root;2617">#2617</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgrade to Util-Linux-NG-2.17.2. Fixes
           <ulink url="&lfs-ticket-root;2616">#2616</ulink>.</para>

chapter01/whatsnew.xml

@@ -85,9 +85,9 @@
     <listitem>
       <para>GMP &gmp-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Groff &groff-version;</para>
     </listitem>-->
@@ -216,12 +216,12 @@
 
   </itemizedlist>-->
 
-  <!--<itemizedlist>
+  <itemizedlist>
     <title>Removed:</title>
 
     <listitem>
-      <para>PLACEHOLDER</para>
+      <para>grep-2.5.4-debian_fixes-1.patch</para>
     </listitem>
-  </itemizedlist>-->
+  </itemizedlist>
 
 </sect1>

chapter03/patches.xml

@@ -82,13 +82,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <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>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>

chapter05/grep.xml

@@ -46,8 +46,7 @@
     <para>Prepare Grep for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools \
-    --disable-perl-regexp \
-    --without-included-regex</userinput></screen>
+    --disable-perl-regexp</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure switches:</title>
@@ -61,15 +60,6 @@
           once we enter the <command>chroot</command> environment.</para>
         </listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term><parameter>--without-included-regex</parameter></term>
-        <listitem>
-          <para>The configure check for Glibc's regex library is broken when
-          building against Glibc-&glibc-version;.  This switch forces the use of
-          Glibc's regex library.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>

chapter06/grep.xml

@@ -40,32 +40,10 @@
   <sect2 role="installation">
     <title>Installation of Grep</title>
 
-    <para>The current Grep package has many bugs, especially in the support of
-    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>Prepare Grep for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr \
-    --bindir=/bin \
-    --without-included-regex</userinput></screen>
-
-
-    <variablelist>
-      <title>The meaning of the configure switch:</title>
-      <varlistentry>
-        <term><parameter>--without-included-regex</parameter></term>
-        <listitem>
-          <para>The configure check for Glibc's regex library is broken when
-          building against Glibc-&glibc-version;.  This switch forces the use
-          of Glibc's regex library.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-
+    --bindir=/bin</userinput></screen>
 
     <para>Compile the package:</para>
 
@@ -73,13 +51,7 @@
 
     <para>To test the results, issue:</para>
 
-<screen><userinput remap="test">make check || true</userinput></screen>
-
-    <para>There are known test failures in the <command>fmbtest.sh</command>
-    tests.  The &quot;|| true&quot; construct is
-    used to avoid automated build scripts failing due to the test failures.
-    A good run will show 1 failure from 14 tests, although the test failure
-    will detail 2 failed sub-tests.</para>
+<screen><userinput remap="test">make check</userinput></screen>
 
     <para>Install the package:</para>
 

packages.ent

@@ -210,10 +210,10 @@
 <!ENTITY gmp-ch6-du "39 MB testsuite included">
 <!ENTITY gmp-ch6-sbu "1.7 SBU testsuite included">
 
-<!ENTITY grep-version "2.5.4">
-<!ENTITY grep-size "706 KB">
-<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
-<!ENTITY grep-md5 "5650ee2ae6ea4b39e9459d7d0585b315">
+<!ENTITY grep-version "2.6.1">
+<!ENTITY grep-size "1,274 KB">
+<!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.gz">
+<!ENTITY grep-md5 "8d1496da11029112a4d0986cbf09e26f">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "6.7 MB">
 <!ENTITY grep-ch5-sbu "0.1 SBU">

patches.ent

@@ -45,11 +45,6 @@
 <!ENTITY gettext-upstream_fixes-patch-size "2.9 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 grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch">
 <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673">
 <!ENTITY grub-inode-patch-size "4.8 KB">