From 1ede364c18db71e4f2e56acc4c249177185aba34 Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Thu, 19 Dec 2019 16:20:07 +0000
Subject: [PATCH] elogind-241.4

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22487 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/sysutils/elogind.xml       | 17 +++++++++++++----
 introduction/welcome/changelog.xml | 10 ++++++++++
 packages.ent                       |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/general/sysutils/elogind.xml b/general/sysutils/elogind.xml
index a7015ac9ae..f2da572f20 100644
--- a/general/sysutils/elogind.xml
+++ b/general/sysutils/elogind.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY elogind-download-http "https://github.com/elogind/elogind/archive/v&elogind-version;/elogind-&elogind-version;.tar.gz">
   <!ENTITY elogind-download-ftp  " ">
-  <!ENTITY elogind-md5sum        "dbfebba271609fb5ea63073e2999466e">
+  <!ENTITY elogind-md5sum        "fb5ba9da1115d68d2b6cdbcd10167b7d">
   <!ENTITY elogind-size          "1.3 MB">
-  <!ENTITY elogind-buildsize     "47 MB">
-  <!ENTITY elogind-time          "0.2 SBU">
+  <!ENTITY elogind-buildsize     "56 MB">
+  <!ENTITY elogind-time          "0.4 SBU (NINJAJOBS=1)">
 ]>
 
 <sect1 id="elogind" revision="sysv" xreflabel="elogind-&elogind-version;">
@@ -139,6 +139,14 @@ File systems ---&gt;
   <sect2 role="installation">
     <title>Installation of elogind</title>
 
+    <para>
+      First fix an issue with reading a session file:
+    </para>
+
+<screen><userinput>sed -e '/dirent-util/a #include "env-file.h"'                            \
+    -e '/sessions/{n;n;s/=.*$/= parse_env_file (NULL, p, "UID", \&amp;s);/}' \
+    -i src/basic/cgroup-util.c</userinput></screen>
+
     <para>
       Install <application>elogind</application> by running the following
       commands:
@@ -163,7 +171,7 @@ ninja</userinput></screen>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>ninja install                                         &amp;&amp;
+<screen role="root"><userinput>ninja install                                           &amp;&amp;
 ln -sfv  libelogind.pc /usr/lib/pkgconfig/libsystemd.pc &amp;&amp;
 ln -sfvn elogind /usr/include/systemd</userinput></screen>
 
@@ -250,6 +258,7 @@ EOF</userinput></screen>
            libelogind.so
         </seg>
         <seg>
+          /lib/elogind,
           /etc/elogind,
           /usr/include/elogind, and
           /usr/share/doc/elogind-&elogind-version;
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4158216b8d..6b7c17f34c 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
        -->
+    <listitem>
+      <para>December 19th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to elogind-241.4. Fixes
+          <ulink url="&blfs-ticket-root;12918">#12918</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 17th, 2019</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index f79e6e11a9..047005875c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -271,7 +271,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY cpio-version                 "2.13">
 <!ENTITY cups-pk-helper-version       "0.2.6">
 <!ENTITY dbus-version                 "1.12.16">   <!-- Even minors only -->
-<!ENTITY elogind-version              "241.3">
+<!ENTITY elogind-version              "241.4">
 <!ENTITY blocaled-version             "0.1">
 <!ENTITY eudev-version                "1.7">
 <!ENTITY fcron-version                "3.2.1">