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 | 5 | ||||
| -rw-r--r-- | chapter06/bash.xml | 5 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 5 |
7 files changed, 9 insertions, 32 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b263747cf..697162f32 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -41,6 +41,10 @@ <para>2010-01-03</para> <itemizedlist> <listitem> + <para>[matthew] Upgrade to Bash-4.1. Fixes + <ulink url="&lfs-ticket-root;2539">#2539</ulink>.</para> + </listitem> + <listitem> <para>[matthew] Upgrade to Patch-2.6.1. Fixes <ulink url="&lfs-ticket-root;2538">#2538</ulink>.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index a125d4e2d..6bbd5bcb2 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -28,9 +28,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>--> @@ -211,10 +211,6 @@ <title>Added:</title> <listitem> - <para>bash-4.0-fixes-5.patch</para> - </listitem> - - <listitem> <para>coreutils-8.1-i18n-1.patch</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index f679fdacf..1d5b60ce4 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 e3245f2cb..10dd9988d 100644 --- a/chapter05/bash.xml +++ b/chapter05/bash.xml @@ -43,11 +43,6 @@ <sect2 role="installation"> <title>Installation of Bash</title> - <para>Apply fixes for several bugs discovered since the initial release of - Bash-&bash-version;:</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 345cafe25..98d966c06 100644 --- a/chapter06/bash.xml +++ b/chapter06/bash.xml @@ -40,11 +40,6 @@ <sect2 role="installation"> <title>Installation of Bash</title> - <para>Apply fixes for several bugs discovered since the initial release of - Bash-&bash-version;:</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 94f3c8f4f..50783e95e 100644 --- a/packages.ent +++ b/packages.ent @@ -23,10 +23,10 @@ <!ENTITY automake-ch6-du "28.8 MB testsuite included"> <!ENTITY automake-ch6-sbu "18.3 SBU testsuite included"> -<!ENTITY bash-version "4.0"> -<!ENTITY bash-size "6,085 KB"> +<!ENTITY bash-version "4.1"> +<!ENTITY bash-size "6,444 KB"> <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz"> -<!ENTITY bash-md5 "a90a1b5a6db4838483f05438e05e8eb9"> +<!ENTITY bash-md5 "9800d8724815fd84994d9be65ab5e7b8"> <!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 9246e2349..a71c215ed 100644 --- a/patches.ent +++ b/patches.ent @@ -2,11 +2,6 @@ <!-- Start of Common Patches --> -<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-5.patch"> -<!ENTITY bash-fixes-patch-md5 "9b8ef92bf27abeb0ff57069f4fbc4a48"> -<!ENTITY bash-fixes-patch-size "44 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"> |