Merge changes from trunk to multilib

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/multilib@12072 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

22 files changed, 279 insertions, 125 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b538c09b8..77b331b8b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,106 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <itemizedlist>
+      <para>2020-12-15</para>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.46. Fixes
+          <ulink url="&lfs-ticket-root;4771">#4771</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-3.2.4. Fixes
+          <ulink url="&lfs-ticket-root;4770">#4770</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to autoconf-2.70. Fixes
+          <ulink url="&lfs-ticket-root;4769">#4769</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-1.1.1i. Fixes
+          <ulink url="&lfs-ticket-root;4768">#4768</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python3-3.9.1. Fixes
+          <ulink url="&lfs-ticket-root;4767">#4767</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.9.14. Fixes
+          <ulink url="&lfs-ticket-root;4766">#4766</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bash-5.1 and readline-8.1. Fixes
+          <ulink url="&lfs-ticket-root;4764">#4764</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <itemizedlist>
+      <para>2020-12-07</para>
+        <listitem>
+          <para>[ken] - Patch meson-0.56.0 to correctly create pkgconfig
+          files re static libraries (re sysprof in BLFS) . Fixes
+          <ulink url="&lfs-ticket-root;4765">#4675</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <itemizedlist>
+      <para>2020-12-03</para>
+        <listitem>
+          <para>[renodr] - Update to linux-5.9.12. Fixes
+          <ulink url="&lfs-ticket-root;4763">#4673</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to bc-3.2.3. Fixes
+          <ulink url="&lfs-ticket-root;4762">#4672</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to systemd-247. Fixes
+          <ulink url="&lfs-ticket-root;4745">#4745</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <itemizedlist>
+      <para>2020-12-01</para>
+        <listitem>
+          <para>[bdubbs] - Update to ninja-1.10.2. Fixes
+          <ulink url="&lfs-ticket-root;4760">#4760</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-3.2.1. Fixes
+          <ulink url="&lfs-ticket-root;4759">#4759</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.9.11. Fixes
+          <ulink url="&lfs-ticket-root;4758">#4758</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.16.3. Fixes
+          <ulink url="&lfs-ticket-root;4757">#4757</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - Update to sysvinit-2.98. Fixes
+          <ulink url="&lfs-ticket-root;4756">#4756</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.36.1. Fixes
+          <ulink url="&lfs-ticket-root;4755">#4755</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20201124. Addresses
+          <ulink url="&lfs-ticket-root;4722">#4722</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.2070. Addresses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 82f30baf5..f67c577c4 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -36,15 +36,15 @@
     <!--<listitem>
       <para>Attr-&attr-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Autoconf-&autoconf-version;</para>
-    </listitem>-->
-    <!--listitem>
+    </listitem>
+    <listitem>
       <para>Automake-&automake-version;</para>
-    </listitem>-->
-    <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Bash &bash-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bc &bc-version;</para>
     </listitem>
@@ -228,12 +228,12 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>-->
-    <!--<listitem revision="sysv">
+    </listitem>
+    <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Tar-&tar-version;</para>
     </listitem>-->
@@ -246,9 +246,9 @@
     <listitem>
       <para>Tzdata-&tzdata-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux-&util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Vim-&vim-version;</para>
     </listitem>
@@ -279,9 +279,11 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
     <listitem>
-      <para>autoconf-2.69-consolidated_fixes-1.patch</para>
+      <para>meson-0.56.0-upstream_fix-1.patch</para>
+    </listitem>
+    <listitem>
+      <para>systemd-247-upstream_fixes-1.patch</para>
     </listitem>
-
 
   </itemizedlist>
 
@@ -289,9 +291,9 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <!--<listitem>
-      <para>bash-4.4-upstream_fixes-1.patch</para>
-    </listitem>-->
+    <listitem>
+      <para>bash-5.0-upstream_fixes-1.patch</para>
+    </listitem>
 
   </itemizedlist>
 
