From 7aea76f953a96dddf11f49679275ba3aba496eba Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Fri, 28 Dec 2012 10:22:34 +0000
Subject: [PATCH] Upgrade to Sed-4.2.2. Fixes #3260.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10074 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 8 ++++++--
 chapter03/patches.xml   | 8 --------
 chapter06/sed.xml       | 4 ----
 packages.ent            | 6 +++---
 patches.ent             | 5 -----
 6 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b5960ebe8..e0a55f6e9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,10 @@
     <listitem>
       <para>2012-12-28</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to Sed-4.2.2.  Fixes
+          <ulink url="&lfs-ticket-root;3260">#3260</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to GMP-5.1.0.  Fixes
           <ulink url="&lfs-ticket-root;3259">#3259</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 19b1cfa75..5a870fd01 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -172,9 +172,9 @@
     <!--<listitem>
       <para>Readline &readline-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Sed &sed-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Shadow &shadow-version;</para>
     </listitem>-->
@@ -273,6 +273,10 @@
       <para>patch-2.6.1-test_fix-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>sed-4.2.1-testsuite_fixes-1.patch</para>
+    </listitem>
+
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7eba63141..09ab963c9 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -122,14 +122,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Sed Regression Tests Patch - <token>&sed-testsuite-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&sed-testsuite-patch;"/></para>
-        <para>MD5 sum: <literal>&sed-testsuite-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <!--<varlistentry>
       <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/sed.xml b/chapter06/sed.xml
index ad9595772..a9fc5d869 100644
--- a/chapter06/sed.xml
+++ b/chapter06/sed.xml
@@ -40,10 +40,6 @@
   <sect2 role="installation">
     <title>Installation of Sed</title>
 
-    <para>First, fix some regression tests:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&sed-testsuite-patch;</userinput></screen>
-
     <para>Prepare Sed for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin --htmldir=/usr/share/doc/sed-&sed-version;</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 464d201c9..ab4a19673 100644
--- a/packages.ent
+++ b/packages.ent
@@ -461,10 +461,10 @@
 <!ENTITY readline-ch6-du "17.2 MB">
 <!ENTITY readline-ch6-sbu "0.1 SBU">
 
-<!ENTITY sed-version "4.2.1">
-<!ENTITY sed-size "878 KB">
+<!ENTITY sed-version "4.2.2">
+<!ENTITY sed-size "1,035 KB">
 <!ENTITY sed-url "&gnu;sed/sed-&sed-version;.tar.bz2">
-<!ENTITY sed-md5 "7d310fbd76e01a01115075c1fd3f455a">
+<!ENTITY sed-md5 "7ffe1c7cdc3233e1e0c4b502df253974">
 <!ENTITY sed-home "&gnu-software;sed/">
 <!ENTITY sed-ch5-du "10.5 MB">
 <!ENTITY sed-ch5-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index da79b6be4..012a29e1e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -81,11 +81,6 @@
 <!ENTITY readline-fixes-patch-size "1.3 KB">
 
 
-<!ENTITY sed-testsuite-patch "sed-&sed-version;-testsuite_fixes-1.patch">
-<!ENTITY sed-testsuite-patch-md5 "2c10a5804eedf5359bcf427bc0d05579">
-<!ENTITY sed-testsuite-patch-size "1.9 KB">
-
-
 <!ENTITY tar-overflow-patch "tar-&tar-version;-overflow_fix-1.patch">
 <!ENTITY tar-overflow-patch-md5 "1912ec36d2a0e2b96678651cf583ce6f">
 <!ENTITY tar-overflow-patch-size "1.7 KB">