From ec786b746e7ea3a38c1a2aa06724b6db3ad9f58a Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 27 Sep 2020 20:51:41 +0000
Subject: [PATCH] Add autoconf-2.69-consolidated_fixes-1.patch which allows
 autoconf tests to pass.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@12050 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter01/whatsnew.xml  |  4 ++++
 chapter03/patches.xml   |  8 ++++++++
 chapter08/autoconf.xml  | 10 ++++++----
 general.ent             |  6 +++---
 patches.ent             |  4 ++++
 6 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ace181e4e..ad116f857 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <itemizedlist>
+      <para>2020-09-27</para>
+        <listitem>
+           <para>[bdubbs] - Add autoconf-2.69-consolidated_fixes-1.patch
+           which allows autoconf tests to pass.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <itemizedlist>
       <para>2020-09-15</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index c0b37b068..b4e7cc755 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -278,6 +278,10 @@
   <itemizedlist>
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
+    <listitem>
+      <para>autoconf-2.69-consolidated_fixes-1.patch</para>
+    </listitem>
+
 
   </itemizedlist>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index defab5cc7..60d2c0533 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -18,6 +18,14 @@
 
   <variablelist role="materials">
 
+    <varlistentry>
+      <term>Autoconf Consolidated Fixes Patch - <token>&autoconf-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&autoconf-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&autoconf-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml
index 53d97070b..dfdc4d93d 100644
--- a/chapter08/autoconf.xml
+++ b/chapter08/autoconf.xml
@@ -41,9 +41,10 @@
   <sect2 role="installation">
     <title>Installation of Autoconf</title>
 
-    <para>First, fix a bug generated by Perl 5.28.</para>
+    <para>First, apply a patch fixes several problems that occur with the latest
+    perl, libtool, and bash version.</para>
 
-<screen><userinput remap="pre">sed -i '361 s/{/\\{/' bin/autoscan.in</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&autoconf-fixes-patch;</userinput></screen>
 
     <para>Prepare Autoconf for compilation:</para>
 
@@ -52,11 +53,12 @@
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
+
+    <para>To test the results, issue:</para>
 <!--
-    <para>To test the results, issue:</para>-->
     <para>The test suite is currently broken by bash-5 and libtool-2.4.3.
     To run the tests anyway, issue:</para>
-
+ -->
 <screen><userinput remap="test">make check</userinput></screen>
 <!--
     <para>This takes a long time, about &autoconf-fin-sbu-tests; SBUs. In addition,
diff --git a/general.ent b/general.ent
index 9e9c768d1..9fb1de006 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200915">
+<!ENTITY version         "SVN-20200927">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200915-systemd">
+<!ENTITY versiond        "20200927-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "September 15th, 2020">
+<!ENTITY releasedate     "September 27th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 
diff --git a/patches.ent b/patches.ent
index d1fde8b5f..0f13fc504 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,6 +2,10 @@
 
 <!-- Start of Common Patches -->
 
+<!ENTITY autoconf-fixes-patch "autoconf-&autoconf-version;-consolidated_fixes-1.patch">
+<!ENTITY autoconf-fixes-patch-md5 "3c515415ecdd777990c91e8900279cb9">
+<!ENTITY autoconf-fixes-patch-size "3.8 KB">
+
 <!ENTITY bash-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
 <!ENTITY bash-fixes-patch-md5 "c1545da2ad7d78574b52c465ec077ed9">
 <!ENTITY bash-fixes-patch-size "22 KB">