diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 6 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter05/bash.xml | 4 | ||||
| -rw-r--r-- | chapter06/bash.xml | 4 | ||||
| -rw-r--r-- | patches.ent | 5 |
6 files changed, 28 insertions, 3 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 2c78d847f..39c6e53fc 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,10 @@ <para>2010-04-20</para> <itemizedlist> <listitem> + <para>[matthew] Add upstream fixes 001-005 for Bash. Fixes + <ulink url="&lfs-ticket-root;2620">#2620</ulink>.</para> + </listitem> + <listitem> <para>[matthew] Remove the Vim fixes patch as it is out of date and looks to be applying fixes still in upstream's development cycle. Fixes <ulink url="&lfs-ticket-root;2597">#2597</ulink>.</para> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 47613d369..c4461b7c2 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -207,14 +207,14 @@ </itemizedlist>--> - <!--<itemizedlist> + <itemizedlist> <title>Added:</title> <listitem> - <para>PLACEHOLDER</para> + <para>bash-4.1-fixes-1.patch</para> </listitem> - </itemizedlist>--> + </itemizedlist> <itemizedlist> <title>Removed:</title> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 6adf19b9a..1b17f5b24 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -19,6 +19,14 @@ <variablelist role="materials"> <varlistentry> + <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para> + <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&bzip2-docs-patch;"/></para> diff --git a/chapter05/bash.xml b/chapter05/bash.xml index 10dd9988d..3c25487f7 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -43,6 +43,10 @@ <sect2 role="installation"> <title>Installation of Bash</title> + <para>Apply a patch that fixes several bugs reported and fixed by the upstream Bash maintainer:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> + <para>Prepare Bash for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index c042eb830..95b57e500 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -40,6 +40,10 @@ <sect2 role="installation"> <title>Installation of Bash</title> + <para>Apply a patch that fixes several bugs reported and fixed by the upstream Bash maintainer:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> + <para>Prepare Bash for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \ diff --git a/patches.ent b/patches.ent index 8e75053dc..278a847f3 100644 --- a/patches.ent +++ b/patches.ent @@ -2,6 +2,11 @@ <!-- Start of Common Patches --> +<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch"> +<!ENTITY bash-fixes-patch-md5 "677396905ccdbc9dbe72745fd73f4bae"> +<!ENTITY bash-fixes-patch-size "3.8 KB"> + + <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch"> <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f"> <!ENTITY bzip2-docs-patch-size "1.6 KB"> |