From ae9e48ba1fda5edeffc12e3b65024f94dda8f0b9 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Sun, 19 Feb 2006 21:00:50 +0000
Subject: [PATCH] Add upstream fixes 001-002 for Readline

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@7383 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 3 +++
 chapter01/whatsnew.xml  | 3 +++
 chapter03/patches.xml   | 7 +++++++
 chapter06/readline.xml  | 5 +++++
 patches.ent             | 2 ++
 5 files changed, 20 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 35a732746..cb721d0e3 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,9 @@
     <listitem>
       <para>Febraury 19, 2006</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Add upstream fixes 001-002 for Readline.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Add upstream fixes 001-008 for Bash.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 62350968e..1f30710f5 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -237,6 +237,9 @@
     <listitem>
       <para>&perl-libc-patch;</para>
     </listitem>
+    <listitem>
+      <para>&readline-fixes-patch;</para>
+    </listitem>
     <listitem>
       <para>&tar-gcc4_fix-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index fc9854012..b0d574b33 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -181,6 +181,13 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Readline Upstream Fixes Patch - 2 KB:</term>
+      <listitem>
+        <para><ulink url="&patches-root;&readline-fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Sysklogd 8-Bit Cleanness Patch - 1 KB:</term>
       <listitem>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
index f61f934ab..7a434e58d 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -44,6 +44,11 @@
   <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>Prepare Readline for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --libdir=/lib</userinput></screen>
diff --git a/patches.ent b/patches.ent
index feb5dfb2c..7b191655c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -41,6 +41,8 @@
 
 <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch">
 
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-2.patch">
+
 <!ENTITY sysklogd-8bit-patch "sysklogd-&sysklogd-version;-8bit-1.patch">
 <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch">