MultiLib: Merge changes from trunk

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

7 files changed, 118 insertions, 44 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a3be8d036..04137ec53 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,74 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
     <listitem>
+      <para>2020-04-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.0486. Addresses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to elfutils-0.179. Fixes
+          <ulink url="&lfs-ticket-root;4621">#4621</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.54.0. Fixes
+          <ulink url="&lfs-ticket-root;4620">#4620</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.45.6. Fixes
+          <ulink url="&lfs-ticket-root;4619">#4619</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.16.2. Fixes
+          <ulink url="&lfs-ticket-root;4618">#4618</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xz-5.2.5. Fixes
+          <ulink url="&lfs-ticket-root;4617">#4617</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-1.1.1f. Fixes
+          <ulink url="&lfs-ticket-root;4616">#4616</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to perl-5.30.2. Fixes
+          <ulink url="&lfs-ticket-root;4614">#4614</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2020-03-29</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Textual updates thanks to Kevin Buckley.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision="systemd">
+      <para>2020-03-19</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to systemd-245. Fixes
+          <ulink url="&lfs-ticket-root;4593">#4593</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem revision="systemd">
+      <para>2020-03-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Make minor modifications to the kernel configuration
+          in order to match the configuration options to there current positions
+          in Linux-5.5</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2020-03-29</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index eacd16f22..30051598e 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -35,9 +35,9 @@
     <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Automake-&automake-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
@@ -68,9 +68,9 @@
     <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
     </listitem>-->
@@ -149,9 +149,9 @@
     <listitem>
       <para>Libcap-&libcap-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Libffi-&libffi-version;</para>
     </listitem>-->
@@ -194,15 +194,15 @@
     <!--<listitem>
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Openssl-&openssl-version;</para>
-    </listitem>-->
+    </listitem>
     <!-- <listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Perl-&perl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Pkg-config-&pkgconfig-version;</para>
     </listitem>-->
@@ -248,15 +248,15 @@
     <!--<listitem>
       <para>Util-Linux-&util-linux-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Vim-&vim-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>XZ-Utils-&xz-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Zlib-&zlib-version;</para>
     </listitem>-->
diff --git a/chapter03/packages.xml b/chapter03/packages.xml
index bf121f425..a3846adbe 100644
--- a/chapter03/packages.xml
+++ b/chapter03/packages.xml
@@ -446,7 +446,8 @@
         <note>
           <para>The Linux kernel is updated relatively often, many times due to
           discoveries of security vulnerabilities.  The latest available
-          &linux-major-version;.&linux-minor-version;.x kernel version should be
+          <!--&linux-major-version;.&linux-minor-version;.x--> stable kernel 
+          version <!--should--> may be
           used, unless the errata page says otherwise.</para>
 
           <para>For users with limited speed or expensive bandwidth who wish to
diff --git a/chapter06/automake.xml b/chapter06/automake.xml
index 34c6d6d21..411f096c4 100644
--- a/chapter06/automake.xml
+++ b/chapter06/automake.xml
@@ -67,7 +67,7 @@
 
 
     <para>One test is known to fail in the LFS environment:
-    subobj.sh.</para>
+    tags-lisp-space.sh.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 039fb96fd..fa5783d32 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -88,19 +88,24 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tar.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="texinfo.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="vim.xml"/>
+
   <!-- systemd only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dbus.xml"/>
 
-  <!-- these programs will use libsystemd if available -->
+  <!-- Both sysv on systemd builds -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
+
+  <!-- sysv only -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
+
+  <!-- Both sysv and systemd builds -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
 
   <!-- sysv only -->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysklogd.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="eudev.xml"/>
 
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="linux-firmware.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
diff --git a/general.ent b/general.ent
index 99ec601f1..f78947cec 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200329">
+<!ENTITY version         "SVN-20200401">
 <!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        "20200329-systemd">
+<!ENTITY versiond        "20200401-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "March 29th, 2020">
+<!ENTITY releasedate     "April 1st, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 
diff --git a/packages.ent b/packages.ent
index de7913eed..7d976f38b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -31,11 +31,11 @@
 <!ENTITY autoconf-ch6-sbu-tests "3.2">
 <!ENTITY autoconf-ch6-sbu "less than 0.1 SBU (about &autoconf-ch6-sbu-tests; SBU with tests)">
 
-<!ENTITY automake-version "1.16.1">
+<!ENTITY automake-version "1.16.2">
 <!ENTITY am-minor-version "1.16">
