Merge remote-tracking branch 'origin/trunk' into xry111/arm64

14 files changed, 40 insertions, 49 deletions

diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml
index 7925e44ea..38375665f 100644
--- a/chapter08/autoconf.xml
+++ b/chapter08/autoconf.xml
@@ -153,7 +153,7 @@
           <para>Helps to create a <filename>configure.in</filename> file for a
           software package; it examines the source files in a directory tree,
           searching them for common portability issues, and creates a
-          <filename>configure.scan</filename> file that serves as as a
+          <filename>configure.scan</filename> file that serves as a
           preliminary <filename>configure.in</filename> file for the
           package</para>
           <indexterm zone="ch-system-autoconf autoscan">
diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml
index 3f356d39e..8ab81d2f8 100644
--- a/chapter08/chapter08.xml
+++ b/chapter08/chapter08.xml
@@ -29,6 +29,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="expect.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binutils.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gmp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="mpfr.xml"/>
@@ -39,7 +40,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libxcrypt.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shadow.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gcc.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pkgconf.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ncurses.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sed.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="psmisc.xml"/>
diff --git a/chapter08/flit-core.xml b/chapter08/flit-core.xml
index 641ff73b7..661a02684 100644
--- a/chapter08/flit-core.xml
+++ b/chapter08/flit-core.xml
@@ -42,7 +42,7 @@
 
     <para>Build the package:</para>
 
-<screen><userinput remap="install">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="install">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install the package:</para>
 
@@ -67,6 +67,15 @@
       </varlistentry>
 
       <varlistentry>
+        <term><parameter>--no-cache-dir</parameter></term>
+        <listitem>
+          <para>Prevents pip from copying the created wheel into the
+          <filename class='directory'>/root/.cache/pip</filename>
+          directory.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
         <term><command>install</command></term>
         <listitem>
            <para>This command installs the package.</para>
diff --git a/chapter08/jinja2.xml b/chapter08/jinja2.xml
index ca614ecdc..59a01e26c 100644
--- a/chapter08/jinja2.xml
+++ b/chapter08/jinja2.xml
@@ -42,7 +42,7 @@
 
     <para>Build the package:</para>
 
-<screen><userinput remap="install">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="install">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install the package:</para>
 
diff --git a/chapter08/markupsafe.xml b/chapter08/markupsafe.xml
index b4a0cbc58..c09b9a64c 100644
--- a/chapter08/markupsafe.xml
+++ b/chapter08/markupsafe.xml
@@ -42,7 +42,7 @@
 
     <para>Compile MarkupSafe with the following command:</para>
 
-<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>This package does not come with a test suite.</para>
 
diff --git a/chapter08/meson.xml b/chapter08/meson.xml
index a53a88c3c..8cf308237 100644
--- a/chapter08/meson.xml
+++ b/chapter08/meson.xml
@@ -46,7 +46,7 @@
 -->
     <para>Compile Meson with the following command:</para>
 
-<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>The test suite requires some packages outside the scope of LFS.</para>
 
diff --git a/chapter08/mpfr.xml b/chapter08/mpfr.xml
index 2d16053de..c9e7c1a7d 100644
--- a/chapter08/mpfr.xml
+++ b/chapter08/mpfr.xml
@@ -41,20 +41,6 @@
   <sect2 role="installation">
     <title>Installation of MPFR</title>
 
-    <!-- https://sympa.inria.fr/sympa/arc/mpfr/2023-01/msg00002.html
-         https://gitlab.inria.fr/mpfr/mpfr/-/commit/5172494c
-
-         Note that it's a different issue from Glibc #30068 we've fixed in
-         chapter08/glibc.xml with a sed.  Normally we just document the
-         test failure, but in this case the particular subtest also serves
-         as an additional guard against Glibc #30068.  So we apply the
-         upstream fix here.   -->
-    <para>Fix a test case based on a bug of old Glibc releases:</para>
-
-<screen><userinput remap="pre">sed -e 's/+01,234,567/+1,234,567 /' \
-    -e 's/13.10Pd/13Pd/'            \
-    -i tests/tsprintf.c</userinput></screen>
-
     <para>Prepare MPFR for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr        \
diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index 40a769311..6a4441552 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -101,21 +101,6 @@ make MANSUFFIX=ssl install</userinput></screen>
         number</emphasis>.
       </para>
 
