Merge branch 'trunk' into xry111/tester-nohack

14 files changed, 62 insertions, 11 deletions

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 7beb8fa3a..70a84730e 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 f724ac916..2f3602124 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,26 @@
     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>
+          <para>[bdubbs] - Remove modifications to m4 that are no longer needed.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-07-08</para>
       <itemizedlist>
         <listitem revision="systemd">
diff --git a/chapter03/introduction.xml b/chapter03/introduction.xml
index 9b05ce7ff..c7451f055 100644
--- a/chapter03/introduction.xml
+++ b/chapter03/introduction.xml
@@ -23,8 +23,8 @@
   location has changed since this book was published, Google (<ulink
   url="http://www.google.com/"/>) provides a useful search engine for
   most packages. If this search is unsuccessful, try one of the
-  alternative means of downloading discussed at <ulink
-  url="&lfs-root;lfs/packages.html#packages"/>. </para>
+  alternative means of downloading at <ulink
+  url="&lfs-root;lfs/mirrors.html#files"/>. </para>
 
   <para>Downloaded packages and patches will need to be stored somewhere
   that is conveniently available throughout the entire build. A working
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/chapter06/m4.xml b/chapter06/m4.xml
index 7a28a08cc..91e0a9ea2 100644
--- a/chapter06/m4.xml
+++ b/chapter06/m4.xml
@@ -42,12 +42,12 @@
 
   <sect2 role="installation">
     <title>Installation of M4</title>
-
+<!--
     <para>First, make some fixes introduced by glibc-2.28:</para>
 
 <screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
-
+-->
     <para>Prepare M4 for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr   \
diff --git a/chapter08/bzip2.xml b/chapter08/bzip2.xml
index 68f567fcd..e57fe61c4 100644
--- a/chapter08/bzip2.xml
+++ b/chapter08/bzip2.xml
@@ -97,7 +97,7 @@ for i in /usr/bin/{bzcat,bunzip2}; do
   ln -sfv bzip2 $i
 done</userinput></screen>
 
-    <para>Remove an useless static library:</para>
+    <para>Remove a useless static library:</para>
 
 <screen><userinput remap="install">rm -fv /usr/lib/libbz2.a</userinput></screen>
 
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/libtool.xml b/chapter08/libtool.xml
index a2abdbe70..711adac05 100644
--- a/chapter08/libtool.xml
+++ b/chapter08/libtool.xml
@@ -71,7 +71,7 @@
     <!-- dev: - -disable-static works but causes additional test failures
               so we manually remove the static library -->
 
-    <para>Remove an useless static library:</para>
+    <para>Remove a useless static library:</para>
 
 <screen><userinput remap="install">rm -fv /usr/lib/libltdl.a</userinput></screen>
 
diff --git a/chapter08/m4.xml b/chapter08/m4.xml
index b8d57fba0..13b032a25 100644
--- a/chapter08/m4.xml
+++ b/chapter08/m4.xml
@@ -39,12 +39,12 @@
 
   <sect2 role="installation">
     <title>Installation of M4</title>
-
+<!--
     <para>First, make some fixes required by glibc-2.28 and later:</para>
 
 <screen><userinput remap="pre">sed -i 's/IO_ftrylockfile/IO_EOF_SEEN/' lib/*.c
 echo "#define _IO_IN_BACKUP 0x100" >> lib/stdio-impl.h</userinput></screen>
-
+-->
     <para>Prepare M4 for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
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/chapter08/util-linux.xml b/chapter08/util-linux.xml
index b1df6ea6d..8f72a80d7 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -95,6 +95,13 @@
 <screen role="nodump"><userinput>bash tests/run.sh --srcdir=$PWD --builddir=$PWD</userinput></screen>
     </warning>
 
+    <note><para>There is one test that depends on the configuration of the kernel.
+    If CONFIG_USER_NS or CONFIG_PID_NS are not set, the tests will hang forever.
+    To work around the problem, delete one test:</para>
+
+    <screen><userinput remap="test">rm tests/ts/lsns/ioctl_ns</userinput></screen>
+    </note>
+
 <screen><userinput remap="test">chown -Rv tester .
 su tester -c "make -k check"</userinput></screen>
 
diff --git a/chapter08/zlib.xml b/chapter08/zlib.xml
index 86b9ad16e..604d5d503 100644
--- a/chapter08/zlib.xml
+++ b/chapter08/zlib.xml
@@ -57,7 +57,7 @@
 
 <screen><userinput remap="install">make install</userinput></screen>
 
-    <para>Remove an useless static library:</para>
+    <para>Remove a useless static library:</para>
 
 <screen><userinput remap="install">rm -fv /usr/lib/libz.a</userinput></screen>
 
diff --git a/lfs-latest-git.php b/lfs-latest-git.php
index 5f0bc4e3d..29633c212 100644
--- a/lfs-latest-git.php
+++ b/lfs-latest-git.php
@@ -127,6 +127,8 @@ if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/
 if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
 if ( $package == "Python"     ) $dirpath = "https://www.python.org/downloads/source/";
 if ( $package == "shadow"     ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
+if ( $package == "MarkupSafe" ) $dirpath = "https://pypi.python.org/pypi/MarkupSafe/";
+if ( $package == "Jinja"      ) $dirpath = "https://pypi.python.org/pypi/Jinja2/";
 if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
 if ( $package == "tcl"        ) $dirpath = "http://sourceforge.net/projects/tcl/files";
 if ( $package == "util-linux" ) $dirpath = max_parent( $dirpath, "v." );
@@ -280,6 +282,9 @@ if ( $package == "zstd"       ) $dirpath = "https://github.com/facebook/zstd/rel
   if ( $package == "grub" )
      return find_max( $lines, "/grub/", "/^.*grub-([\d\.]+).tar.xz.*$/" );
 
+  if ( $package == "Jinja" )
+     return find_max( $lines, "/Jinja/", "/^.*Jinja2 ([\d\.]+).*$/" );
+
   if ( $package == "openssl" )
      return find_max( $lines, "/openssl/", "/^.*openssl-([\d\.p]*\d.?).tar.*$/" );
 
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">