Perl - fixes for 5.34 test failures.

6 files changed, 32 insertions, 2 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 46a016465..2aeef52e0 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -2402,7 +2402,7 @@
       <segmentedlist id="perl-testdeps">
         <segtitle>&testsuites;</segtitle>
         <seglistitem>
-          <seg>Iana-Etc and Procps-ng</seg>
+          <seg>Iana-Etc, Less. and Procps-ng</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 047a1d56f..2f3602124 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,17 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
     <listitem>
+      <para>2021-07-17</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Fix test failures in perl-5.34.0 by building less before
+          perl and by patching perl for a problem highlighted by gdbm-1.20. Fixes
+          <ulink url="&lfs-ticket-root;4885">#4885</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-07-15</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 803bf42bd..6ffd313a8 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -102,6 +102,15 @@
       </listitem>
     </varlistentry>
 -->
+
+    <varlistentry>
+      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry revision="sysv">
       <term>Sysvinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 4202deea8..beee9e480 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -52,6 +52,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gperf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expat.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="inetutils.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="perl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xml-parser.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="intltool.xml"/>
@@ -71,7 +72,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="findutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="groff.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="grub.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="less.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gzip.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="iproute2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="kbd.xml"/>
diff --git a/chapter08/perl.xml b/chapter08/perl.xml
index 276ed03e1..0bb32c344 100644
--- a/chapter08/perl.xml
+++ b/chapter08/perl.xml
@@ -41,6 +41,11 @@
   <sect2 role="installation">
     <title>Installation of Perl</title>
 
+    <para>First, apply a patch that fixes an issue highlighted by recent
+    versions of gdbm:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&perl-fix-patch;</userinput></screen>
+
     <para>This version of Perl now builds the Compress::Raw::Zlib and 
     Compress::Raw::BZip2 modules. By
     default Perl will use an internal copy of the sources for the build.
diff --git a/patches.ent b/patches.ent
index 9858f94ca..f2e1a6730 100644
--- a/patches.ent
+++ b/patches.ent
@@ -63,6 +63,11 @@
 <!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">
 <!ENTITY ninja-limit-jobs-patch-size "2.5 KB">
 -->
+
+<!ENTITY perl-fix-patch "perl-&perl-version;-upstream_fixes-1.patch">
+<!ENTITY perl-fix-patch-md5 "fb42558b59ed95ee00eb9f1c1c9b8056">
+<!ENTITY perl-fix-patch-size "1.6 KB">
+
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">