Merge branch 'trunk' into xry111/tester-nohack

7 files changed, 18 insertions, 6 deletions

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>