MultiLib: Merge changes from trunk

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

7 files changed, 56 insertions, 18 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index dd08235a0..b0c1e8ee9 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -45,6 +45,16 @@
     appropriate for the entry or if needed the entire day's 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>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 399786ce4..eacd16f22 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -227,9 +227,9 @@
     <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>-->
diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml
index 7d148d5ce..bb4bffc76 100644
--- a/chapter06/dbus.xml
+++ b/chapter06/dbus.xml
@@ -96,6 +96,11 @@ ln -sfv ../../lib/$(readlink /usr/lib/libdbus-1.so) /usr/lib/libdbus-1.so</useri
 
 <screen><userinput remap="install">ln -sfv /etc/machine-id /var/lib/dbus</userinput></screen>
 
+    <para>Move the socket file to /run instead of the deprecated
+    /var/run:</para>
+
+ <screen><userinput remap="install">sed -i 's:/var/run:/run:' /lib/systemd/system/dbus.socket</userinput></screen>
+
   </sect2>
 
   <sect2 id="contents-dbus" role="content">
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 7c6cd584d..6bd7f2893 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -63,7 +63,7 @@ done</userinput></screen>
 
     <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 '179,$ d' -i src/resolve/meson.build</userinput></screen>
 
     <para>Remove an unneeded group,
     <systemitem class="groupname">render</systemitem>, from the default udev
@@ -97,6 +97,8 @@ meson --prefix=/usr                \
       -Dumount-path=/bin/umount    \
       -Db_lto=false                \
       -Drpmmacrosdir=no            \
+      -Dhomed=false                \
+      -Duserdb=false               \
       ..</userinput></screen>
 
     <variablelist>
@@ -182,6 +184,15 @@ meson --prefix=/usr                \
           for use with systemd because LFS does not support RPM.</para>
         </listitem>
       </varlistentry>
+
+      <varlistentry>
+        <term><parameter>-D{userdb,homed}=false</parameter></term>
+        <listitem>
+          <para>Remove two daemons that have dependencies that do not fit
+          the scope of LFS.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
     <para>Compile the package:</para>
@@ -216,13 +227,12 @@ meson --prefix=/usr                \
  
 <screen><userinput remap="adjust">systemctl disable systemd-time-wait-sync.service</userinput></screen>
 
-    <!--
     <para>Prevent systemd from resetting the maximum PID value which causes
     some problems with packages and units in BLFS:</para>
-     FCRON in particular
+    
+
+<screen><userinput remap="adjust">rm -f /usr/lib/sysctl.d/50-pid-max.conf</userinput></screen>
 
-<screen><userinput remap="adjust">rm -f /etc/sysctl.d/50-pid-max.conf</userinput></screen>
-    -->
     <para>Cleanup symbolic links to Util-Linux libraries:</para>
 
 <screen><userinput remap="adjust">rm -fv /usr/lib/lib{blkid,uuid,mount}.so*</userinput></screen>
@@ -397,7 +407,7 @@ rm -f /usr/bin/xsltproc</userinput></screen>
         systemd-delta, systemd-detect-virt, systemd-escape, systemd-hwdb,
         systemd-id128, systemd-inhibit, systemd-machine-id-setup,
         systemd-mount, systemd-notify, systemd-nspawn, systemd-path,
-        systemd-resolve (symlink to resolvectl), systemd-run,
+        systemd-repart, systemd-resolve (symlink to resolvectl), systemd-run,
         systemd-socket-activate, systemd-stdio-bridge, systemd-tmpfiles,
         systemd-tty-ask-password-agent, systemd-umount (symlink to
         systemd-mount), telinit (symlink to systemctl), timedatectl, and
