Author: matthew
Date: 2009-03-11 15:27:25 -0600 (Wed, 11 Mar 2009)
New Revision: 8821
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/chapter03/packages.xml
trunk/BOOK/chapter03/patches.xml
trunk/BOOK/chapter05/bash.xml
trunk/BOOK/chapter06/automake.xml
trunk/BOOK/chapter06/bash.xml
trunk/BOOK/chapter06/chapter06.xml
trunk/BOOK/general.ent
trunk/BOOK/packages.ent
trunk/BOOK/patches.ent
Log:
Upgrade to Bash-4.0. Fixes #2351.
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter01/changelog.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -38,6 +38,16 @@
-->
<listitem>
+ <para>2009-03-11</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] - Upgraded to Bash-4.0. Fixes
+ <ulink url="&lfs-ticket-root;2351">#2351</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2009-02-17</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter01/whatsnew.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -209,7 +209,7 @@
<title>Added:</title>
<listitem>
- <para>&bash-fixes-patch;</para>
+ <para>&automake-test-patch;</para>
</listitem>
<listitem>
Modified: trunk/BOOK/chapter03/packages.xml
===================================================================
--- trunk/BOOK/chapter03/packages.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter03/packages.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -42,15 +42,6 @@
</varlistentry>
<varlistentry>
- <term>Bash Documentation (&bash-doc-version;) -
<token>&bash-doc-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&bash-doc-home;"/></para>
- <para>Download: <ulink url="&bash-doc-url;"/></para>
- <para>MD5 sum: <literal>&bash-doc-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Berkeley DB (&db-version;) - <token>&db-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&db-home;"/></para>
Modified: trunk/BOOK/chapter03/patches.xml
===================================================================
--- trunk/BOOK/chapter03/patches.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter03/patches.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -19,6 +19,14 @@
<variablelist role="materials">
<varlistentry>
+ <term>Automake Test Fix Patch -
<token>&automake-test-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
url="&patches-root;&automake-test-patch;"/></para>
+ <para>MD5 sum: <literal>&automake-test-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Berkeley DB Upstream Fixes Patch -
<token>&db-fixes-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&db-fixes-patch;"/></para>
Modified: trunk/BOOK/chapter05/bash.xml
===================================================================
--- trunk/BOOK/chapter05/bash.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter05/bash.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -45,8 +45,7 @@
<para>Prepare Bash for compilation:</para>
-<screen><userinput remap="configure">./configure --prefix=/tools
--without-bash-malloc \
- ac_cv_func_working_mktime=yes</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/tools
--without-bash-malloc</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
@@ -61,14 +60,6 @@
more stable.</para>
</listitem>
</varlistentry>
- <varlistentry>
- <term><parameter>ac_cv_func_working_mktime=yes</parameter></term>
- <listitem>
- <para>This parameter bypasses the search for mktime in configure
- and uses the version in glibc. The is necessary due to a change in
- gcc that has not been incorporated into this package yet.</para>
- </listitem>
- </varlistentry>
</variablelist>
Modified: trunk/BOOK/chapter06/automake.xml
===================================================================
--- trunk/BOOK/chapter06/automake.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter06/automake.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -41,6 +41,10 @@
<sect2 role="installation">
<title>Installation of Automake</title>
+ <para>Fix a bug in the testsuite that can lead to a spurious
failure:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i
../&automake-test-patch;</userinput></screen>
+
<para>Prepare Automake for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr
--docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
Modified: trunk/BOOK/chapter06/bash.xml
===================================================================
--- trunk/BOOK/chapter06/bash.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter06/bash.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -40,23 +40,23 @@
<sect2 role="installation">
<title>Installation of Bash</title>
- <para>If you downloaded the Bash documentation tarball and wish to install
- HTML documentation, issue the following commands:</para>
-
-<screen><userinput remap="pre">tar -xvf ../bash-doc-&bash-doc-version;.tar.gz
-sed -i "s|htmldir = @htmldir@|htmldir = /usr/share/doc/bash-&bash-version;|" \
- Makefile.in</userinput></screen>
-
<para>Prepare Bash for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \
- --without-bash-malloc \
- --with-installed-readline
ac_cv_func_working_mktime=yes</userinput></screen>
+ --htmldir=/usr/share/doc/bash-&bash-version; --without-bash-malloc \
+ --with-installed-readline</userinput></screen>
<variablelist>
<title>The meaning of the configure options:</title>
<varlistentry>
+ <term><parameter>--htmldir</parameter></term>
+ <listitem>
+ <para>This option designates the directory into which HTML formatted
+ documentation will be installed.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><parameter>--with-installed-readline</parameter></term>
<listitem>
<para>This option tells Bash to use the <filename
Modified: trunk/BOOK/chapter06/chapter06.xml
===================================================================
--- trunk/BOOK/chapter06/chapter06.xml 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/chapter06/chapter06.xml 2009-03-11 21:27:25 UTC (rev 8821)
@@ -36,12 +36,12 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="ncurses.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="procps.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="grep.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="readline.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="libtool.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="perl.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="readline.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="autoconf.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="automake.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="bash.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="bzip2.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="diffutils.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"; href="file.xml"/>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/general.ent 2009-03-11 21:27:25 UTC (rev 8821)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090306">
-<!ENTITY releasedate "March 6, 2009">
+<!ENTITY version "SVN-200903011">
+<!ENTITY releasedate "March 11, 2009">
<!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/packages.ent 2009-03-11 21:27:25 UTC (rev 8821)
@@ -23,20 +23,15 @@
<!ENTITY automake-ch6-du "7.9 MB">
<!ENTITY automake-ch6-sbu "less than 0.1 SBU">
-<!ENTITY bash-version "3.2.48">
-<!ENTITY bash-size "2,482 KB">
+<!ENTITY bash-version "4.0">
+<!ENTITY bash-size "6,085 KB">
<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "2f619b9499882aa9d142f0d51e27ce9a">
+<!ENTITY bash-md5 "a90a1b5a6db4838483f05438e05e8eb9">
<!ENTITY bash-home "&gnu-software;bash/">
<!ENTITY bash-ch5-du "22 MB">
<!ENTITY bash-ch5-sbu "0.4 SBU">
<!ENTITY bash-ch6-du "25.8 MB">
<!ENTITY bash-ch6-sbu "0.4 SBU">
-<!ENTITY bash-doc-version "3.2">
-<!ENTITY bash-doc-size "2,143 KB">
-<!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
-<!ENTITY bash-doc-md5 "0e904cb46ca873fcfa65df19b024bec9">
-<!ENTITY bash-doc-home " ">
<!ENTITY binutils-version "2.19.1">
<!ENTITY binutils-size "15,865 KB">
Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent 2009-03-08 00:15:08 UTC (rev 8820)
+++ trunk/BOOK/patches.ent 2009-03-11 21:27:25 UTC (rev 8821)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- Start of Common Patches -->
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-9.patch">
-<!ENTITY bash-fixes-patch-md5 "b575f9ef3936fe794f39e961ff6aa03c">
-<!ENTITY bash-fixes-patch-size "75 KB">
+<!ENTITY automake-test-patch "automake-&automake-version;-test_fix-1.patch">
+<!ENTITY automake-test-patch-md5 "58f56fad6fbbcbc3b193761487d8e573">
+<!ENTITY automake-test-patch-size "1.2 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">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
