diff options
| -rw-r--r-- | chapter01/changelog.xml | 3 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 3 | ||||
| -rw-r--r-- | chapter03/patches.xml | 7 | ||||
| -rw-r--r-- | chapter06/bash.xml | 5 | ||||
| -rw-r--r-- | patches.ent | 2 |
5 files changed, 20 insertions, 0 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 74fc1c280..35a732746 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,9 @@ <para>Febraury 19, 2006</para> <itemizedlist> <listitem> + <para>[matthew] - Add upstream fixes 001-008 for Bash.</para> + </listitem> + <listitem> <para>[matthew] - Upgrade to Sed 4.1.5.</para> </listitem> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 02cc41160..62350968e 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -205,6 +205,9 @@ <title>Added:</title> <listitem> + <para>&bash-fixes-patch;</para> + </listitem> + <listitem> <para>&bzip2-bzgrep-patch;</para> </listitem> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 1b518cdd0..fc9854012 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -19,6 +19,13 @@ <variablelist role="materials"> <varlistentry> + <term>Bash Upstream Fixes Patch - 118 KB:</term> + <listitem> + <para><ulink url="&patches-root;&bash-fixes-patch;"/></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Bzip2 Bzgrep Security Fixes Patch - 1 KB:</term> <listitem> <para><ulink url="&patches-root;&bzip2-bzgrep-patch;"/></para> diff --git a/chapter06/bash.xml b/chapter06/bash.xml index 82608f068..f7a8eb208 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -50,6 +50,11 @@ sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \ Makefile.in</userinput></screen> + <para>Upstream developers have fixed several issues since the initial + release of Bash-&bash-version;. Apply those fixes:</para> + +<screen><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen> + <para>Prepare Bash for compilation:</para> <screen><userinput>./configure --prefix=/usr --bindir=/bin \ diff --git a/patches.ent b/patches.ent index 65437c2ea..feb5dfb2c 100644 --- a/patches.ent +++ b/patches.ent @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- Start of Common Patches --> +<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch"> + <!ENTITY bzip2-bzgrep-patch "bzip2-&bzip2-version;-bzgrep_security-1.patch"> <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch"> |