From 87b22cad78cee7d4a4ea9de6c21297d5ecad96a1 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Thu, 7 Nov 2019 01:34:55 +0000
Subject: [PATCH] Fix potential problem with meson-0.52 and systemd-243.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11697 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 10 ++++++++++
 chapter06/systemd.xml   |  2 +-
 general.ent             |  6 +++---
 patches.ent             |  6 +++---
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 7ef6663cd..b220f389b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,16 @@
     <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-11-06</para>
+      <itemizedlist>
+        <listitem>
+          <para>[renodr] - Fix potential infinite loop with meson-0.52
+          and systemd-243.</para>
+        </listitem>
+       </itemizedlist>
+    </listitem>
+
     <listitem revision="sysv">
       <para>2019-10-31</para>
       <itemizedlist>
diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml
index e9e2a9476..0c7e49fdc 100644
--- a/chapter06/systemd.xml
+++ b/chapter06/systemd.xml
@@ -43,7 +43,7 @@
     <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-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../systemd-&systemd-version;-consolidated_fixes-2.patch</userinput></screen>
 
     <para>Create a symlink to work around missing xsltproc:</para>
 
diff --git a/general.ent b/general.ent
index f90d025db..90e2521f2 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version         "SVN-20191101">
+<!ENTITY version         "SVN-20191106">
 <!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        "20191101-systemd">
+<!ENTITY versiond        "20191106-systemd">
 <!ENTITY short-versiond  "systemd">
 <!ENTITY generic-versiond "systemd"> 
 
-<!ENTITY releasedate     "November 1st, 2019">
+<!ENTITY releasedate     "November 6th, 2019">
 
 <!ENTITY copyrightdate   "1999-2019"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone       "9.0">
diff --git a/patches.ent b/patches.ent
index 26ec12446..eb734051e 100644
--- a/patches.ent
+++ b/patches.ent
@@ -57,7 +57,7 @@
 <!ENTITY sysvinit-consolidated-patch-md5 "4900322141d493e74020c9cf437b2cdc">
 <!ENTITY sysvinit-consolidated-patch-size "2.4 KB">
 
-<!ENTITY systemd-consolidated-patch "systemd-&systemd-version;-consolidated_fixes-1.patch">
-<!ENTITY systemd-consolidated-patch-md5 "d1f60dcbd53222eecfc58e4e95ef60ab">
-<!ENTITY systemd-consolidated-patch-size "60 KB">
+<!ENTITY systemd-consolidated-patch "systemd-&systemd-version;-consolidated_fixes-2.patch">
+<!ENTITY systemd-consolidated-patch-md5 "2bad2992f4373eb925885f2ea2fb8d14">
+<!ENTITY systemd-consolidated-patch-size "64 KB">