Changeset f8966364

Timestamp:

02/17/2009 12:05:07 AM (16 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 12.2, 12.2-rc1, 6.5, 6.6, 6.7, 6.8, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/loongarch-12.2, xry111/mips64el, xry111/multilib, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

84d27d5

Parents:

1d6d219

Message:

Upgrade to Grep-2.5.4. Fixes #2346.

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

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (3 diffs)
• chapter03/patches.xml (modified) (1 diff)
• chapter06/grep.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -42 +42 @@
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgraded to Grep-2.5.4.  Fixes
+          <ulink url="&lfs-ticket-root;2346">#2346</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Upgraded to Man-Pages-3.18.  Fixes
           <ulink url="&lfs-ticket-root;2347">#2347</ulink>.</para>

chapter01/whatsnew.xml

@@ -84 +84 @@
       <para>GMP &gmp-version;</para>
     </listitem> -->
-    <!--<listitem>
+    <listitem>
       <para>Grep &grep-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Groff &groff-version;</para>
@@ -218 +218 @@
 
     <listitem>
+      <para>&grep-debian-patch;</para>
+    </listitem>
+
+    <listitem>
       <para>&inetutils-man_pages-patch;</para>
     </listitem>
@@ -267 +271 @@
     </listitem>
     <listitem>
+      <para>grep-2.5.3-debian_fixes-1.patch</para>
+    </listitem>
+    <listitem>
+      <para>grep-2.5.3-upstream_fixes-1.patch</para>
+    </listitem>
+    <listitem>
       <para>groff-1.18.1.4-debian_fixes-1.patch</para>
     </listitem>

chapter03/patches.xml

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

chapter06/grep.xml

@@ -47 +47 @@
 
 <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>Prepare Grep for compilation:</para>

packages.ent

@@ -218 +218 @@
 <!ENTITY gmp-ch6-sbu "1.5 SBU testsuite included">
 
-<!ENTITY grep-version "2.5.3">
-<!ENTITY grep-size "604 KB">
+<!ENTITY grep-version "2.5.4">
+<!ENTITY grep-size "706 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.bz2">
-<!ENTITY grep-md5 "27061ce1fde82876970b6549a156da8b">
+<!ENTITY grep-md5 "5650ee2ae6ea4b39e9459d7d0585b315">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-ch5-du "6.9 MB">

patches.ent

@@ -60 +60 @@
 <!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">