diff options
| -rw-r--r-- | chapter01/changelog.xml | 6 | ||||
| -rw-r--r-- | chapter05/bash.xml | 5 | ||||
| -rw-r--r-- | chapter06/bash.xml | 10 | ||||
| -rw-r--r-- | chapter06/readline.xml | 8 | ||||
| -rw-r--r-- | general.ent | 2 | ||||
| -rw-r--r-- | patches.ent | 5 |
6 files changed, 7 insertions, 29 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 33cae6b81..b7a0d6305 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -68,7 +68,7 @@ First a summary, then a detailed log.</para> <listitem><para>Perl &perl-version;</para></listitem> <listitem><para>Procps &procps-version;</para></listitem> <listitem><para>Psmisc &psmisc-version;</para></listitem> -<!-- <listitem><para>Readline &readline-version;</para></listitem> --> +<listitem><para>Readline &readline-version;</para></listitem> <!-- <listitem><para>Sed &sed-version;</para></listitem> --> <listitem><para>Shadow &shadow-version;</para></listitem> <!-- <listitem><para>Sysklogd &sysklogd-version;</para></listitem> --> @@ -114,6 +114,10 @@ First a summary, then a detailed log.</para> </itemizedlist> </listitem> +<listitem><para>December 11, 2005 [jhuntwork]: Upgrade to readline-5.1. Also bash removed bash-3.0 +and readline-5.0 specific patches.</para> +</listitem> + <listitem><para>December 11, 2005 [jhuntwork]: Upgrade to bash-3.1. Also fixed Tcl to work with the new bash version. Thanks to Alexander Patrakov and ultimately, Greg Schafer for the fix.</para> diff --git a/chapter05/bash.xml b/chapter05/bash.xml index a7f42de9c..c8b72eae0 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -28,11 +28,6 @@ <title>Installation of Bash</title> <!-- Edit Me --> -<para>Bash has a problem when compiled against newer versions of Glibc, causing -it to hang inappropriately. This patch fixes the problem:</para> - -<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen> - <para>Prepare Bash for compilation:</para> <screen><userinput>./configure --prefix=/tools --without-bash-malloc</userinput></screen> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 0f49320c6..3010805b7 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -35,16 +35,6 @@ documentation, issue the following commands:</para> sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ Makefile.in</userinput></screen> -<para>The following patch fixes various issues, including a problem where Bash -will sometimes only show 33 characters on a line, then wrap to the next:</para> - -<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> - -<para>Bash also has issues when compiled against newer versions of Glibc. The -following patch resolves this problem:</para> - -<screen><userinput>patch -Np1 -i ../&bash-avoid_WCONTINUED-patch;</userinput></screen> - <para>Prepare Bash for compilation:</para> <screen><userinput>./configure --prefix=/usr --bindir=/bin \ diff --git a/chapter06/readline.xml b/chapter06/readline.xml index f5a899c89..5d4e08c29 100644 --- a/chapter06/readline.xml +++ b/chapter06/readline.xml @@ -29,19 +29,13 @@ GCC, Glibc, Grep, Make, Ncurses, and Sed</seg></seglistitem> <sect2 role="installation"> <title>Installation of Readline</title> -<para>The following patch includes a fix for a problem where Readline sometimes -only shows 33 characters on a line and then wraps to the next line. It also -includes other fixes recommended by the Readline author.</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> <para>Compile the package:</para> -<screen><userinput>make SHLIB_XLDFLAGS=-lncurses</userinput></screen> +<screen><userinput>make SHLIB_LIBS=-lncurses</userinput></screen> <para>The meaning of the make option:</para> diff --git a/general.ent b/general.ent index cd92bb045..36251f79e 100644 --- a/general.ent +++ b/general.ent @@ -72,7 +72,7 @@ <!ENTITY perl-version "5.8.7"> <!ENTITY procps-version "3.2.6"> <!ENTITY psmisc-version "21.8"> -<!ENTITY readline-version "5.0"> +<!ENTITY readline-version "5.1"> <!ENTITY sed-version "4.1.4"> <!ENTITY shadow-version "4.0.13"> <!ENTITY sysklogd-version "1.4.1"> diff --git a/patches.ent b/patches.ent index 70788e454..b423a6989 100644 --- a/patches.ent +++ b/patches.ent @@ -1,9 +1,6 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Start of Common Patches --> -<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch"> -<!ENTITY bash-avoid_WCONTINUED-patch "bash-&bash-version;-avoid_WCONTINUED-1.patch"> - <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch"> <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch"> @@ -29,8 +26,6 @@ <!ENTITY perl-libc-patch "perl-&perl-version;-libc-1.patch"> -<!ENTITY readline-fixes-patch "readline-&readline-version;-fixes-1.patch"> - <!ENTITY shadow-configure-patch "shadow-&shadow-version;-configure_fix-1.patch"> <!ENTITY sysklogd-fixes-patch "sysklogd-&sysklogd-version;-fixes-1.patch"> |