@@ -815,6 +825,17 @@ rm -f /usr/bin/xsltproc</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="systemd-repart">
+        <term><command>systemd-repart</command></term>
+        <listitem>
+          <para>Used go grow and add partitions to a partition table when
+          systemd is used in an OS image (e.g. a container).</para>
+          <indexterm zone="ch-system-systemd systemd-repart">
+            <primary sortas="b-systemd-repart">systemd-repart</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="systemd-resolve">
         <term><command>systemd-resolve</command></term>
         <listitem>
diff --git a/general.ent b/general.ent
index f6d4ad829..f8ae867aa 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20200318">
+<!ENTITY version         "SVN-20200319">
 <!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        "20200318-systemd">
+<!ENTITY versiond        "20200319-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "March 18th, 2020">
+<!ENTITY releasedate     "March 19th, 2020">
 
 <!ENTITY copyrightdate   "1999-2020"><!-- jhalfs needs a literal dash, not &ndash; -->
 
diff --git a/lfs-latest.php b/lfs-latest.php
index 3d1c243e3..629ce3192 100644
--- a/lfs-latest.php
+++ b/lfs-latest.php
@@ -16,6 +16,7 @@ $regex[ 'check'    ] = "/^.*Check (\d[\d\.]+\d).*$/";
 $regex[ 'intltool' ] = "/^.*Latest version is (\d[\d\.]+\d).*$/";
 $regex[ 'less'     ] = "/^.*current released version is less-(\d+).*$/";
 $regex[ 'mpfr'     ] = "/^mpfr-([\d\.]+)\.tar.*$/";
+$regex[ 'Python'   ] = "/^.*Latest Python 3.*Python (3[\d\.]+\d).*$/";
 $regex[ 'systemd'  ] = "/^.*v([\d]+)$/";
 //$regex[ 'sysvinit' ] = "/^.*sysvinit-([\d\.]+)dsf\.tar.*$/";
 $regex[ 'tzdata'   ] = "/^.*tzdata([\d]+[a-z]).*$/";
@@ -124,6 +125,7 @@ if ( $package == "ninja"      ) $dirpath = "https://github.com/ninja-build/ninja
 if ( $package == "procps-ng"  ) $dirpath = "https://gitlab.com/procps-ng/procps/-/tags";
 //if ( $package == "psmisc"     ) $dirpath = "http://sourceforge.net/projects/$package/files";
 if ( $package == "psmisc"     ) $dirpath = "https://gitlab.com/psmisc/psmisc/-/tags";
+if ( $package == "Python"     ) $dirpath = "https://www.python.org/downloads/source/";
 if ( $package == "shadow"     ) $dirpath = "https://github.com/shadow-maint/shadow/releases";
 if ( $package == "systemd"    ) $dirpath = "https://github.com/systemd/systemd/releases";
 if ( $package == "tcl"        ) $dirpath = "http://sourceforge.net/projects/tcl/files";
diff --git a/packages.ent b/packages.ent
index 6bce75c77..de7913eed 100644
--- a/packages.ent
+++ b/packages.ent
@@ -640,21 +640,21 @@
 <!ENTITY sysklogd-ch6-du "0.6 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "244">
+<!ENTITY systemd-version  "245">
 <!--<!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     "8,252 KB">
+<!ENTITY systemd-size     "8,784 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      "413121fe918b252ae62310f6fc7c4b32">
+<!ENTITY systemd-md5      "04f02d9841ea5992a16f6b03c873da28">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-size "508 KB">
+<!ENTITY systemd-man-size "512 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  "1839ad557eb376d22853cac54d00de77">
-<!ENTITY systemd-ch6-du   "238 MB">
-<!ENTITY systemd-ch6-sbu  "0.6 SBU">
+<!ENTITY systemd-man-md5  "ecf8cc4baa33b91ad4212d28e88f8edd">
+<!ENTITY systemd-ch6-du   "176 MB">
+<!ENTITY systemd-ch6-sbu  "1.9 SBU">
 
 <!ENTITY sysvinit-version "2.96">
 <!ENTITY sysvinit-size "120 KB">