From 3553330f6f9492846fdf977909adb6f6d1cc9dff Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Mon, 23 Jul 2018 22:18:57 +0000
Subject: Update to systemd-239

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11440 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml |  9 +++++++++
 chapter06/systemd.xml   | 11 ++++++-----
 general.ent             |  6 +++---
 packages.ent            | 10 +++++-----
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 5e6c524d9..4710e50be 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,15 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
 -->
+    <listitem revision="systemd">
+      <para>2018-07-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Update to systemd-239. Fixes
+          <ulink url="&lfs-ticket-root;4298">#4298</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>2018-07-18</para>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index 0cc153b36..2c913e325 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -50,15 +50,16 @@
 
     <para>Remove tests that cannot be built in chroot:</para>
 
-<screen><userinput remap="pre">sed '171,$ d' -i src/resolve/meson.build</userinput></screen>
+<screen><userinput remap="pre">sed '166,$ d' -i src/resolve/meson.build</userinput></screen>
 
 <!-- These are from upstream.  There will probably be a new release shortly, 
-     so don't bother with a patch. -->
+     so don't bother with a patch.
     <para>Make some fixes from upstream:</para>
 
 <screen><userinput remap="pre">sed -i '527,565 d'                  src/basic/missing.h
 sed -i '24 d'                       src/core/load-fragment.c
 sed -i '53 a#include &lt;sys/mount.h&gt;' src/shared/bus-unit-util.c</userinput></screen>
+-->
 
     <para>Remove an unneeded group,
     <systemitem class="groupname">render</systemitem>, from the default udev
@@ -185,7 +186,7 @@ meson --prefix=/usr                \
 
     <para>Remove an unnecessary directory:</para>
 
-<screen><userinput remap="install">rm -rfv /usr/lib/rpm</userinput></screen>
+<screen><userinput remap="install">rm -rfv /usr/lib/rpm
 <!--
     <para>Create the Sysvinit compatibility symlinks, so systemd is used
     as the default init system:</para>
@@ -197,7 +198,7 @@ ln -sfv ../lib/systemd/systemd /sbin/init</userinput></screen>
 
     <para>Remove our earlier created symlink for xsltproc:</para>
 -->
-<screen><userinput remap="install">rm -f /usr/bin/xsltproc</userinput></screen>
+rm -f /usr/bin/xsltproc</userinput></screen>
 
     <para>Create the <filename>/etc/machine-id</filename> file needed by
     <command>systemd-journald</command>:</para>
@@ -277,7 +278,7 @@ chmod 755 /lib/systemd/systemd-user-sessions</userinput></screen>
       <varlistentry id="coredumpctl">
         <term><command>coredumpctl</command></term>
         <listitem>
-          <para>Used to retrieve coredumps from the systemd Journal</para>
+          <para>Used to retrieve coredumps from the systemd journal</para>
           <indexterm zone="ch-system-systemd coredumpctl">
             <primary sortas="b-coredumpctl">coredumpctl</primary>
           </indexterm>
diff --git a/general.ent b/general.ent
index 301b8d793..9b0bd0d1f 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20180718">
+<!ENTITY version         "SVN-20180723">
 <!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        "20180718-systemd">
+<!ENTITY versiond        "20180723-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "July 18, 2018">
+<!ENTITY releasedate     "July 23, 2018">
 
 <!ENTITY copyrightdate   "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "8.3">
diff --git a/packages.ent b/packages.ent
index 88d9b6bef..5dffcc955 100644
--- a/packages.ent
+++ b/packages.ent
@@ -613,14 +613,14 @@
 <!ENTITY sysklogd-ch6-du "0.7 MB">
 <!ENTITY sysklogd-ch6-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "238">
-<!ENTITY systemd-size     "6,792 KB">
+<!ENTITY systemd-version  "239">
+<!ENTITY systemd-size     "6,992 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
-<!ENTITY systemd-md5      "76db8004647283b779234364cd637d3c">
+<!ENTITY systemd-md5      "6137e3f50390391cf34521d071a1a078">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
-<!ENTITY systemd-man-size "337 KB">
+<!ENTITY systemd-man-size "356 KB">
 <!ENTITY systemd-man-url  "&anduin-sources;/systemd-man-pages-&systemd-version;.tar.xz">
-<!ENTITY systemd-man-md5  "2e3f795bc0818e161c03b8cae9c99e80">
+<!ENTITY systemd-man-md5  "b3be99a8fff33c773f034151b16eb1b8">
 <!ENTITY systemd-ch6-du   "297 MB">
 <!ENTITY systemd-ch6-sbu  "1.1 SBU">
 
-- 
cgit v1.2.3-54-g00ecf