7 files changed, 81 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a481853b4..6a630d013 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -63,6 +63,8 @@ first a summary, then a detailed log.</para>
 <listitem><para>module-init-tools-3.0</para></listitem>
 <listitem><para>net-tools-1.60-gcc34-2.patch</para></listitem>
 <listitem><para>net-tools-1.60-kernel-headers-1.patch</para></listitem>
+<listitem><para>readline-4.3</para></listitem>
+<listitem><para>readline-4.3-gnu-fixes-1.patch</para></listitem>
 <listitem><para>sysklogd-1.4.1-kernel-headers-1.patch</para></listitem>
 <listitem><para>udev-025</para></listitem>
 <listitem><para>udev-025-config-1.patch</para></listitem>
@@ -92,6 +94,9 @@ first a summary, then a detailed log.</para>
 </itemizedlist>
 </listitem>
 
+<listitem><para>May 6th, 2004 [winkie]: Chapter 6 - Add Readline installation
+and use it when building Bash.</para></listitem>
+
 <listitem><para>May 4th, 2004 [winkie]: Chapter 6 - Create and use the
 <quote>utmp</quote> group.</para></listitem>
 
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index 309bb38e3..6b8bf634e 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -136,6 +136,9 @@ Procps (&procps-version;) - 260 KB:
 Psmisc (&psmisc-version;) - 375 KB:
 <ulink url="&freshmeat;psmisc/"/>
 
+Readline (&readline-version;) - 940 KB:
+<ulink url="&freshmeat;gnureadline/"/>
+
 Sed (&sed-version;) - 751 KB:
 <ulink url="&freshmeat;sed/"/>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 89c468ba6..946c13fe7 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -13,7 +13,7 @@ or just make some small modifications to bend things our way. You'll need the
 following:</para>
 
 <literallayout>
-Bash Patch - 7 KB:
+Bash GNU Fixes Patch - 7 KB:
 <ulink url="&patches-root;bash-&bash-version;-gnu-fixes-2.patch"/>
 
 Coreutils Hostname Patch - 1 KB:
@@ -55,6 +55,9 @@ Net-tools Kernel Headers Patch - 1 KB:
 Perl Libc Patch - 1 KB:
 <ulink url="&patches-root;perl-&perl-version;-libc-1.patch"/>
 
+Readline GNU Fixes Patch - 5 KB:
+<ulink url="&patches-root;readline-&readline-version;-gnu-fixes-1.patch"/>
+
 Sysklogd Kernel Headers Patch - 3 KB:
 <ulink url="&patches-root;sysklogd-&sysklogd-version;-kernel-headers-1.patch"/>
 
diff --git a/chapter06/bash.xml b/chapter06/bash.xml
index c1d011a13..36baa30a5 100644
--- a/chapter06/bash.xml
+++ b/chapter06/bash.xml
@@ -30,7 +30,7 @@ patch:</para>
 <para>Now prepare Bash for compilation:</para>
 
 <screen><userinput>./configure --prefix=/usr --bindir=/bin \
-    --without-bash-malloc</userinput></screen>
+    --without-bash-malloc --with-installed-readline</userinput></screen>
 
 <para>Compile the package:</para>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index e6425e402..b1a26b25f 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -29,6 +29,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="findutils.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gawk.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="ncurses.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="readline.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="vim.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="m4.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bison.xml"/>
diff --git a/chapter06/readline.xml b/chapter06/readline.xml
new file mode 100644
index 000000000..7105a4afa
--- /dev/null
+++ b/chapter06/readline.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../general.ent">
+  %general-entities;
+]>
+<sect1 id="ch-system-readline" xreflabel="Readline">
+<title>Readline-&readline-version;</title>
+<?dbhtml filename="readline.html"?>
+
+<indexterm zone="ch-system-readline"><primary sortas="a-Readline">Readline</primary></indexterm>
+
+<para>The Readline package contains the Readline command-line library.</para>
+
+<screen>&buildtime; XXX SBU
+&diskspace; 3.8 MB</screen>
+
+<para>Readline installation depends on: Binutils, Coreutils, Diffutils, Gawk,
+GCC, Glibc, Grep, Make, Ncurses, Sed.</para>
+
+
+<sect2>
+<title>Installation of Readline</title>
+
+<para>Readline has a number of bugs in it that cause it to not behave the 
+way it is expected at times. Fix this behavior with the following
+patch:</para>
+
+<screen><userinput>patch -Np1 -i ../readline-&readline-version;-gnu-fixes-1.patch</userinput></screen>
+
+<para>Now prepare Readline for compilation:</para>
+
+<screen><userinput>./configure --prefix=/usr</userinput></screen>
+
+<para>Compile the package:</para>
+
+<screen><userinput>make</userinput></screen>
+
+<para>Install the package:</para>
+
+<screen><userinput>make install</userinput></screen>
+
+<para>Give Readline's dynamic libraries to a more appropriate permissions:</para>
+
+<screen><userinput>chmod 644 /usr/lib/*.&readline-version;</userinput></screen>
+
+<para>And move them to a more appropriate location:</para>
+
+<screen><userinput>mv /usr/lib/lib{readline,history}.so.4* /lib</userinput></screen>
+
+<para>Because the libraries have been moved, a few symlinks are now pointing to
+non-existent files. Recreate those symlinks:</para>
+
+<screen><userinput>ln -sf ../../lib/libhistory.so.4 /usr/lib/libhistory.so
+ln -sf ../../lib/libreadline.so.4 /usr/lib/libreadline.so</userinput></screen>
+
+</sect2>
+
+
+<sect2 id="contents-readline"><title>Contents of Readline</title>
+<para><emphasis>Installed libraries</emphasis>: Not checked.</para>
+</sect2>
+
+
+</sect1>
diff --git a/general.ent b/general.ent
index dd3b1aec7..91ef02c43 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "CVS-20040504">
-<!ENTITY releasedate "May 4, 2004">
+<!ENTITY version "CVS-20040506">
+<!ENTITY releasedate "May 6, 2004">
 <!ENTITY milestone "6.1">
 
 <!ENTITY lfs-root "http://www.linuxfromscratch.org/">
@@ -58,6 +58,7 @@
 <!ENTITY perl-version "5.8.4">
 <!ENTITY procps-version "3.2.1">
 <!ENTITY psmisc-version "21.4">
+<!ENTITY readline-version "4.3">
 <!ENTITY sed-version "4.0.9">
 <!ENTITY shadow-version "4.0.4.1">
 <!ENTITY sysklogd-version "1.4.1">