diff --git a/chapter02/aboutlfs.xml b/chapter02/aboutlfs.xml
index 93f885e22..0d5a5281b 100644
--- a/chapter02/aboutlfs.xml
+++ b/chapter02/aboutlfs.xml
@@ -57,7 +57,8 @@
   host system.  If logging in through a graphical display manager, the
   user's <filename>.bash_profile</filename> is not normally used when
   a virtual terminal is started.  In this case, add the export command to
-  the <filename>.bashrc</filename> file for the user and root.  In addition, 
+  the <filename>.bashrc</filename> file for the user and
+  <systemitem class="username">root</systemitem>.  In addition, 
   some distributions have instructions to not run the <filename>.bashrc</filename> 
   instructions in a non-interactive bash invocation.  Be sure to add the
   export command before the test for non-interactive use.</para>
diff --git a/chapter02/stages.xml b/chapter02/stages.xml
index 31a60166d..b15b9446e 100644
--- a/chapter02/stages.xml
+++ b/chapter02/stages.xml
@@ -25,9 +25,10 @@
   
     <itemizedlist>
       <listitem>
-        <para>Procedures done as the root user after Section 2.4 need to 
-        have the LFS environment variable set <emphasis>FOR THE ROOT
-        USER</emphasis>.</para>
+        <para>Procedures done as the
+        <systemitem class="username">root</systemitem> user after Section
+        2.4 need to have the LFS environment variable set
+        <emphasis>FOR THE ROOT USER</emphasis>.</para>
       </listitem>
     </itemizedlist>
   </sect2>
@@ -41,7 +42,8 @@
       </listitem>
 
       <listitem>
-        <para>Threse two chapters must be done as user <emphasis>lfs</emphasis>.
+        <para>These two chapters <emphasis>must</emphasis> be done as user
+        <systemitem class="username">lfs</systemitem>.
         A <command>su - lfs</command> needs to be done before any task in these
         chapters. Failing to do that, you are at risk of installing packages to the
         host, and potentially rendering it unusable.</para>
@@ -68,18 +70,22 @@
       <listitem>
         <para>A few operations, from <quote>Changing Ownership</quote> to
         <quote>Entering the Chroot Environment</quote> must be done as the
-        root user, with the LFS environment variable set for the root user.</para>
+        <systemitem class="username">root</systemitem> user, with the LFS
+        environment variable set for the
+        <systemitem class="username">root</systemitem>user.</para>
       </listitem>
 
       <listitem>
          <para> When entering chroot, the LFS environment variable must be set
-         for root. The LFS variable is not used afterwards.</para>
+         for <systemitem class="username">root</systemitem>. The LFS
+         variable is not used afterwards.</para>
       </listitem>
 
       <listitem>
          <para> The virtual file systems must be mounted.  This can be done
          before or after entering chroot by changing to a host virtual terminal
-         and, as root, running the commands in 
+         and, as <systemitem class="username">root</systemitem>, running the
+         commands in 
          <xref linkend='ch-tools-bindmount'/> and 
          <xref linkend='ch-tools-kernfsmount'/>.</para>
       </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 60d2c0533..71a5d6969 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -17,7 +17,7 @@
   needed to build an LFS system:</para>
 
   <variablelist role="materials">
-
+<!--
     <varlistentry>
       <term>Autoconf Consolidated Fixes Patch - <token>&autoconf-fixes-patch-size;</token>:</term>
       <listitem>
@@ -25,7 +25,8 @@
         <para>MD5 sum: <literal>&autoconf-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
+<!--
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
@@ -33,7 +34,7 @@
         <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
 <!--
     <varlistentry>
       <term>Binutils Fix for gold Test Suite Patch - <token>&binutils-gold-test-patch-size;</token>:</term>
@@ -82,6 +83,15 @@
         <para>MD5 sum: <literal>&kbd-backspace-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+
