From d53fefab5a6772fef606392a61608fc290e6a7ae Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Thu, 4 Jun 2020 06:51:00 +0000
Subject: [PATCH] Update to upstream r11895

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/cross-chap5@11896 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 appendices/dependencies.xml | 10 +++++-----
 chapter01/changelog.xml     | 31 +++++++++++++++++++++++++++++++
 chapter03/patches.xml       |  9 +++++++++
 chapter06/libelf.xml        |  2 +-
 chapter06/systemd.xml       | 12 ++++++------
 general.ent                 |  6 +++---
 packages.ent                | 28 ++++++++++++++--------------
 patches.ent                 |  4 ++++
 8 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index ddda9377c..6db31fe4e 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1303,8 +1303,8 @@
         <segtitle>&dependencies;</segtitle>
 
         <seglistitem>
-         <seg>Bash, Bison, Coreutils, Flex, GCC, Glibc, Make,
-         and Linux API Headers</seg>
+         <seg>Bash, Bison, Coreutils, Flex, GCC, Glibc, Make, Libcap,
+         Libelf, and Linux API Headers</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1328,7 +1328,7 @@
         <segtitle>&external;</segtitle>
 
         <seglistitem>
-          <seg>None</seg>
+          <seg>Berkeley DB and Iptables</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1464,7 +1464,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Shadow</seg>
+          <seg>IProute2 and Shadow</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -1499,7 +1499,7 @@
         <segtitle>&before;</segtitle>
 
         <seglistitem>
-          <seg>Linux Kernel</seg>
+          <seg>IProute2 and Linux Kernel</seg>
         </seglistitem>
       </segmentedlist>
 
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 13bced719..b69298da6 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,37 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
+    <listitem>
+      <para>2020-06-03</para>
+      <itemizedlist>
+        <listitem revision="systemd">
+          <para>[renodr] - Fix systemd's build with GCC-10 with a patch instead
+          of CFLAGS.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to perl-5.30.3 (security update). Fixes
+          <ulink url="&lfs-ticket-root;4664">#4664</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[renodr] - Update to dbus-1.12.18 (security update). Fixes
+          <ulink url="&lfs-ticket-root;4665">#4665</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to man-db-2.9.2. Fixes
+          <ulink url="&lfs-ticket-root;4663">#4663</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to libcap-2.36. Fixes
+          <ulink url="&lfs-ticket-root;4666">#4666</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[renodr] - Update to bison-3.6.3. Fixes
+          <ulink url="&lfs-ticket-root;4667">#4667</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2020-05-31</para>
       <itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index bc2418bba..15222e030 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -133,6 +133,15 @@
       </listitem>
     </varlistentry>
 -->
+
+    <varlistentry revision="systemd">
+      <term>Systemd GCC-10 Patch - <token>&systemd-gcc10-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>
+      </listitem>
+    </varlistentry>
+
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter06/libelf.xml b/chapter06/libelf.xml
index 4af178726..b559e6aa2 100644
--- a/chapter06/libelf.xml
+++ b/chapter06/libelf.xml
@@ -56,7 +56,7 @@
     
 <screen><userinput remap="test">make check</userinput></screen>
 
-    <para>One test, run-elfclassify.sh, is known to fail.</para>
+<!--    <para>One test, run-elfclassify.sh, is known to fail.</para>-->
 
     <para>Install only Libelf:</para>
 
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index cbba14a69..2cf2d1d1b 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -39,12 +39,11 @@
 
   <sect2 role="installation">
     <title>Installation of systemd</title>
-<!--
-    <para>First, apply a patch to fix various bugs since the release
-    of systemd-243.</para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-2.patch</userinput></screen>
--->
+    <para>First, apply a patch to fix the build with GCC-10:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-gcc_10-fixes-1.patch</userinput></screen>
+
 
     <para>Create a symlink to work around missing xsltproc:</para>
 
@@ -73,7 +72,6 @@ LANG=en_US.UTF-8                    \
 meson --prefix=/usr                 \
       --sysconfdir=/etc             \
       --localstatedir=/var          \
-      -Dc_args=-Wno-format-overflow \
       -Dblkid=true                  \
       -Dbuildtype=release           \
       -Ddefault-dnssec=no           \
@@ -98,6 +96,7 @@ meson --prefix=/usr                 \
     <variablelist>
       <title>The meaning of the meson options:</title>
 
+<!--
       <varlistentry>
         <term><parameter>-Dc_args=-Wno-format-overflow</parameter></term>
         <listitem>
@@ -107,6 +106,7 @@ meson --prefix=/usr                 \
 	  from occuring.</para>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry>
         <term><parameter>-D*-path=*</parameter></term>
diff --git a/general.ent b/general.ent
index 2e518c356..0ce471efc 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "20200531-cross-chap5">
+<!ENTITY version         "20200603-cross-chap5">
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
 <!ENTITY generic-version "cross-chap5"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
