aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter01/whatsnew.xml3
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/readline.xml4
-rw-r--r--patches.ent5
5 files changed, 23 insertions, 0 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 085554bbc..c9857ba1e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,9 @@
<para>2011-03-14</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Add latest upstream patches for Readline-6.2.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Add latest upstream patches for Bash-4.2. Fixes
<ulink url="&lfs-ticket-root;2841">#2841</ulink>.</para>
</listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index cb948a7d5..f16f55fa6 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -221,6 +221,9 @@
<listitem>
<para>bash-&bash-version;-fixes-1.patch</para>
</listitem>
+ <listitem>
+ <para>readline-&readline-version;-fixes-1.patch</para>
+ </listitem>
</itemizedlist>
<itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 838067a86..44512f582 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -140,6 +140,14 @@
</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 b956d3671..f56bb7a60 100644
--- a/chapter06/readline.xml
+++ b/chapter06/readline.xml
@@ -49,6 +49,10 @@
<screen><userinput remap="pre">sed -i '/MV.*old/d' Makefile.in
sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
+ <para>Apply a patch to fix a known bug that has been fixed upstream:</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/patches.ent b/patches.ent
index ad912d0cf..9f88262d7 100644
--- a/patches.ent
+++ b/patches.ent
@@ -78,6 +78,11 @@
<!ENTITY procps-watch-patch-size "3.5 KB">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch">
+<!ENTITY readline-fixes-patch-md5 "3c185f7b76001d3d0af614f6f2cd5dfa">
+<!ENTITY readline-fixes-patch-size "1.3 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"> -->