+    <varlistentry>
+      <term>Meson Upstream Fix Patch - <token>&meson-fix-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&meson-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&meson-fix-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
 <!--
     <varlistentry>
       <term>Libpipeline Checks Patch - <token>&libpipeline-checks-patch-size;</token>:</term>
@@ -99,15 +109,13 @@
       </listitem>
     </varlistentry>
 
-<!--
     <varlistentry revision="systemd">
-      <term>Systemd GCC-10 Patch - <token>&systemd-gcc10-patch-size;</token>:</term>
+      <term>Systemd Upstream Fixes Patch - <token>&systemd-upstream-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&systemd-gcc10-patch;"/></para>
-        <para>MD5 sum: <literal>&systemd-gcc10-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&systemd-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&systemd-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
 
   </variablelist>
 
diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml
index 23fa3a41c..f49991852 100644
--- a/chapter05/glibc.xml
+++ b/chapter05/glibc.xml
@@ -165,10 +165,11 @@ cd       build</userinput></screen>
     <para>Install the package:</para>
 
     <warning><para>If <envar>LFS</envar> is not properly set, and despite the
-    recommendations, you are building as root, the next command will install
-    the newly built glibc to your host system, which most likely will render it
-    unusable. So double check that the environment is correctly set for user
-    <systemitem class="username">lfs</systemitem>.</para></warning>
+    recommendations, you are building as
+    <systemitem class="username">root</systemitem>, the next command will
+    install the newly built glibc to your host system, which most likely
+    will render it unusable. So double check that the environment is
+    correctly set, before running the following command.</para></warning>
 
 <screen><userinput remap="install">make DESTDIR=$LFS install</userinput></screen>
 
diff --git a/chapter06/introduction.xml b/chapter06/introduction.xml
index 163aa5796..58f0dd7f7 100644
--- a/chapter06/introduction.xml
+++ b/chapter06/introduction.xml
@@ -22,7 +22,8 @@
   independent of the host system yet.</para>
 
   <para>Once again, let us recall that improper setting of <envar>LFS</envar>
-  together with building as root, may render your computer unusable.
+  together with building as <systemitem class="username">root</systemitem>,
+  may render your computer unusable.
   This whole chapter must be done as user <systemitem
   class="username">lfs</systemitem>, with the environment as described in
   <xref linkend="ch-preps-settingenviron"/>.</para>
diff --git a/chapter08/autoconf.xml b/chapter08/autoconf.xml
index 22e0a1002..23fdf1b75 100644
--- a/chapter08/autoconf.xml
+++ b/chapter08/autoconf.xml
@@ -40,12 +40,12 @@
 
   <sect2 role="installation">
     <title>Installation of Autoconf</title>
-
+<!--
     <para>First, apply a patch fixes several problems that occur with the latest
     perl, libtool, and bash versions.</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&autoconf-fixes-patch;</userinput></screen>
-
+-->
     <para>Prepare Autoconf for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index b8dd5fe40..4ab6f7d81 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -40,9 +40,9 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
-    <para>Incorporate some upstream fixes:</para>
+    <para>First, fix a race condition if using multiple cores:</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+<screen><userinput remap="pre">sed -i  '/^bashline.o:.*shmbchar.h/a bashline.o: ${DEFDIR}/builtext.h' Makefile.in</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>
 
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 55006e1c7..c9f97a20d 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -60,6 +60,10 @@
 
 <screen><userinput remap="pre">sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk</userinput></screen>
 
+<para>Fix a problem with autoconf-2.70 in an included gnulib .m4 file:</para>
+
+<screen><userinput remap="pre">echo '# deleted' > m4/std-gnu11.m4</userinput></screen>
+
     <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">autoreconf -fiv
@@ -83,7 +87,7 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
         <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
         <listitem>
           <para>This environment variable allows the package to be 
-          built as the root user.
+          built as the <systemitem class="username">root</systemitem> user.
           </para>
         </listitem>
       </varlistentry>
