Upgrade to Readline-5.2

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

6 files changed, 12 insertions, 23 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7670c5bba..cb4972163 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
       <para>2006-10-28</para>
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Upgrade to Readline-5.2, including dropping the now
+          unnecessary &quot;fixes&quot; patch.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Upgrade to Man-Pages-2.41.</para>
         </listitem>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 308568324..ea5d91af4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -148,9 +148,9 @@
     <listitem>
       <para>Psmisc &psmisc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Readline &readline-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Sed &sed-version;</para>
     </listitem>-->
@@ -239,6 +239,9 @@
     <listitem>
       <para>Linux-libc-headers 2.6.12.0</para>
     </listitem>
+    <listitem>
+      <para>readline-5.1-fixes-3.patch</para>
+    </listitem>
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 3b96a9d36..23a706156 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -203,14 +203,6 @@
     </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>Sysklogd 8-Bit Cleanness Patch - <token>&sysklogd-8bit-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&sysklogd-8bit-patch;"/></para>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index 39ea3a3b6..4afb22da6 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -35,11 +35,6 @@
   <sect2 role="installation">
     <title>Installation of Readline</title>
 
-    <para>Upstream developers have fixed several issues since the initial
-    release of Readline-&readline-version;.  Apply those fixes:</para>
-
-<screen><userinput>patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
     <para>Reinstalling Readline will cause the old libraries to be moved to
     &lt;libraryname&gt;.old. While this is normally not a problem, in some cases
     it can trigger a linking bug in <command>ldconfig</command>. This can be
diff --git a/packages.ent b/packages.ent
index 5a8598e92..281977511 100644
--- a/packages.ent
+++ b/packages.ent
@@ -410,10 +410,10 @@
 <!ENTITY psmisc-ch6-du "2.2 MB">
 <!ENTITY psmisc-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY readline-version "5.1">
-<!ENTITY readline-size "1,983 KB">
+<!ENTITY readline-version "5.2">
+<!ENTITY readline-size "1,990 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "7ee5a692db88b30ca48927a13fd60e46">
+<!ENTITY readline-md5 "e39331f32ad14009b9ff49cc10c5e751">
 <!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 41f3bfbe0..506f5e544 100644
--- a/patches.ent
+++ b/patches.ent
@@ -108,11 +108,6 @@
 <!ENTITY perl-libc-patch-size "1.1 KB">
 
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-3.patch">
-<!ENTITY readline-fixes-patch-md5 "e30963cd5c6f6a11a23344af36cfa38c">
-<!ENTITY readline-fixes-patch-size "3.8 KB">
-
-
 <!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
 <!ENTITY sysklogd-8bit-patch-md5 "cc0d9c3bd67a6b6357e42807cf06073e">
 <!ENTITY sysklogd-8bit-patch-size "0.9 KB">