From ae84037e94014abf3c8607fa4e98716ff6da6a67 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 16 Mar 2022 19:39:06 +0800
Subject: [PATCH 1/2] update to MarkupSafe-2.1.1 (#5025)

---
 chapter01/changelog.xml | 10 ++++++++++
 packages.ent            |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 893484e9a..377738084 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>2022-03-16</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to MarkupSafe-2.1.1. Fixes
+          <ulink url="&lfs-ticket-root;5025">#5025</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-03-15</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index f24e61c75..04e3428b4 100644
--- a/packages.ent
+++ b/packages.ent
@@ -482,10 +482,10 @@
 <!ENTITY man-pages-fin-du "33 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY markupsafe-version "2.1.0">
+<!ENTITY markupsafe-version "2.1.1">
 <!ENTITY markupsafe-size "20 KB">
 <!ENTITY markupsafe-url "https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
-<!ENTITY markupsafe-md5 "1c3ef96104e89fc64f90e48194a4f154">
+<!ENTITY markupsafe-md5 "9809f9fdd98bc835b0c21aa8f79cbf30">
 <!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
 <!ENTITY markupsafe-fin-du "520 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">

From 43149b904b5fb5aecceb9e0e7796ea9f01b223bc Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 16 Mar 2022 19:47:09 +0800
Subject: [PATCH 2/2] markupsafe: mention the suffix "-linux-<arch>" in
 installed directories

---
 chapter08/markupsafe.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/chapter08/markupsafe.xml b/chapter08/markupsafe.xml
index 7e07a112b..32aa9e8b5 100644
--- a/chapter08/markupsafe.xml
+++ b/chapter08/markupsafe.xml
@@ -59,7 +59,10 @@
       <segtitle>Installed directory</segtitle>
 
       <seglistitem>
-        <seg>/usr/lib/python&python-minor;/site-packages/MarkupSafe-&markupsafe-version;-py&python-minor;.egg</seg>
+        <!-- Suffix "-linux-<arch>" is different from meson and jinja:
+             This package contains binary code (compiled from C), but meson
+             and jinja only contain Python code.  -->
+        <seg>/usr/lib/python&python-minor;/site-packages/MarkupSafe-&markupsafe-version;-py&python-minor;-linux-<replaceable>&lt;arch&gt;</replaceable>.egg</seg>
       </seglistitem>
     </segmentedlist>