From 7e8ba2229cf077b2151188ba7e34ca5be3b9c986 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 3 Jan 2010 19:05:55 +0000
Subject: [PATCH] Upgrade to Readline-6.1. Fixes #2540.

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

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 697162f32..8b3c603de 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2010-01-03</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Readline-6.1. Fixes
+          <ulink url="&lfs-ticket-root;2540">#2540</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] Upgrade to Bash-4.1. Fixes
           <ulink url="&lfs-ticket-root;2539">#2539</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 6bbd5bcb2..5cdbcb3e4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -157,9 +157,9 @@
     <listitem>
       <para>Psmisc &psmisc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Readline &readline-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Sed &sed-version;</para>
     </listitem>-->
@@ -250,6 +250,10 @@
     <listitem>
       <para>patch-2.5.9-fixes-1.patch</para>
     </listitem>
+
+    <listitem>
+      <para>readline-6.0-fixes-1.patch</para>
+    </listitem>
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 1d5b60ce4..9e5785c2e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -178,14 +178,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Readline Upstream Fixes Patch - <token>&readline-fixes-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&readline-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <!-- <varlistentry>
       <term>Shadow Useradd Patch - <token>&shadow-useradd-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index c595dc396..8f852df30 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -49,11 +49,6 @@
 <screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in
 sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
-    <para>Apply fixes for several bugs discovered since the initial release of
-    Readline-&readline-version;:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
     <para>Prepare Readline for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --libdir=/lib</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 50783e95e..676a36376 100644
--- a/packages.ent
+++ b/packages.ent
@@ -429,10 +429,10 @@
 <!ENTITY psmisc-ch6-du "2.5 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY readline-version "6.0">
-<!ENTITY readline-size "2,218 KB">
+<!ENTITY readline-version "6.1">
+<!ENTITY readline-size "2,209 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "b7f65a48add447693be6e86f04a63019">
+<!ENTITY readline-md5 "fc2f7e714fe792db1ce6ddc4c9fb4ef3">
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 <!ENTITY readline-ch6-du "13.8 MB">
 <!ENTITY readline-ch6-sbu "0.2 SBU">
diff --git a/patches.ent b/patches.ent
index a71c215ed..937f427f1 100644
--- a/patches.ent
+++ b/patches.ent
@@ -83,11 +83,6 @@
 <!ENTITY procps-watch-patch-size "3.5 KB">
 
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
-<!ENTITY readline-fixes-patch-md5 "aada5f5c582a769735286e7ed1a80af7">
-<!ENTITY readline-fixes-patch-size "3.6 KB">
-
-
 <!-- <!ENTITY shadow-useradd-patch "shadow-&shadow-version;-useradd_fix-2.patch">
 <!ENTITY shadow-useradd-patch-md5 "5f35528f38d5432d5fa2dd79d04bdfdd">
 <!ENTITY shadow-useradd-patch-size "6.1 KB"> -->