diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter06/automake.xml | 9 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 5 |
6 files changed, 7 insertions, 29 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 0649b486c..dc84d41cb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,10 @@ <para>2012-06-04</para> <itemizedlist> <listitem> + <para>[matthew] - Upgrade to Automake-1.12.1. Fixes + <ulink url="&lfs-ticket-root;3106">#3106</ulink>.</para> + </listitem> + <listitem> <para>[matthew] - Apply latest upstream patches for Bash. Fixes <ulink url="&lfs-ticket-root;3103">#3103</ulink>.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 25e8a76e0..ed3f5021e 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -220,10 +220,6 @@ <title>Added:</title> <listitem> - <para>&automake-perl_fix-patch;</para> - </listitem> - - <listitem> <para>&bash-fixes-patch;</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 54f22b502..92b4da0ee 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -19,14 +19,6 @@ <variablelist role="materials"> <varlistentry> - <term>Automake Perl-&perl-version; Patch - <token>&automake-perl_fix-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&automake-perl_fix-patch;"/></para> - <para>MD5 sum: <literal>&automake-perl_fix-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para> diff --git a/chapter06/automake.xml b/chapter06/automake.xml index 4786c44c9..109da7059 100644 --- a/chapter06/automake.xml +++ b/chapter06/automake.xml @@ -41,10 +41,6 @@ <sect2 role="installation"> <title>Installation of Automake</title> - <para>Apply a patch to fix an incomatibility between Automake-&automake-version; and Perl-&perl-version;:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&automake-perl_fix-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> @@ -53,11 +49,6 @@ <screen><userinput remap="make">make</userinput></screen> - <para>Fix a couple of minor bugs in the test suite:</para> - -<screen><userinput remap="pre">sed -i -e "s/yacc/lex/" t/lex-clean.sh -sed -i -e "s/cc/'non-root cc'/" t/dist-readonly.sh</userinput></screen> - <para>To test the results, issue:</para> <screen><userinput remap="test">make check</userinput></screen> diff --git a/packages.ent b/packages.ent index da327bb28..5a86df19b 100644 --- a/packages.ent +++ b/packages.ent @@ -15,11 +15,11 @@ <!ENTITY autoconf-ch6-du "12.4 MB"> <!ENTITY autoconf-ch6-sbu "4.8 SBU"> -<!ENTITY automake-version "1.12"> +<!ENTITY automake-version "1.12.1"> <!ENTITY am-minor-version "1.12"> -<!ENTITY automake-size "1,300 KB"> +<!ENTITY automake-size "1,321 KB"> <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz"> -<!ENTITY automake-md5 "5fc40c032ceaebecd1588b8d125b4781"> +<!ENTITY automake-md5 "036d79de6e443e02aec2be1df2b4f0ac"> <!ENTITY automake-home "&gnu-software;automake/"> <!ENTITY automake-ch6-du "28.8 MB"> <!ENTITY automake-ch6-sbu "18.3 SBU"> diff --git a/patches.ent b/patches.ent index e17b7422e..4fa0fab57 100644 --- a/patches.ent +++ b/patches.ent @@ -2,11 +2,6 @@ <!-- Start of Common Patches --> -<!ENTITY automake-perl_fix-patch "automake-&automake-version;-perl_fix-1.patch"> -<!ENTITY automake-perl_fix-patch-md5 "97e7f0c0ed29018323f6aa03afbd9764"> -<!ENTITY automake-perl_fix-patch-size "2.9 KB"> - - <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-7.patch"> <!ENTITY bash-fixes-patch-md5 "4a76c4caaa5d09ebacf79e93f07fd848"> <!ENTITY bash-fixes-patch-size "42 KB"> |