Merge branch 'trunk' into xry111/clfs-ng

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>

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>
 

packages.ent

@@ -488,10 +488,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">