Automatic merge of trunk into multilib

5 files changed, 55 insertions, 21 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 27996b715..218b374af 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,39 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
     <listitem>
+      <para>2021-08-25</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - LFS-11.0-rc3 released.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.46.4. Fixes
+          <ulink url="&lfs-ticket-root;4910">#4910</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.59.1. Fixes
+          <ulink url="&lfs-ticket-root;4909">#4909</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux 2.37.2. Fixes
+          <ulink url="&lfs-ticket-root;4908">#4908</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.13.12. Fixes
+          <ulink url="&lfs-ticket-root;4907">#4907</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.53. Fixes
+          <ulink url="&lfs-ticket-root;4906">#4906</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to openssl-1.1.1l (security fixes). Fixes
+          <ulink url="&lfs-ticket-root;4911">#4911</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-08-20</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index 1d53f6987..2e57af238 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -11,8 +11,8 @@
   <title>Introduction</title>
 
   <para>This chapter shows how to build the last missing bits of the temporary
-  system: first, the tools needed by the build machinery of various packages,
-  then three packages needed to run tests.  Now that all circular dependencies
+  system: the tools needed by the build machinery of various packages.
+  Now that all circular dependencies
   have been resolved, we can use a <quote>chroot</quote> environment,
   completely isolated the host operating system used for the build, except
   for the running kernel.</para>
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index 4144cd205..79fdc5f1f 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -93,6 +93,8 @@ cd       build</userinput></screen>
 
 <screen><userinput remap="test">make check</userinput></screen>
 
+    <para>One test, u_direct_io, is known to fail on some systems.</para>
+
 <!-- This is a ridiculous amount now! And is it still true?
      Does not appear to be true for version 1.46.3.  Time with tests
      26 seconds with tests (With lots of cores and ram and an ssd disk).
diff --git a/chapter08/grub.xml b/chapter08/grub.xml
index 69e098daa..07be0e851 100644
--- a/chapter08/grub.xml
+++ b/chapter08/grub.xml
@@ -53,7 +53,6 @@
     <para>Prepare GRUB for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr          \
-            --sbindir=/sbin        \
             --sysconfdir=/etc      \
             --disable-efiemu       \
             --disable-werror</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 9e6b65e6b..5724ac3b8 100644
--- a/packages.ent
+++ b/packages.ent
@@ -140,10 +140,10 @@
 <!ENTITY diffutils-fin-du "36 MB">
 <!ENTITY diffutils-fin-sbu "0.7 SBU">
 
-<!ENTITY e2fsprogs-version "1.46.3">
-<!ENTITY e2fsprogs-size "9,2688 KB">
+<!ENTITY e2fsprogs-version "1.46.4">
+<!ENTITY e2fsprogs-size "9,298 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "0edcffc4b601a4191bfa152f61b406b2">
+<!ENTITY e2fsprogs-md5 "128f5b0f0746b28d1e3ca7e263c57094">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-fin-du "93 MB">
 <!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.5 SBU on an SSD">
@@ -402,10 +402,10 @@
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB"> 
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.52">
-<!ENTITY libcap-size "155 KB">
+<!ENTITY libcap-version "2.53">
+<!ENTITY libcap-size "153 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "91548d37bbb5b706928bc3b3bb0e22ac">
+<!ENTITY libcap-md5 "094994d4554c6689cf98ae4f717b8e19">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "3.2 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@@ -436,12 +436,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "13">
-<!ENTITY linux-patch-version "10">
+<!ENTITY linux-patch-version "12">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "116,553 KB">
+<!ENTITY linux-size "116,545 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "951672e89ffa0a2f32ea34732ee85f3f">
+<!ENTITY linux-md5 "6e1728b2021ca19cc9273f080e6c44c7">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
  allnoconfig rounded down to allow for ongoing cleanups,
@@ -499,10 +499,10 @@
 <!ENTITY markupsafe-fin-du "516 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.59.0">
-<!ENTITY meson-size "1,896 KB">
+<!ENTITY meson-version "0.59.1">
+<!ENTITY meson-size "1,900 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "bb8bf3898afefc8272989e4be8ff0a5b">
+<!ENTITY meson-md5 "9c8135ecde820094be2f42f457fb6535">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "40 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -541,10 +541,10 @@
 <!ENTITY ninja-fin-du "64 MB">
 <!ENTITY ninja-fin-sbu "0.2 SBU">
 
-<!ENTITY openssl-version "1.1.1k">
-<!ENTITY openssl-size "9,596 KB">
+<!ENTITY openssl-version "1.1.1l">
+<!ENTITY openssl-size "9,604 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "c4e7d95f782b08116afa27b30393dd27">
+<!ENTITY openssl-md5 "ac0d4387f3ba0ad741b0580dd45f6ff3">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "154 MB">
 <!ENTITY openssl-fin-sbu "2.2 SBU">
@@ -718,10 +718,10 @@
 <!ENTITY udev-lfs-home    " ">
 
 <!ENTITY util-linux-minor "2.37">
-<!ENTITY util-linux-version "2.37.1"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "5,497 KB">
+<!ENTITY util-linux-version "2.37.2"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "5,490 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 "6d244f0f59247e9109f47d6e5dd0556b">
+<!ENTITY util-linux-md5 "d659bf7cd417d93dc609872f6334b019">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "128 MB">
 <!ENTITY util-linux-tmp-sbu "0.7 SBU">