diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 2 | ||||
| -rw-r--r-- | chapter03/patches.xml | 6 | ||||
| -rw-r--r-- | chapter05/bash.xml | 6 | ||||
| -rw-r--r-- | chapter06/bash.xml | 6 | ||||
| -rw-r--r-- | patches.ent | 6 |
6 files changed, 17 insertions, 13 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 7c8f042a2..04adba26d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,10 @@ <para>2006-11-25</para> <itemizedlist> <listitem> + <para>[matthew] - Use all 5 of the patches currently supplied by + the upstream maintainers of Bash.</para> + </listitem> + <listitem> <para>[matthew] - Upgrade to Autoconf-2.61. Fixes <ulink url="&lfs-ticket-root;1918">#1918</ulink>.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 8a076e697..085167b59 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -202,7 +202,7 @@ <title>Added:</title> <listitem> - <para>&bash-comment-patch;</para> + <para>&bash-fixes-patch;</para> </listitem> <listitem> <para>&less-signal_fix-patch;</para> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 58e1bdf49..5bc3bbb7e 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -19,10 +19,10 @@ <variablelist role="materials"> <varlistentry> - <term>Bash Comment Parser Patch - <token>&bash-comment-patch-size;</token>:</term> + <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term> <listitem> - <para>Download: <ulink url="&patches-root;&bash-comment-patch;"/></para> - <para>MD5 sum: <literal>&bash-comment-patch-md5;</literal></para> + <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para> + <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para> </listitem> </varlistentry> diff --git a/chapter05/bash.xml b/chapter05/bash.xml index eb04334bf..b2c2cf8fd 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -37,10 +37,10 @@ <sect2 role="installation"> <title>Installation of Bash</title> - <para>Apply a fix for a bug that causes some comments to be parsed - incorrectly:</para> + <para>Apply fixes for several bugs discovered since the initial release of + Bash-&bash-version;:</para> -<screen><userinput>patch -Np1 -i ../&bash-comment-patch;</userinput></screen> +<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> <para>Prepare Bash for compilation:</para> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index f1e8ab475..8248b7bc1 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -41,10 +41,10 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ Makefile.in</userinput></screen> - <para>Apply a fix for a bug that causes some comments to be parsed - incorrectly:</para> + <para>Apply fixes for several bugs discovered since the initial release of + Bash-&bash-version;:</para> -<screen><userinput>patch -Np1 -i ../&bash-comment-patch;</userinput></screen> +<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> <para>Prepare Bash for compilation:</para> diff --git a/patches.ent b/patches.ent index c1da4e59e..b5c92bc0f 100644 --- a/patches.ent +++ b/patches.ent @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Start of Common Patches --> -<!ENTITY bash-comment-patch "bash-&bash-version;-parse_comment-1.patch"> -<!ENTITY bash-comment-patch-md5 "6420d890711431ebeb63b5a9f3d9764d"> -<!ENTITY bash-comment-patch-size "1.5 KB"> +<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch"> +<!ENTITY bash-fixes-patch-md5 "541834ceb90f4f3eee45cee246cc2cc4"> +<!ENTITY bash-fixes-patch-size "9.9 KB"> <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch"> |