MultiLib: Merge changes from trunk

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

6 files changed, 32 insertions, 12 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index f1b99c29a..0e0d47037 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -44,6 +44,26 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem revision="systemd">
+      <para>2019-06-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to dbus-1.12.16. Fixes
+          <ulink url="&lfs-ticket-root;4470">#4470</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2019-06-08</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - make it so that the instructions for removing 
+          symlinks before building Util-Linux in Chapter 6 are only visible 
+          in systemd.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2019-06-03</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f2b1f23dd..04730ddd9 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -62,9 +62,9 @@
     <!--<listitem>
       <para>DejaGNU-&dejagnu-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
diff --git a/chapter06/gcc.xml b/chapter06/gcc.xml
index f48cde6e0..fd32ff492 100644
--- a/chapter06/gcc.xml
+++ b/chapter06/gcc.xml
@@ -165,14 +165,14 @@ su nobody -s /bin/bash -c "PATH=$PATH make -k check"</userinput></screen>
     Unless the test results are vastly different from those at the above URL,
     it is safe to continue.</para>
 
-    <note><para>
+    <!--note><para>
       On some combinations of kernel configuration and AMD processors
       there may be more than 1100 failures in the gcc.target/i386/mpx
       tests (which are designed to test the MPX option on recent
       Intel processors). These can safely be ignored on AMD
       processors. These tests will also fail on Intel processors if MPX support
       is not enabled in the kernel even though it is present on the CPU.
-    </para></note>
+    </para></note-->
 
     <para>Install the package:</para>
 
diff --git a/chapter06/util-linux.xml b/chapter06/util-linux.xml
index 454fc3aad..0c2f00435 100644
--- a/chapter06/util-linux.xml
+++ b/chapter06/util-linux.xml
@@ -60,9 +60,9 @@
 <screen><userinput remap="pre">sed -e 's/2^64/(2^64/' -e 's/E &lt;/E) &lt;=/' -e 's/ne /eq /' \
     -i tests/ts/ipcs/limits2</userinput></screen>
 -->
-    <para>Remove the earlier created symlinks:</para>
+    <para revision="systemd">Remove the earlier created symlinks:</para>
 
-<screen><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen>
+<screen revision="systemd"><userinput remap="pre">rm -vf /usr/include/{blkid,libmount,uuid}</userinput></screen>
 
     <para>Prepare Util-linux for compilation:</para>
 
diff --git a/general.ent b/general.ent
index e041d0940..163205c49 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20190603">
+<!ENTITY version         "SVN-20190612">
 <!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        "20190603-systemd">
+<!ENTITY versiond        "20190612-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "June 3, 2019">
+<!ENTITY releasedate     "June 12, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.5">
diff --git a/packages.ent b/packages.ent
index 9db2a8fcf..be4e95a87 100644
--- a/packages.ent
+++ b/packages.ent
@@ -118,10 +118,10 @@
 <!ENTITY coreutils-ch6-du "190 MB">
 <!ENTITY coreutils-ch6-sbu "2.6 SBU">
 
-<!ENTITY dbus-version "1.12.12">
-<!ENTITY dbus-size "2,029 KB">
+<!ENTITY dbus-version "1.12.16">
+<!ENTITY dbus-size "2,048 KB">
 <!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "ea11069521beeee4e47f0086596a43c8">
+<!ENTITY dbus-md5 "2dbeae80dfc9e3632320c6a53d5e8890">
 <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-ch6-du "18 MB">
 <!ENTITY dbus-ch6-sbu "0.2 SBU">