diff --git a/chapter08/meson.xml b/chapter08/meson.xml
index b3c3224c5..4076c4c5c 100644
--- a/chapter08/meson.xml
+++ b/chapter08/meson.xml
@@ -48,6 +48,11 @@
   <sect2 role="installation">
     <title>Installation of Meson</title>
 
+    <para>First, apply a patch that fixes an issue with pkgconfig files
+    for static libraries:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&meson-fix-patch;</userinput></screen>
+
     <para>Compile Meson with the following command:</para>
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index b6dbb2529..c4c77aa48 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -68,10 +68,14 @@
 <screen><userinput remap="install">sed -i '/INSTALL_LIBS/s/libcrypto.a libssl.a//' Makefile
 make MANSUFFIX=ssl install</userinput></screen>
 
-    <para>If desired, install the documentation:</para>
+    <para>Add the version to the documentation directory name, to be
+    consistent with other packages:</para>
 
-<screen><userinput remap="install">mv -v /usr/share/doc/openssl /usr/share/doc/openssl-&openssl-version;
-cp -vfr doc/* /usr/share/doc/openssl-&openssl-version;</userinput></screen>
+<screen><userinput remap="install">mv -v /usr/share/doc/openssl /usr/share/doc/openssl-&openssl-version;</userinput></screen>
+
+    <para>If desired, install some additional documentation:</para>
+
+<screen><userinput remap="install">cp -vfr doc/* /usr/share/doc/openssl-&openssl-version;</userinput></screen>
 
   </sect2>
 
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 57f828bd9..118586079 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -46,6 +46,10 @@
 <screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-2.patch</userinput></screen>
 -->
 
+    <para>First, apply a patch to fix some regressions:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-upstream_fixes-1.patch</userinput></screen>
+
     <para>Create a symlink to work around the xsltproc command not being installed:</para>
 
 <screen><userinput remap="pre">ln -sf /bin/true /usr/bin/xsltproc</userinput></screen>
@@ -56,7 +60,7 @@
 
     <para>Remove tests that cannot be built in chroot:</para>
 
-<screen><userinput remap="pre">sed '177,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '181,$ d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Remove an unneeded group,
     <systemitem class="groupname">render</systemitem>, from the default udev
@@ -92,6 +96,7 @@ meson --prefix=/usr                 \
       -Dhomed=false                 \
       -Duserdb=false                \
       -Dman=true                    \
+      -Dmode=release                \
       -Ddocdir=/usr/share/doc/systemd-&systemd-version; \
       ..</userinput></screen>
 
@@ -185,6 +190,14 @@ meson --prefix=/usr                 \
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>-Dmode=release</parameter></term>
+        <listitem>
+          <para>Disable some features considered experimental by upstream.
+          </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
@@ -365,8 +378,8 @@ rm -f /usr/bin/xsltproc</userinput></screen>
         resolvectl), resolvectl, runlevel (symlink to systemctl), shutdown
         (symlink to systemctl), systemctl, systemd-analyze,
         systemd-ask-password, systemd-cat, systemd-cgls, systemd-cgtop,
-        systemd-delta, systemd-detect-virt, systemd-escape, systemd-hwdb,
-        systemd-id128, systemd-inhibit, systemd-machine-id-setup,
+        systemd-delta, systemd-detect-virt, systemd-dissect, systemd-escape, 
+        systemd-hwdb, systemd-id128, systemd-inhibit, systemd-machine-id-setup,
         systemd-mount, systemd-notify, systemd-nspawn, systemd-path,
         systemd-repart, systemd-resolve (symlink to resolvectl), systemd-run,
         systemd-socket-activate, systemd-stdio-bridge, systemd-tmpfiles,
@@ -694,6 +707,16 @@ rm -f /usr/bin/xsltproc</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="systemd-dissect">
+        <term><command>systemd-dissect</command></term>
+        <listitem>
+          <para>Is used to inspect OS disk images.</para>
+          <indexterm zone="ch-system-systemd systemd-dissect">
+            <primary sortas="b-systemd-dissect">systemd-dissect</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-escape">
         <term><command>systemd-escape</command></term>
         <listitem>
diff --git a/chapter08/tar.xml b/chapter08/tar.xml
index 1c3a5c75e..6f37ce888 100644
--- a/chapter08/tar.xml
+++ b/chapter08/tar.xml
@@ -56,8 +56,10 @@
         <term><envar>FORCE_UNSAFE_CONFIGURE=1</envar></term>
         <listitem>
           <para>This forces the test for <function>mknod</function> to be run
-          as root.  It is generally considered dangerous to run this test as
-          the root user, but as it is being run on a system that has only been
+          as <systemitem class="username">root</systemitem>.
+          It is generally considered dangerous to run this test as
+          the <systemitem class="username">root</systemitem> user, but as it
+          is being run on a system that has only been
           partially built, overriding it is OK.</para>
         </listitem>
       </varlistentry>
diff --git a/chapter08/texinfo.xml b/chapter08/texinfo.xml
index 7257ae5b5..9cbbda6a6 100644
--- a/chapter08/texinfo.xml
+++ b/chapter08/texinfo.xml
@@ -43,13 +43,13 @@
 
     <para>Prepare Texinfo for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr --disable-static</userinput></screen>
-
+<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
+<!--
     <variablelist>
       <title>The meaning of the configure option:</title>
 
       <varlistentry>
-        <term><parameter>--disable-static</parameter></term>
+        <term><parameter>- -disable-static</parameter></term>
         <listitem>
           <para>In this case, the top-level configure script will complain that
           this is an unrecognized option, but the configure script for
@@ -60,7 +60,7 @@
       </varlistentry>
 
     </variablelist>
-
+-->
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 2c94f3b11..d41c519c1 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -88,7 +88,8 @@
 
     <para>If desired, run the test suite as a non-root user:</para>
 
-    <warning><para>Running the test suite as the root user can be harmful to
+    <warning><para>Running the test suite as the
+    <systemitem class="username">root</systemitem> user can be harmful to
     your system.  To run it, the CONFIG_SCSI_DEBUG option for the kernel must
     be available in the currently running system and must be built as a
     module.  Building it into the kernel will prevent booting.  For complete
diff --git a/chapter09/systemd-custom.xml b/chapter09/systemd-custom.xml
index 7addaefbb..7e0613df2 100644
--- a/chapter09/systemd-custom.xml
+++ b/chapter09/systemd-custom.xml
@@ -41,7 +41,8 @@ TTYVTDisallocate=no</literal>
 EOF</userinput></screen>
 
     <para>The boot messages can always be reviewed by using the
-    <userinput>journalctl -b</userinput> command as the root user.</para>
+    <userinput>journalctl -b</userinput> command as the
+    <systemitem class="username">root</systemitem> user.</para>
 
   </sect2>
 
diff --git a/chapter10/kernel.xml b/chapter10/kernel.xml
index 239d306d4..a1dc8043f 100644
--- a/chapter10/kernel.xml
+++ b/chapter10/kernel.xml
@@ -133,8 +133,7 @@ Device Drivers  ---&gt;
 File systems  ---&gt;
    [*] Inotify support for userspace [CONFIG_INOTIFY_USER]
   Pseudo filesystems  ---&gt;
-   [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]
-   [*] Tmpfs extended attributes [CONFIG_TMPFS_XATTR]</screen>
+   [*] Tmpfs POSIX Access Control Lists [CONFIG_TMPFS_POSIX_ACL]</screen>
     </note>
 
     <note revision="systemd">
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index 1822e6165..9b184c9d8 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -51,12 +51,6 @@
     <ulink url='&blfs-book;basicnet/wget.html'>wget</ulink>.
     </para></listitem>
 
-    <listitem><para>If one or more of your disk drives have a GUID partition
-    table (GPT), either <ulink
-    url='&blfs-book;postlfs/gptfdisk.html'>gptfdisk</ulink> or <ulink
-    url='&blfs-book;postlfs/parted.html'>parted</ulink> will be useful.
-    </para></listitem>
-
     <listitem><para>Finally, a review of the following configuration files
     is also appropriate at this point.  </para>
 
diff --git a/general.ent b/general.ent
index ef7601bc2..06deb1646 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20201115">
+<!ENTITY version         "SVN-20201215">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20201115-systemd">
+<!ENTITY versiond        "20201215-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "November 15th, 2020">
+<!ENTITY releasedate     "December 15th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 
diff --git a/packages.ent b/packages.ent
index 0d4869005..3db4a290a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -29,38 +29,38 @@
 <!ENTITY attr-fin-du "4.2 MB">
 <!ENTITY attr-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY autoconf-version "2.69">
-<!ENTITY autoconf-size "1,186 KB">
+<!ENTITY autoconf-version "2.70">
+<!ENTITY autoconf-size "1,315 KB">
 <!ENTITY autoconf-url "&gnu;autoconf/autoconf-&autoconf-version;.tar.xz">
-<!ENTITY autoconf-md5 "50f97f4159805e374639a73e2636f22e">
+<!ENTITY autoconf-md5 "e4453011b18da194b565bf282948f997">
 <!ENTITY autoconf-home "&gnu-software;autoconf/">
 <!ENTITY autoconf-fin-du "79 MB">
 <!ENTITY autoconf-fin-sbu-tests "3.5">
 <!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
 
-<!ENTITY automake-version "1.16.2">
+<!ENTITY automake-version "1.16.3">
 <!ENTITY am-minor-version "1.16">
-<!ENTITY automake-size "1,510 KB">
+<!ENTITY automake-size "1,554 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "6cb234c86f3f984df29ce758e6d0d1d7">
+<!ENTITY automake-md5 "c27f608a4e1f302ec7ce42f1251c184e">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-fin-du "108 MB">
 <!ENTITY automake-fin-sbu "less than 0.1 SBU (about 9.6 SBU with tests)">
 
-<!ENTITY bash-version "5.0">
-<!ENTITY bash-size "9,898 KB">
+<!ENTITY bash-version "5.1">
+<!ENTITY bash-size "10,214 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "2b44b47b905be16f45709648f671820b">
+<!ENTITY bash-md5 "bb91a17fd6c9032c26d0b2b78b50aff5">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-tmp-du "64 MB">
 <!ENTITY bash-tmp-sbu "0.4 SBU">
 <!ENTITY bash-fin-du "48 MB">
 <!ENTITY bash-fin-sbu "2.4 SBU">
 
-<!ENTITY bc-version "3.1.6">
-<!ENTITY bc-size "207 KB">
+<!ENTITY bc-version "3.2.4">
+<!ENTITY bc-size "221 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "bd5e3922d95098ef3dcbddf3f93321fb">
+<!ENTITY bc-md5 "03d74ea465bb4181f683d1cd53d432e1">
 <!ENTITY bc-home "https://git.yzena.com/gavin/bc">
 <!ENTITY bc-fin-du "6.5 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -319,10 +319,10 @@
 <!ENTITY gzip-fin-du "19 MB">
 <!ENTITY gzip-fin-sbu "0.1 SBU">
 
-<!ENTITY iana-etc-version "20201110">
-<!ENTITY iana-etc-size "577 KB">
+<!ENTITY iana-etc-version "20201124">
+<!ENTITY iana-etc-size "578 KB">
 <!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
-<!ENTITY iana-etc-md5 "8c06f1320cf43b3868963707838dca51">
+<!ENTITY iana-etc-md5 "c334faba23f49fffe02cab0077b30828">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.7 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@@ -391,10 +391,10 @@
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB"> 
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.45">
-<!ENTITY libcap-size "125 KB">
+<!ENTITY libcap-version "2.46">
+<!ENTITY libcap-size "127 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "e4d4c04ad28a3b601e374c0367113236">
+<!ENTITY libcap-md5 "58ffae7d6a3226d6648cdb5d6f389cbf">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "11 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@@ -425,12 +425,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "9">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-patch-version "14">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "112,833 KB">
+<!ENTITY linux-size "112,849 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "8ff3b8f25f5234b03e15540846540594">
+<!ENTITY linux-md5 "4727d38ee292c83c230a30a1db067983">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.8.3 / gcc-10.2.0 on x86_64 : minimum is
  allnoconfig extended for a hopefully-bootable build on desktop machine,
@@ -514,18 +514,18 @@
 <!ENTITY ncurses-fin-du "33 MB">
 <!ENTITY ncurses-fin-sbu "0.4 SBU">
 
-<!ENTITY ninja-version "1.10.1">
-<!ENTITY ninja-size "207 KB">
+<!ENTITY ninja-version "1.10.2">
+<!ENTITY ninja-size "209 KB">
 <!ENTITY ninja-url "&github;/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
-<!ENTITY ninja-md5 "05c1bb5ef41c85057fa6abdffa243dcd">
+<!ENTITY ninja-md5 "639f75bc2e3b19ab893eaf2c810d4eb4">
 <!ENTITY ninja-home "https://ninja-build.org/">
 <!ENTITY ninja-fin-du "78 MB">
 <!ENTITY ninja-fin-sbu "0.2 SBU">
 
-<!ENTITY openssl-version "1.1.1h">
-<!ENTITY openssl-size "9,581 KB">
+<!ENTITY openssl-version "1.1.1i">
+<!ENTITY openssl-size "9,579 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "53840c70434793127a3574433494e8d3">
+<!ENTITY openssl-md5 "08987c3cf125202e2b0840035efb392c">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "150 MB">
 <!ENTITY openssl-fin-sbu "2.1 SBU">
@@ -581,24 +581,24 @@
 <!-- If python minor version changes, updates in python and 
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.9.0">
+<!ENTITY python-version "3.9.1">
 <!ENTITY python-minor "3.9">
-<!ENTITY python-size "18,424 KB">
+<!ENTITY python-size "18,455 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "6ebfe157f6e88d9eabfbaf3fa92129f6">
+<!ENTITY python-md5 "61981498e75ac8f00adcb908281fadb6">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-tmp-du "353 MB">
 <!ENTITY python-tmp-sbu "1.2 SBU">
 <!ENTITY python-fin-du "248 MB">
 <!ENTITY python-fin-sbu "1.3 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "9d2425d666883b98add3a6c809809147">
-<!ENTITY python-docs-size "6,613 KB">
+<!ENTITY python-docs-md5 "89fd591994e303186c349014b8f9e0fd">
+<!ENTITY python-docs-size "6,648 KB">
 
-<!ENTITY readline-version "8.0">
-<!ENTITY readline-size "2,907 KB">
+<!ENTITY readline-version "8.1">
+<!ENTITY readline-size "2,924 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "7e6c1f16aee3244a69aba6e438295ca3">
+<!ENTITY readline-md5 "e9557dd5b1409f5d7b37ef717c64518e">
 <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html">
 <!ENTITY readline-fin-du "15 MB">
 <!ENTITY readline-fin-sbu "0.1 SBU">
@@ -629,26 +629,26 @@
 <!ENTITY sysklogd-fin-du "0.6 MB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "246">
+<!ENTITY systemd-version  "247">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
      change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size     "9,312 KB">
+<!ENTITY systemd-size     "9,656 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5      "a3e9efa72d0309dd26513a221cdff31b">
+<!ENTITY systemd-md5      "b0d6e603b814908acc69db29bbfb023c">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-size "592 KB">
+<!ENTITY systemd-man-size "612 KB">
 <!--<!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;-&systemd-stable;.tar.xz">-->
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5  "819cc8ccffe51cb1863846fcb59a784a">
-<!ENTITY systemd-fin-du   "262 MB">
-<!ENTITY systemd-fin-sbu  "2.0 SBU">
+<!ENTITY systemd-man-md5  "438c98be200e1c3b308e58a3399d4465">
+<!ENTITY systemd-fin-du   "264 MB">
+<!ENTITY systemd-fin-sbu  "1.8 SBU">
 
-<!ENTITY sysvinit-version "2.97">
-<!ENTITY sysvinit-size "124 KB">
+<!ENTITY sysvinit-version "2.98">
+<!ENTITY sysvinit-size "125 KB">
 <!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
-<!ENTITY sysvinit-md5 "e11bc4b3eac6e6ddee7f8306230749a9">
+<!ENTITY sysvinit-md5 "e3254f7622ea5cf2322b1b386a98ba59">
 <!ENTITY sysvinit-home "https://savannah.nongnu.org/projects/sysvinit">
 <!ENTITY sysvinit-fin-du "1.4 MB">
 <!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
@@ -698,23 +698,23 @@
 <!ENTITY udev-lfs-home    " ">
 
 <!ENTITY util-linux-minor "2.36">
-<!ENTITY util-linux-version "2.36"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "5,120 KB">
+<!ENTITY util-linux-version "2.36.1"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "5,110 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "fe7c0f7e439f08970e462c9d44599903">
+<!ENTITY util-linux-md5 "b0b702979d47043d9c4d8ba93be21e20">
 <!ENTITY util-linux-home "http://freecode.com/projects/util-linux">
 <!ENTITY util-linux-tmp-du "133 MB">
 <!ENTITY util-linux-tmp-sbu "0.8 SBU">
 <!ENTITY util-linux-fin-du "260 MB">
 <!ENTITY util-linux-fin-sbu "1.2 SBU">
 
-<!ENTITY vim-version "8.2.1845">
+<!ENTITY vim-version "8.2.2070">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "14,846 KB">
+<!ENTITY vim-size "14,968 KB">
 <!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
 <!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
-<!ENTITY vim-md5 "085cf5e6204c3e9348d9e56b422adfba">
+<!ENTITY vim-md5 "52ecae95a255a4e9221d81e6ad64e6a2">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "201 MB">
 <!ENTITY vim-fin-sbu "2.2 SBU">
diff --git a/patches.ent b/patches.ent
index 0f13fc504..c3e7cb5d2 100644
--- a/patches.ent
+++ b/patches.ent
@@ -53,6 +53,11 @@
 <!ENTITY libpipeline-checks-patch-md5 "0cd71f98eadaee07647d021d2e4c8621">
 <!ENTITY libpipeline-checks-patch-size "22 KB">
 -->
+
+<!ENTITY meson-fix-patch "meson-&meson-version;-upstream_fix-1.patch">
+<!ENTITY meson-fix-patch-md5 "589012d95c80f256e569598caf27c9a6">
+<!ENTITY meson-fix-patch-size "2.2 KB">
+
 <!--
 <!ENTITY ninja-limit-jobs-patch "ninja-&ninja-version;-add_NINJAJOBS_var-1.patch">
 <!ENTITY ninja-limit-jobs-patch-md5 "f537a633532492e805aa342fa869ca45">
@@ -62,9 +67,6 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
-<!-- Use if there is a need to create another consolidated patch. 
-     So far, with 244, all is quiet.
-<!ENTITY systemd-consolidated-patch "systemd-&systemd-version;-consolidated_fixes-2.patch">
-<!ENTITY systemd-consolidated-patch-md5 "2bad2992f4373eb925885f2ea2fb8d14">
-<!ENTITY systemd-consolidated-patch-size "64 KB">
--->
+<!ENTITY systemd-upstream-fixes-patch "systemd-&systemd-version;-upstream_fixes-1.patch">
+<!ENTITY systemd-upstream-fixes-patch-md5 "573a166f3620875208f78bf4dc431c8b">
+<!ENTITY systemd-upstream-fixes-patch-size "8 KB">