-<!ENTITY versiond        "20200531-cross-cp5-systemd">
+<!ENTITY versiond        "20200603-cross-cp5-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "May 31st, 2020">
+<!ENTITY releasedate     "June 3rd, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 
diff --git a/packages.ent b/packages.ent
index 1bdc09625..8948195ab 100644
--- a/packages.ent
+++ b/packages.ent
@@ -70,10 +70,10 @@
 <!ENTITY binutils-ch6-du "5.1 GB">
 <!ENTITY binutils-ch6-sbu "6.7 SBU">
 
-<!ENTITY bison-version "3.6.2">
-<!ENTITY bison-size "2,411 KB">
+<!ENTITY bison-version "3.6.3">
+<!ENTITY bison-size "2,416 KB">
 <!ENTITY bison-url "&gnu;bison/bison-&bison-version;.tar.xz">
-<!ENTITY bison-md5 "fa5f7c67c523f1d8b2155f55e67f7e1c">
+<!ENTITY bison-md5 "ca0513e77de1de46b9f2419d175cb3b4">
 <!ENTITY bison-home "&gnu-software;bison/">
 <!ENTITY bison-ch5-du "43 MB">
 <!ENTITY bison-ch5-sbu "0.3 SBU">
@@ -118,10 +118,10 @@
 <!ENTITY coreutils-ch6-du "202 MB">
 <!ENTITY coreutils-ch6-sbu "2.3 SBU">
 
-<!ENTITY dbus-version "1.12.16">
+<!ENTITY dbus-version "1.12.18">
 <!ENTITY dbus-size "2,048 KB">
 <!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "2dbeae80dfc9e3632320c6a53d5e8890">
+<!ENTITY dbus-md5 "4ca570c281be35d0b30ab83436712242">
 <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-ch6-du "18 MB">
 <!ENTITY dbus-ch6-sbu "0.2 SBU">
@@ -391,10 +391,10 @@
 <!ENTITY lfs-bootscripts-ch7-du "BOOTSCRIPTS-INSTALL-KB KB"> 
 <!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.34">
-<!ENTITY libcap-size "109 KB">
+<!ENTITY libcap-version "2.36">
+<!ENTITY libcap-size "112 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "66028a8080a0891c54b202bb5e749035">
+<!ENTITY libcap-md5 "3d8cd4a87650cdee130691cb110c2ce2">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-ch6-du "8.5 MB">
 <!ENTITY libcap-ch6-sbu "less than 0.1 SBU">
@@ -463,10 +463,10 @@
 <!ENTITY make-ch6-du "16 MB">
 <!ENTITY make-ch6-sbu "0.5 SBU">
 
-<!ENTITY man-db-version "2.9.1">
-<!ENTITY man-db-size "1,832 KB">
+<!ENTITY man-db-version "2.9.2">
+<!ENTITY man-db-size "1,844 KB">
 <!ENTITY man-db-url "&savannah;/releases/man-db/man-db-&man-db-version;.tar.xz">
-<!ENTITY man-db-md5 "593f4f0a26ab4f66f5b81cf6c0c7364c">
+<!ENTITY man-db-md5 "86c7b99ce5969d9b20bf9aeae8d86e0b">
 <!ENTITY man-db-home "https://www.nongnu.org/man-db/">
 <!ENTITY man-db-ch6-du "40 MB">
 <!ENTITY man-db-ch6-sbu "0.5 SBU">
@@ -539,10 +539,10 @@
 <!ENTITY patch-ch6-du "13 MB">
 <!ENTITY patch-ch6-sbu "0.2 SBU">
 
-<!ENTITY perl-version "5.30.2">
-<!ENTITY perl-size "12,084 KB">
+<!ENTITY perl-version "5.30.3">
+<!ENTITY perl-size "12,088 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "4bfa12b528522a50de0470b8b70b9b3b">
+<!ENTITY perl-md5 "0af2ab0f01ec13e37cc13a27de930936">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-ch5-du "275 MB">
 <!ENTITY perl-ch5-sbu "1.5 SBU">
diff --git a/patches.ent b/patches.ent
index 5f3cf0743..ec1261278 100644
--- a/patches.ent
+++ b/patches.ent
@@ -56,3 +56,7 @@
 <!ENTITY systemd-consolidated-patch-md5 "2bad2992f4373eb925885f2ea2fb8d14">
 <!ENTITY systemd-consolidated-patch-size "64 KB">
 -->
+
+<!ENTITY systemd-gcc10-patch "systemd-&systemd-version;-gcc_10-fixes-1.patch">
+<!ENTITY systemd-gcc10-patch-md5 "6d41186bfcd7002ed2cbf26b25f9091d">
+<!ENTITY systemd-gcc10-patch-size "4 KB">