diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 8 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter05/bash.xml | 4 | ||||
| -rw-r--r-- | chapter06/bash.xml | 4 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 5 |
7 files changed, 9 insertions, 30 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 83fcb2387..2c28e056d 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,10 @@ <para>2011-02-16</para> <itemizedlist> <listitem> + <para>[matthew] Upgrade to Bash-4.2. Fixes + <ulink url="&lfs-ticket-root;2830">#2830</ulink>.</para> + </listitem> + <listitem> <para>[matthew] Upgrade to Udev-166. Fixes <ulink url="&lfs-ticket-root;2829">#2829</ulink>.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index e786c919a..8bc7de621 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -31,9 +31,9 @@ <!--<listitem> <para>Automake &automake-version;</para> </listitem> --> - <!--<listitem> + <listitem> <para>Bash &bash-version;</para> - </listitem>--> + </listitem> <!--<listitem> <para>Berkeley DB &db-version;</para> </listitem> --> @@ -220,10 +220,6 @@ <title>Added:</title> <listitem> - <para>bash-&bash-version;-fixes-3.patch</para> - </listitem> - - <listitem> <para>bzip2-&bzip2-version;-install_docs-1.patch</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 838067a86..39b733043 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -19,14 +19,6 @@ <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 192cd350f..700e266d2 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -43,10 +43,6 @@ <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 67a77d8b6..bbd645adf 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -40,10 +40,6 @@ <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/packages.ent b/packages.ent index 378e0f46e..3f5b7fd50 100644 --- a/packages.ent +++ b/packages.ent @@ -24,10 +24,10 @@ <!ENTITY automake-ch6-du "28.8 MB"> <!ENTITY automake-ch6-sbu "18.3 SBU"> -<!ENTITY bash-version "4.1"> -<!ENTITY bash-size "6,444 KB"> +<!ENTITY bash-version "4.2"> +<!ENTITY bash-size "6,845 KB"> <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz"> -<!ENTITY bash-md5 "9800d8724815fd84994d9be65ab5e7b8"> +<!ENTITY bash-md5 "3fb927c7c33022f1c327f14a81c0d4b0"> <!ENTITY bash-home "&gnu-software;bash/"> <!ENTITY bash-ch5-du "35 MB"> <!ENTITY bash-ch5-sbu "0.5 SBU"> diff --git a/patches.ent b/patches.ent index ffd8af262..b8ea9d856 100644 --- a/patches.ent +++ b/patches.ent @@ -2,11 +2,6 @@ <!-- Start of Common Patches --> -<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-3.patch"> -<!ENTITY bash-fixes-patch-md5 "500043db34cfb2c857335cb090ffd43d"> -<!ENTITY bash-fixes-patch-size "6.1 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"> |