-<!ENTITY automake-size "1,499 KB">
+<!ENTITY automake-size "1,510 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "53f38e7591fa57c3d2cee682be668e5b">
+<!ENTITY automake-md5 "6cb234c86f3f984df29ce758e6d0d1d7">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-ch6-du "107 MB">
 <!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 8.1 SBU with tests)">
@@ -144,18 +144,18 @@
 <!ENTITY diffutils-ch6-du "36 MB">
 <!ENTITY diffutils-ch6-sbu "0.4 SBU">
 
-<!ENTITY e2fsprogs-version "1.45.5">
+<!ENTITY e2fsprogs-version "1.45.6">
 <!ENTITY e2fsprogs-size "7,753 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "6d35428e4ce960cb7e875afe5849c0f3">
+<!ENTITY e2fsprogs-md5 "cccfb706d162514e4f9dbfbc9e5d65ee">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-ch6-du "108 MB">
 <!ENTITY e2fsprogs-ch6-sbu "1.6 SBU">
 
-<!ENTITY elfutils-version "0.178">
-<!ENTITY elfutils-size "8,797 KB">
+<!ENTITY elfutils-version "0.179">
+<!ENTITY elfutils-size "8,846 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
-<!ENTITY elfutils-md5 "5480d0b7174446aba13a6adde107287f">
+<!ENTITY elfutils-md5 "8ee56b371b5a7ea081284c44e5164600">
 <!ENTITY elfutils-home "https://sourceware.org/ftp/elfutils/">
 <!ENTITY elfutils-ch6-du "124 MB">
 <!ENTITY elfutils-ch6-sbu "0.9 SBU">
@@ -495,10 +495,10 @@
 <!ENTITY man-pages-ch6-du "31 MB">
 <!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.53.2">
-<!ENTITY meson-size "1,522 KB">
+<!ENTITY meson-version "0.54.0">
+<!ENTITY meson-size "1,645 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "80303535995fcae72bdb887df102b421">
+<!ENTITY meson-md5 "4968f07219c6bb4df2f83b12b94fe485">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-ch6-du "31 MB">
 <!ENTITY meson-ch6-sbu "less than 0.1 SBU">
@@ -537,10 +537,10 @@
 <!ENTITY ninja-ch6-du "89 MB">
 <!ENTITY ninja-ch6-sbu "0.3 SBU">
 
-<!ENTITY openssl-version "1.1.1d">
-<!ENTITY openssl-size "8,639 KB">
+<!ENTITY openssl-version "1.1.1f">
+<!ENTITY openssl-size "9,564 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "3be209000dbc7e1b95bcdf47980a3baa">
+<!ENTITY openssl-md5 "3f486f2f4435ef14b81814dbbc7b48bb">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-ch6-du "146 MB">
 <!ENTITY openssl-ch6-sbu "2.1 SBU">
@@ -555,10 +555,10 @@
 <!ENTITY patch-ch6-du "13 MB">
 <!ENTITY patch-ch6-sbu "0.2 SBU">
 
-<!ENTITY perl-version "5.30.1">
-<!ENTITY perl-size "12,078 KB">
+<!ENTITY perl-version "5.30.2">
+<!ENTITY perl-size "12,084 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "f399f3aaee90ddcff5eadd3bccdaacc0">
+<!ENTITY perl-md5 "4bfa12b528522a50de0470b8b70b9b3b">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-ch5-du "275 MB">
 <!ENTITY perl-ch5-sbu "1.5 SBU">
@@ -716,13 +716,13 @@
 <!ENTITY util-linux-ch6-du "289 MB">
 <!ENTITY util-linux-ch6-sbu "1.1 SBU">
 
-<!ENTITY vim-version "8.2.0190">
+<!ENTITY vim-version "8.2.0486">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "14,406 KB">
+<!ENTITY vim-size "14,532 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 "f5337b1170df90e644a636539a0313a3">
+<!ENTITY vim-md5 "b1b26d5b7ec294186702fb982b6d226c">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-ch6-du "202 MB">
 <!ENTITY vim-ch6-sbu "1.7 SBU">
@@ -735,10 +735,10 @@
 <!ENTITY xml-parser-ch6-du "2.4 MB">
 <!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY xz-version "5.2.4">
-<!ENTITY xz-size "1030 KB">
+<!ENTITY xz-version "5.2.5">
+<!ENTITY xz-size "1,122 KB">
 <!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "003e4d0b1b1899fc6e3000b24feddf7c">
+<!ENTITY xz-md5 "aa1621ec7013a19abab52a8aff04fe5b">
 <!ENTITY xz-home "https://tukaani.org/xz">
 <!ENTITY xz-ch5-du "18 MB">
 <!ENTITY xz-ch5-sbu "0.2 SBU">