From bbd46c6774cfeb0614a7a4685c6808fe1b9c772b Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 29 Dec 2013 20:33:27 +0000
Subject: [PATCH] Update to automake-1.14.1

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10429 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 8 ++++++--
 chapter03/patches.xml   | 8 --------
 chapter06/automake.xml  | 4 ----
 packages.ent            | 6 +++---
 patches.ent             | 4 ----
 6 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5cd839f6e..9d32b878c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,10 @@
     <listitem>
       <para>2013-12-29</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.14.1.  Fixes
+          <ulink url="&lfs-ticket-root;3458">#3458</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update readline patch to upstream level.  Fixes
           <ulink url="&lfs-ticket-root;3461">#3461</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 3993798e8..1b827acd3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -28,9 +28,9 @@
     <!--<listitem>
       <para>Autoconf &autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake &automake-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
@@ -235,6 +235,10 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
+    <listitem>
+      <para>automake-1.14-test-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>readline-6.2-fixes-1.patch</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 05532f965..705542e34 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -18,14 +18,6 @@
 
   <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>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index bf48527a1..64323dfe7 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of Automake</title>
 
-    <para>Fix an intermittent test 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>
diff --git a/packages.ent b/packages.ent
index cc461c52b..5811ebf63 100644
--- a/packages.ent
+++ b/packages.ent
@@ -15,11 +15,11 @@
 <!ENTITY autoconf-ch6-du "17.1 MB">
 <!ENTITY autoconf-ch6-sbu "4.5 SBU">
 
-<!ENTITY automake-version "1.14">
+<!ENTITY automake-version "1.14.1">
 <!ENTITY am-minor-version "1.14">
-<!ENTITY automake-size "1,452 KB">
+<!ENTITY automake-size "1,456 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "cb3fba6d631cddf12e230fd0cc1890df">
+<!ENTITY automake-md5 "7fc29854c520f56b07aa232a0f880292">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "100 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU (34.1 SBU with tests)">
diff --git a/patches.ent b/patches.ent
index 3c088c681..c652f1e48 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,10 +2,6 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY automake-test-patch "automake-&automake-version;-test-1.patch">
-<!ENTITY automake-test-patch-md5 "1bc501443baee55bca4d6552ed18a757">
-<!ENTITY automake-test-patch-size "2.5 KB">
-
 <!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-12.patch">
 <!ENTITY bash-fixes-patch-md5 "419f95c173596aea47a23d922598977a">
 <!ENTITY bash-fixes-patch-size "56 KB">