From 7756de365c28daa06887016b8ee0a151aac6706a Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Wed, 2 Mar 2022 21:20:22 +0800
Subject: [PATCH 1/3] remove all "what's new" entries after release

---
 chapter01/whatsnew.xml | 194 +++++++++++++++++++----------------------
 1 file changed, 91 insertions(+), 103 deletions(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 817e3e4c8..f4f4be90c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -39,30 +39,30 @@
     <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Automake-&automake-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Bash &bash-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Bc &bc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Bison-&bison-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Bzip2-&bzip2-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Check-&check-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Coreutils-&coreutils-version;</para>
-    </listitem>
+    </listitem>-->
    <!--<listitem>
       <para>DejaGNU-&dejagnu-version;</para>
     </listitem>-->
@@ -72,142 +72,142 @@
    <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
-    </listitem>
-    <listitem revision="sysv">
+    </listitem>-->
+    <!--<listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
        <para>Expat-&expat-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
        <para>Expect-&expect-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
        <para>File-&file-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Findutils-&findutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Flex-&flex-version;</para>
     </listitem>-->
-    <listitem>
-      <para>Gawk-&gawk-version;</para>
-    </listitem>
     <!--<listitem>
+      <para>Gawk-&gawk-version;</para>
+    </listitem>-->
+   <!--<listitem>
        <para>GCC-&gcc-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
        <para>GDBM-&gdbm-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>GMP-&gmp-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <!--<listitem>
+   <!--<listitem>
       <para>Grep-&grep-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Groff-&groff-version;</para>
     </listitem>-->
-    <!--<listitem>
+   <!--<listitem>
       <para>GRUB-&grub-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Gzip-&gzip-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>IANA-Etc-&iana-etc-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Inetutils-&inetutils-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>IPRoute2-&iproute2-version;</para>
-    </listitem>
-    <listitem revision="systemd">
+    </listitem>-->
+    <!--<listitem revision="systemd">
       <para>Jinja2-&jinja2-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Kbd-&kbd-version;</para>
     </listitem>-->
-    <!--<listitem>
+   <!--<listitem>
       <para>Kmod-&kmod-version;</para>
     </listitem>-->
-    <!--<listitem>
+   <!--<listitem>
       <para>Less-&less-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Libcap-&libcap-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
-    </listitem>
-    <!--<listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Libffi-&libffi-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Libpipeline-&libpipeline-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>
-    <!--<listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Make-&make-version;</para>
     </listitem>-->
-    <listitem>
-      <para>Man-DB-&man-db-version;</para>
-    </listitem>
     <!--<listitem>
+      <para>Man-DB-&man-db-version;</para>
+    </listitem>-->
+   <!--<listitem>
       <para>Man-pages-&man-pages-version;</para>
     </listitem>-->
     <!--<listitem revision="systemd">
       <para>MarkupSafe-&markupsafe-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Meson-&meson-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>MPFR-&mpfr-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Ncurses-&ncurses-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Openssl-&openssl-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
-    <!--<listitem>
+   <!--<listitem>
       <para>Perl-&perl-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -219,45 +219,45 @@
     <!--<listitem>
       <para>Psmisc-&psmisc-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Python-&python-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+    <!--<listitem>
       <para>Readline-&readline-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Sed-&sed-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Shadow-&shadow-version;</para>
-    </listitem>
-    <!--<listitem revision="sysv">
+    </listitem>-->
+   <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-    <listitem revision="systemd">
+   <!--<listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
-    </listitem>
-    <listitem revision="sysv">
+    </listitem>-->
+   <!--<listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>Tar-&tar-version;</para>
     </listitem>-->
-    <listitem>
-      <para>Tcl-&tcl-version;</para>
-    </listitem>
     <!--<listitem>
+      <para>Tcl-&tcl-version;</para>
+    </listitem>-->
+   <!--<listitem>
       <para>Texinfo-&texinfo-version;</para>
     </listitem>-->
-    <listitem>
+    <!--<listitem>
       <para>Tzdata-&tzdata-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Util-Linux-&util-linux-version;</para>
-    </listitem>
-    <listitem>
+    </listitem>-->
+   <!--<listitem>
       <para>Vim-&vim-version;</para>
-    </listitem>
+    </listitem>-->
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
@@ -267,9 +267,9 @@
     <!--<listitem>
       <para>Zlib-&zlib-version;</para>
     </listitem>-->
-    <listitem>
+   <!--<listitem>
       <para>Zstd-&zstd-version;</para>
-    </listitem>
+    </listitem>-->
   </itemizedlist>
 
   <!--<itemizedlist>
@@ -284,25 +284,13 @@
   <itemizedlist>
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
-    <listitem>
-       <para>binutils-2.38-lto_fix-1.patch</para>
-    </listitem>
-    <listitem>
-       <para>coreutils-9.0-chmod_fix-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>file-5.40-upstream_fixes-1.patch</para>
-    </listitem>
-    <listitem>
-      <para>shadow-4.10-useradd_segfault-1.patch</para>
-    </listitem>
-    <listitem revision="sysv">
-      <para>sysvinit-3.01-consolidated-1.patch</para>
-    </listitem>
-    <listitem revision="systemd">
-      <para>systemd-250-upstream_fixes-1.patch</para>
-    </listitem>
     <!--
+    <listitem>
+      <para>binutils-2.37-upstream_fix-1.patch</para>
+    </listitem>
+    <listitem>
+      <para>gcc-11.1.0-upstream_fixes-1.patch</para>
+    </listitem>
     <listitem revision="systemd">
       <para>MarkupSafe-&markupsafe-version;</para>
     </listitem>

From 3522efe0467d292d69b3aef217407291dd11c068 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Thu, 3 Mar 2022 00:33:44 +0800
Subject: [PATCH 2/3] package updates

* Update to meson-0.61.2.
* Update to linux-5.16.12.
* Update to MarkupSafe-2.1.0.
* Update to dbus-1.14.0.
* Update to vim-8.2.4489.
---
 chapter01/changelog.xml | 20 ++++++++++++++++++++
 chapter01/whatsnew.xml  | 26 ++++++++++----------------
 chapter08/meson.xml     |  2 +-
 packages.ent            | 36 ++++++++++++++++++------------------
 4 files changed, 49 insertions(+), 35 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index c25f61d13..cce1eb603 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,26 @@
     <listitem>
       <para>2022-03-02</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to meson-0.61.2. Fixes
+          <ulink url="&lfs-ticket-root;5013">#5013</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-5.16.12. Fixes
+          <ulink url="&lfs-ticket-root;5014">#5014</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to MarkupSafe-2.1.0. Fixes
+          <ulink url="&lfs-ticket-root;5015">#5015</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to dbus-1.14.0. Fixes
+          <ulink url="&lfs-ticket-root;5017">#5017</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to vim-8.2.4489 (security fixes).
+          Addresses <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Build libstdc++ in GCC pass 2, and remove the
           seperate libstdc++ pass 2.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f4f4be90c..2f737c16f 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -66,9 +66,9 @@
    <!--<listitem>
       <para>DejaGNU-&dejagnu-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
-    </listitem>-->
+    </listitem>
    <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
@@ -168,9 +168,9 @@
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <listitem>
       <para>Linux-&linux-version;</para>
-    </listitem>-->
+    </listitem>
    <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
@@ -183,12 +183,12 @@
    <!--<listitem>
       <para>Man-pages-&man-pages-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>MarkupSafe-&markupsafe-version;</para>
-    </listitem>-->
-   <!--<listitem>
+    </listitem>
+    <listitem>
       <para>Meson-&meson-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>MPC-&mpc-version;</para>
     </listitem>-->
@@ -255,9 +255,9 @@
    <!--<listitem>
       <para>Util-Linux-&util-linux-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <listitem>
       <para>Vim-&vim-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>XML-Parser-&xml-parser-version;</para>
     </listitem>-->
@@ -291,12 +291,6 @@
     <listitem>
       <para>gcc-11.1.0-upstream_fixes-1.patch</para>
     </listitem>
-    <listitem revision="systemd">
-      <para>MarkupSafe-&markupsafe-version;</para>
-    </listitem>
-    <listitem revision="systemd">
-      <para>Jinja2-&jinja2-version;</para>
-    </listitem>
     -->
   </itemizedlist>
 
diff --git a/chapter08/meson.xml b/chapter08/meson.xml
index 36d787185..ffd4153b0 100644
--- a/chapter08/meson.xml
+++ b/chapter08/meson.xml
@@ -56,7 +56,7 @@
 
 <screen><userinput remap="make">python3 setup.py build</userinput></screen>
 
-    <para>This package does not come with a test suite.</para>
+    <para>The test suite requires some packages out of the scope of LFS.</para>
 
     <para>Install the package:</para>
 
diff --git a/packages.ent b/packages.ent
index e20364803..6215f2586 100644
--- a/packages.ent
+++ b/packages.ent
@@ -114,10 +114,10 @@
 <!ENTITY coreutils-fin-du "153 MB">
 <!ENTITY coreutils-fin-sbu "2.6 SBU">
 
-<!ENTITY dbus-version "1.12.20">
-<!ENTITY dbus-size "2,048 KB">
-<!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.gz">
-<!ENTITY dbus-md5 "dfe8a71f412e0b53be26ed4fbfdc91c4">
+<!ENTITY dbus-version "1.14.0">
+<!ENTITY dbus-size "1,332 KB">
+<!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
+<!ENTITY dbus-md5 "ddd5570aff05191dbee8e42d751f1b7d">
 <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-fin-du "18 MB">
 <!ENTITY dbus-fin-sbu "0.1 SBU">
@@ -427,12 +427,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "16">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-patch-version "12">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "124,577 KB">
+<!ENTITY linux-size "124,572 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "4d6a704bf3e249ef6189b6f17457084b">
+<!ENTITY linux-md5 "e859941968400c4437bd62b4fe39b7b7">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 5.13.4 / gcc-11.1.0 on x86_64 : minimum is
  allnoconfig rounded down to allow for ongoing cleanups,
@@ -482,21 +482,21 @@
 <!ENTITY man-pages-fin-du "33 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY markupsafe-version "2.0.1">
+<!ENTITY markupsafe-version "2.1.0">
 <!ENTITY markupsafe-size "20 KB">
 <!ENTITY markupsafe-url "https://files.pythonhosted.org/packages/source/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
-<!ENTITY markupsafe-md5 "892e0fefa3c488387e5cc0cad2daa523">
-<!ENTITY markupsafe-home "https://markupsafe.palletsprojects.com/en/2.0.x/">
+<!ENTITY markupsafe-md5 "1c3ef96104e89fc64f90e48194a4f154">
+<!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
 <!ENTITY markupsafe-fin-du "520 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.61.1">
-<!ENTITY meson-size "1,963 KB">
+<!ENTITY meson-version "0.61.2">
+<!ENTITY meson-size "1,968 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "8ed66d5537275df3defffb66d1fb897f">
+<!ENTITY meson-md5 "7c4220066c70057b4c5a997a47ac710c">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "41 MB">
-<!ENTITY meson-fin-sbu "less than 0.1 SBU">
+<!ENTITY meson-fin-sbu "less than 0.1 SBU (about 1.8 SBU with tests)">
 
 <!ENTITY mpc-version "1.2.1">
 <!ENTITY mpc-size "820 KB">
@@ -720,13 +720,13 @@
 <!ENTITY util-linux-fin-du "261 MB">
 <!ENTITY util-linux-fin-sbu "1.1 SBU">
 
-<!ENTITY vim-version "8.2.4383">
+<!ENTITY vim-version "8.2.4489">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "15,622 KB">
+<!ENTITY vim-size "10,380 KB">
 <!--<!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">-->
-<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">
-<!ENTITY vim-md5 "3168ff48e382a1201bd0cbd0209bd3e0">
+<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.xz">
+<!ENTITY vim-md5 "41e97917fc46d044ffe951c197509efe">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "206 MB">
 <!ENTITY vim-fin-sbu "2.4 SBU">

From 7c05ea2a4fb165a36f150b34c55938cdb98e8d95 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@mengyan1223.wang>
Date: Thu, 3 Mar 2022 00:36:24 +0800
Subject: [PATCH 3/3] remove outdated cross-chap5 announcement in what's new

It should have been removed in 10.1, and in 11.0 there should have been
"the version of LFS has switched to a merged-/usr layout".  But we just
forgot to update this all the time :).
---
 chapter01/whatsnew.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 2f737c16f..fe9b3b278 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -11,10 +11,6 @@
 
   <title>What's new since the last release</title>
 
-  <para>In this version of LFS, there has been a major reorganization
-  of the book using techniques that avoid changing the host system
-  and provides a more straight forward build process.</para>
-
   <para>Below is a list of package updates made since the previous
   release of the book.</para>