From 96fa6f25584543a4b237082092fb100f9d78b9d3 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 23 Feb 2022 15:10:03 +0800
Subject: [PATCH 1/3] systemd: trivial indent fix :)

---
 chapter08/systemd.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index 631fc9794..a8f6d379a 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -51,7 +51,7 @@
     rules:</para>
 
  <screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
-        -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
+       -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
 
     <para>Prepare systemd for compilation:</para>
 

From c19371f6f98209b87a93f1c6da58453bd43a5376 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 23 Feb 2022 15:24:53 +0800
Subject: [PATCH 2/3] systemd: remove unneeded command

For systmed-250, systemd-time-wait-sync.service is disabled by
systemctl preset-all.
---
 chapter08/systemd.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index a8f6d379a..22d067ad6 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -195,13 +195,6 @@ meson --prefix=/usr                 \
 
 <screen><userinput remap="adjust">systemctl preset-all</userinput></screen>
 
-    <para>Disable a service that is known to cause problems with systems that
-    use a network configuration other than what is provided by
-    systemd-networkd:</para>
-    <!-- Observed halting startup with dhcpcd handling the primary NIC -->
-
-<screen><userinput remap="adjust">systemctl disable systemd-time-wait-sync.service</userinput></screen>
-
 <!-- dev: 50-pid-max.conf is not removed in BLFS, so I commented the following out.
           If it causes any trouble, we can add this back and also copy it into BLFS -->
 <!--

From ba2dc1b6a71e75615b103963349fbdf2727e3672 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 23 Feb 2022 15:28:21 -0600
Subject: [PATCH 3/3] Update to expat-2.4.6 (security fix)

---
 chapter01/changelog.xml | 14 ++++++++++++++
 packages.ent            |  8 ++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b41e91be0..271405108 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,9 +39,23 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
     <listitem>
       <para>2022-02-15</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to expat-2.4.6 (security fix). Fixes
+          <ulink url="&lfs-ticket-root;5011">#5011</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2022-02-15</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - LFS-11.1-rc1 released.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Add binutils-2.38 LTO patch. Fixes
           <ulink url="&lfs-ticket-root;5011">#5011</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 93382acd6..e20364803 100644
--- a/packages.ent
+++ b/packages.ent
@@ -163,12 +163,12 @@
 <!ENTITY eudev-fin-du "83 MB">
 <!ENTITY eudev-fin-sbu "0.2 SBU">
 
-<!ENTITY expat-version "2.4.4">
-<!ENTITY expat-size "439 KB">
+<!ENTITY expat-version "2.4.6">
+<!ENTITY expat-size "444 KB">
 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
-<!ENTITY expat-md5 "a712d23b7afb32e7527cf0b3fd8f12ac">
+<!ENTITY expat-md5 "22a30c888752fdda9f8dd1b7281c54b0">
 <!ENTITY expat-home "https://libexpat.github.io/">
-<!ENTITY expat-fin-du "13 MB">
+<!ENTITY expat-fin-du "12 MB">
 <!ENTITY expat-fin-sbu "0.1 SBU">
 
 <!ENTITY expect-version "5.45.4">