Upgrade to Readline-6.0. Fixes #2353.

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

6 files changed, 11 insertions, 31 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 675b4a4f1..30d83b50e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,6 +41,10 @@
       <para>2009-03-11</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgraded to Readline-6.0. Fixes
+          <ulink url="&lfs-ticket-root;2353">#2353</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Upgraded to MPFR-2.4.1. Fixes
           <ulink url="&lfs-ticket-root;2359">#2359</ulink>.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 83c2c14ae..1fbb3033d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -155,9 +155,9 @@
     <!--<listitem>
       <para>Psmisc &psmisc-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Readline &readline-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Sed &sed-version;</para>
     </listitem>-->
@@ -245,10 +245,6 @@
     </listitem>
 
     <listitem>
-      <para>&readline-fixes-patch;</para>
-    </listitem>
-
-    <listitem>
       <para>&tar-testsuite-patch;</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 75d4b631b..f409f218c 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -194,14 +194,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>Readline 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 3f3279257..8f852df30 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -49,13 +49,6 @@
 <screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in
 sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
-    <para>Readline contains a bug in its handling of non-multibyte characters,
-    which can lead to incorrect display calculations and incorrect redisplay.
-    Fix this issue by applying the following patch from the upstream maintainer:
-    </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>
@@ -93,8 +86,8 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
     class="directory">/usr/lib</filename>:</para>
 
 <screen><userinput remap="install">rm -v /lib/lib{readline,history}.so
-ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so
-ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen>
+ln -sfv ../../lib/libreadline.so.6 /usr/lib/libreadline.so
+ln -sfv ../../lib/libhistory.so.6 /usr/lib/libhistory.so</userinput></screen>
 
     <para>If desired, install the documentation:</para>
 
diff --git a/packages.ent b/packages.ent
index 2c5500ded..89c48be9c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -422,10 +422,10 @@
 <!ENTITY psmisc-ch6-du "2.2 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY readline-version "5.2">
-<!ENTITY readline-size "1,990 KB">
+<!ENTITY readline-version "6.0">
+<!ENTITY readline-size "2,218 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "e39331f32ad14009b9ff49cc10c5e751">
+<!ENTITY readline-md5 "b7f65a48add447693be6e86f04a63019">
 <!ENTITY readline-home "http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html">
 <!ENTITY readline-ch6-du "10.2 MB">
 <!ENTITY readline-ch6-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 91a8382db..684451bd6 100644
--- a/patches.ent
+++ b/patches.ent
@@ -97,11 +97,6 @@
 <!ENTITY procps-watch-patch-size "3.6 KB">
 
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-6.patch">
-<!ENTITY readline-fixes-patch-md5 "1e9a0f1141b62a5f8989874270c03cc8">
-<!ENTITY readline-fixes-patch-size "21 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"> -->