From 3864d235cfd3623f6a4765d9acd13caee62c6629 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 2 Sep 2023 08:54:55 -0500
Subject: Package updates and misc upates/typos.

Update to vim-1837.$
Update to zlib-1.3.$
Update to wheel-0.41.2 (Python Module).$
Update to util-linux-2.39.2.$
Update to sysvinit-3.08.$
Update to shadow-4.14.0.$
Update to Python-3.11.5.$
Update to procps-ng-4.0.4.$
Update to pkgconf-2.0.2.$
Update to mpfr-4.2.1.$
Update to kbd-2.6.2.$
Update to gzip-1.13.$
Update to coreutils-9.4.$
Specify the 'nobody-group' for systemd.$
Remove unused usb group.$
---
 chapter08/autoconf.xml |  2 +-
 chapter08/mpfr.xml     | 14 --------------
 chapter08/procps.xml   | 15 +++------------
 chapter08/shadow.xml   |  9 +++++++++
 chapter08/systemd.xml  |  9 +++++++++
 5 files changed, 22 insertions(+), 27 deletions(-)

(limited to 'chapter08')

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/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/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/systemd.xml b/chapter08/systemd.xml
index 63003ac68..b5b50e623 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 what group name to use for
+          the 'nobody-group'.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
-- 
cgit v1.2.3-54-g00ecf