From cb89eec135c24026f19b8d0c2bae2e7f8db4a337 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 25 Sep 2023 14:10:12 +0800
Subject: [PATCH 1/3] glibc: Update upstream fixes patch to plug a memory leak

The CVE-2023-4806 fix unintentionally caused a memory leak, now update
the patch to include the fix for the leak.
---
 chapter01/changelog.xml | 10 ++++++++++
 patches.ent             |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ca85137f6..0a028e966 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,16 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2023-09-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update Glibc upstream fixes patch to plug a
+          memory leak introduced by the security fix.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-09-17</para>
       <itemizedlist>
diff --git a/patches.ent b/patches.ent
index 6634d1f2f..3677f3e66 100644
--- a/patches.ent
+++ b/patches.ent
@@ -14,9 +14,9 @@
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
 
-<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
-<!ENTITY glibc-upstream-fixes-patch-md5 "2e347e291804b62a18a43a8cdc79e01e">
-<!ENTITY glibc-upstream-fixes-patch-size "24 KB">
+<!ENTITY glibc-upstream-fixes-patch "glibc-&glibc-version;-upstream_fixes-2.patch">
+<!ENTITY glibc-upstream-fixes-patch-md5 "a5a06adb7f61dcc901f35d810ac8a1c0">
+<!ENTITY glibc-upstream-fixes-patch-size "28 KB">
 
 <!ENTITY grub-upstream-fixes-patch "grub-&grub-version;-upstream_fixes-1.patch">
 <!ENTITY grub-upstream-fixes-patch-md5 "da388905710bb4cbfbc7bd7346ff9174">

From c873f0a1b3dadc40f74eec1e50fab046c6479afd Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 25 Sep 2023 14:12:54 +0800
Subject: [PATCH 2/3] changelog: Fix a date

---
 chapter01/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0a028e966..448611067 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -41,7 +41,7 @@
     -->
 
     <listitem>
-      <para>2023-09-16</para>
+      <para>2023-09-24</para>
       <itemizedlist>
         <listitem>
           <para>[xry111] - Update Glibc upstream fixes patch to plug a

From 96f7f5ed58947bee58cae884d299df0a324d5034 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Mon, 25 Sep 2023 14:46:25 +0200
Subject: [PATCH 3/3] Remove textual description of an arg no loger in
 instructions

---
 chapter06/coreutils.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/chapter06/coreutils.xml b/chapter06/coreutils.xml
index 185f4a0c4..f6b6c6310 100644
--- a/chapter06/coreutils.xml
+++ b/chapter06/coreutils.xml
@@ -63,13 +63,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><envar>gl_cv_macro_MB_CUR_MAX_good=y</envar></term>
-        <listitem>
-          <para>This is needed to work around an issue in the gnulib copy
-          shipped by the package which would break cross compilation.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>