-      <!-- https://bugzilla.mindrot.org/show_bug.cgi?id=3548 -->
-      <para>
-        If <application>OpenSSH</application> is installed, it will be an
-        exception of the general rule above.  It contains an
-        over-restrictive OpenSSL version check, so both SSH client and SSH
-        server will refuse to start if OpenSSL
-        is updated with MAJOR version number unchanged but MINOR version
-        number changed.  You need to rebuild
-        <application>OpenSSH</application> after such an upgrade.
-        <emphasis role='bold'>If <application>OpenSSH</application> is being
-        used to access the system, you must rebuild and reinstall it
-        after upgrading OpenSSL to a new MINOR version number before logout
-        or you won't be able to login via SSH anymore.</emphasis>
-      </para>
-
       <para>
         However, any running programs linked to those libraries need to be stopped
         and restarted. Read the related entries in
diff --git a/chapter08/procps.xml b/chapter08/procps.xml
index 20a6be096..7fc74f587 100644
--- a/chapter08/procps.xml
+++ b/chapter08/procps.xml
@@ -67,18 +67,9 @@
 
     <para>Compile the package:</para>
 
-<screen><userinput remap="make">make</userinput></screen>
-<!--
-    <para>The test suite needs some custom modifications for LFS.
-    Remove a test that fails when scripting does not use a tty device and
-    fix two others.
-    To run the test suite, run the following commands:</para>
-
-<screen><userinput remap="test">sed -i -r 's|(pmap_initname)\\\$|\1|' testsuite/pmap.test/pmap.exp
-sed -i '/set tty/d' testsuite/pkill.test/pkill.exp
-rm testsuite/pgrep.test/pgrep.exp
-make check</userinput></screen>
--->
+<screen revision='sysv'><userinput remap="make">make</userinput></screen>
+<screen revision='systemd'><userinput remap="make">make src_w_LDADD='$(LDADD) -lsystemd'</userinput></screen>
+
     <para> To run the test suite, run:</para>
 
 <screen><userinput remap="test">make check</userinput></screen>
diff --git a/chapter08/shadow.xml b/chapter08/shadow.xml
index 0f34d70ac..f88216a5b 100644
--- a/chapter08/shadow.xml
+++ b/chapter08/shadow.xml
@@ -107,6 +107,7 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;</userinput></s
 ./configure --sysconfdir=/etc   \
             --disable-static    \
             --with-{b,yes}crypt \
+            --without-libbsd    \
             --with-group-name-max-length=32</userinput></screen>
 
     <variablelist>
@@ -144,6 +145,14 @@ find man -name Makefile.in -exec sed -i 's/passwd\.5 / /'   {} \;</userinput></s
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--without-libbsd</parameter></term>
+        <listitem>
+           <para>Do not use the readpassphrase function from libbsd which
+           is not in LFS.  Use the internal copy instead.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter08/stripping.xml b/chapter08/stripping.xml
index 1446949be..92ecfe310 100644
--- a/chapter08/stripping.xml
+++ b/chapter08/stripping.xml
@@ -95,6 +95,7 @@ online_usrlib="libbfd-&binutils-version;.so
                libm.so.6
                libreadline.so.&readline-soversion;
                libz.so.&zlib-version;
+               libzstd.so.&zstd-version;
                $(cd /usr/lib; find libnss*.so* -type f)"
 
 for BIN in $online_usrbin; do
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 63003ac68..761467acd 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -68,6 +68,7 @@ meson setup \
       -Dmode=release                \
       -Dpamconfdir=no               \
       -Ddev-kvm-mode=0660           \
+      -Dnobody-group=nogroup        \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
 
@@ -178,6 +179,14 @@ meson setup \
           consider it dangerous.  This option overrides it.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-Dnobody-group=nogroup</parameter></term>
+        <listitem>
+          <para>Tell the package the group name with GID 65534 is
+          <systemitem class='groupname'>nogroup</systemitem>.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 72c6e3699..0ec5c1c8e 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -1220,7 +1220,8 @@ su tester -c "make -k check"</userinput></screen>
           <para>Creates new UUIDs. Each new UUID is a random number likely to be
           unique among all UUIDs created, on the local system and on other
           systems, in the past and in the future, with extremely high
-          probability (~340 trillion trillion trillion unique UUIDs are possible)</para>
+          probability (2<superscript>128</superscript> UUIDs are
+          possible)</para>
           <indexterm zone="ch-system-util-linux uuidgen">
             <primary sortas="b-uuidgen">uuidgen</primary>
           </indexterm>
diff --git a/chapter08/wheel.xml b/chapter08/wheel.xml
index 88e47d556..0f3a1c99e 100644
--- a/chapter08/wheel.xml
+++ b/chapter08/wheel.xml
@@ -42,7 +42,7 @@
 
     <para>Compile Wheel with the following command:</para>
 
-<screen><userinput remap="make">pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
+<screen><userinput remap="make">pip3 wheel -w dist --no-cache-dir --no-build-isolation --no-deps $PWD</userinput></screen>
 
     <para>Install Wheel with the following command:</para>