From d282f88dea360aad595acec9b794618890cdb1eb Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 19 Jan 2024 12:47:33 +0800
Subject: [PATCH 1/8] ncurses: Modify the header to always use the ABI of
 ncursesw

instead of the 8-bit ncurses.

We don't provide the 8-bit ncurses library and we are "faking" it using
ncursesw.  Thus innocent package may be compiled with the 8-bit ABI
(because it does not know what we are doing and so it does not use
the "expected" preprocessor definitions to enable the wide ABI) but
linked against ncursesw, causing a potential ABI mismatch.
---
 chapter01/changelog.xml | 12 ++++++++++++
 chapter06/ncurses.xml   | 21 ++++++++++++++++++++-
 chapter08/ncurses.xml   |  7 ++++++-
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 301e3dff1..4865c68ab 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,18 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-01-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Edit a ncurses header to always use the
+          wide-character ABI compatible with libncursesw.so because we
+          are faking the 8-bit libncurses.so with it.  Fixes
+          <ulink url="&lfs-ticket-root;5415">#5415</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-01-09</para>
       <itemizedlist>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index f25c43777..f491c2c92 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -156,7 +156,9 @@ popd</userinput></screen>
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
+echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so
+sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+    -i $LFS/usr/include/curses.h</userinput></screen>
 <!--
     <para>Remove an unneeded static library not handled by
     <command>configure</command>:</para>
@@ -185,6 +187,23 @@ echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</userinput></screen>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><command>sed -e 's/^#if.*XOPEN.*$/#if 1/' ...</command></term>
+        <listitem>
+          <para>The header file <filename>curses.h</filename> contains
+          the definition of various Ncurses data structures.  With different
+          preprocessor macro definitions two different sets of the data
+          structure definition may be used: the 8-bit definition is
+          compatible with <filename>libncurses.so</filename> and the
+          wide-character definition is compatible with
+          <filename>libncursesw.so</filename>.  Since we are using
+          <filename>libncursesw.so</filename> as a replacement of
+          <filename>libncurses.so</filename>, edit the header file so it
+          will always use the wide-character data structure definition
+          compatible with <filename>libncursesw.so</filename>.</para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
 
   </sect2>
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index 0703d0e1c..0b1155ee3 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -131,11 +131,16 @@
     in-place.  It may crash the shell process which is using code and data
     from the library file.  Install the package with
     <literal>DESTDIR</literal>, and replace the library file correctly using
-    <command>install</command> command:</para>
+    <command>install</command> command (the header
+    <filename>curses.h</filename> is also edited to ensure the
+    wide-character ABI to be used as what we've done in
+    <xref linkend='ch-tools-ncurses'/>):</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
 install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
 rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
+sed -e 's/^#if.*XOPEN.*$/#if 1/' \
+    -i dest/usr/include/curses.h
 cp -av dest/* /</userinput></screen>
 
     <para>Many applications still expect the linker to be able to find

From 943f22504e01611fb336a9cda0dcce6c9302d2c1 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Fri, 19 Jan 2024 12:57:51 +0800
Subject: [PATCH 2/8] ncurses: Use symlinks instead of linker scripts

The effect will not change, but with symlinks ld can save some time
invoking open(), read(), etc. syscalls and parsing the linker scripts.

Note that I've also removed "libcursesw" symlink because this library
has never existed.  Instead libcurses.so is created as a symlink
direct to libncursesw.so.
---
 chapter06/ncurses.xml |  9 ++++-----
 chapter08/ncurses.xml | 26 +++++++++++++++-----------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index f491c2c92..0a8c7e166 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -156,7 +156,7 @@ popd</userinput></screen>
     <para>Install the package:</para>
 
 <screen><userinput remap="install">make DESTDIR=$LFS TIC_PATH=$(pwd)/build/progs/tic install
-echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so
+ln -sv libncursesw.so $LFS/usr/lib/libncurses.so
 sed -e 's/^#if.*XOPEN.*$/#if 1/' \
     -i $LFS/usr/include/curses.h</userinput></screen>
 <!--
@@ -178,12 +178,11 @@ sed -e 's/^#if.*XOPEN.*$/#if 1/' \
       </varlistentry>
 
       <varlistentry>
-        <term><command>echo "INPUT(-lncursesw)" > $LFS/usr/lib/libncurses.so</command></term>
+        <term><command>ln -sv libncursesw.so $LFS/usr/lib/libncurses.so</command></term>
         <listitem>
           <para>The <filename>libncurses.so</filename> library is needed by
-          a few packages we will build soon. We create this small linker
-          script, as this is what is done in <xref
-          linkend="chapter-building-system"/>.</para>
+          a few packages we will build soon. We create this symlink to use
+          <filename>libncursesw.so</filename> as a replacement.</para>
         </listitem>
       </varlistentry>
 
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index 0b1155ee3..14113d7e3 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -144,22 +144,22 @@ sed -e 's/^#if.*XOPEN.*$/#if 1/' \
 cp -av dest/* /</userinput></screen>
 
     <para>Many applications still expect the linker to be able to find
-    non-wide-character Ncurses libraries. Trick such applications into linking with
-    wide-character libraries by means of symlinks and linker scripts:</para>
+    non-wide-character Ncurses libraries. Trick such applications into
+    linking with wide-character libraries by means of symlinks
+    (note that the <filename class='extension'>.so</filename> links are
+    only safe with <filename>curses.h</filename> edited to always use the
+    wide-character ABI):</para>
 
 <screen><userinput remap="install">for lib in ncurses form panel menu ; do
-    rm -vf                    /usr/lib/lib${lib}.so
-    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
+    ln -sfv lib${lib}w.so /usr/lib/lib${lib}.so
+    ln -sfv ${lib}w.pc    /usr/lib/pkgconfig/${lib}.pc
 done</userinput></screen>
 
     <para>Finally, make sure that old applications that look for
     <filename class="libraryfile">-lcurses</filename> at build time are still
     buildable:</para>
 
-<screen><userinput remap="install">rm -vf                     /usr/lib/libcursesw.so
-echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
-ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
+<screen><userinput remap="install">ln -sfv libncursesw.so /usr/lib/libcurses.so</userinput></screen>
 
     <para>If desired, install the Ncurses documentation:</para>
 
@@ -211,13 +211,17 @@ cp -av lib/lib*.so.5* /usr/lib</userinput></screen>
            tset
         </seg>
         <seg>
-           libcursesw.so (symlink and linker script to libncursesw.so),
+           libcurses.so (symlink),
+           libform.so (symlink),
            libformw.so,
+           libmenu.so (symlink),
            libmenuw.so,
+           libncurses.so (symlink),
            libncursesw.so,
            libncurses++w.so,
-           libpanelw.so, and their non-wide-character counterparts without "w"
-              in the library names.</seg>
+           libpanel.so (symlink),
+           and libpanelw.so,
+        </seg>
         <seg>
            /usr/share/tabset,
            /usr/share/terminfo, and

From 0253841d0f74a0fda05395d8ede65faaffa76b79 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 22 Jan 2024 00:45:47 +0800
Subject: [PATCH 3/8] coreutils: Fix CVE-2024-0684 (#5417)

---
 chapter01/changelog.xml | 10 ++++++++++
 chapter08/coreutils.xml | 12 ++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4865c68ab..862f90455 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>2024-01-21</para>
+      <itemizedlist>
+        <listitem>
+          <para>[xry111] - Fix CVE-2024-0684 for coreutils-9.4.  Fixes
+          <ulink url="&lfs-ticket-root;5417">#5417</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-01-18</para>
       <itemizedlist>
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 87833a134..e6114461f 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -53,13 +53,13 @@
       those bugs are reproducible without this patch.</para>
     </note>
 
-    <!-- https://bugs.gnu.org/62403 -->
-<!--
-    <para>Fix a bug in checksum utilities causing failed checks not
-    reported correctly:</para>
+    <!-- https://seclists.org/oss-sec/2024/q1/30 -->
+    <para>Fix a security vulnerability in the <command>split</command>
+    utility:</para>
+
+<screen><userinput remap="pre">sed -e '/n_out += n_hold/,+4 s|.*bufsize.*|//&amp;|' \
+    -i src/split.c</userinput></screen>
 
-<screen><userinput remap="pre">sed '/if ( ! match/s/ed_checksums//' -i src/digest.c</userinput></screen>
--->
     <para>Now prepare Coreutils for compilation:</para>
 
 <screen><userinput remap="configure">autoreconf -fiv

From 3baf03a954ed3e4e468e5c88ebe1b7e2ca5f0132 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 22 Jan 2024 01:03:33 +0800
Subject: [PATCH 4/8] Package updates:

- Update to jinja2-3.1.3 (#5411)
- Update to bc-6.7.5 (#5408)
- Update to attr-2.5.2 (#5412)
- Update to ncurses-6.4-20230520 (#5416)
- Update to markupsafe-2.1.4 (#5418)
- Update to linux-6.7.1 (#5406)
- Update to iproute2-6.7.0 (#5410)
- Update to vim-9.1.0041 (#4500)
- Update to iana-etc-20240117 (#5006)
- Update to shadow-4.14.3 (#5413)
---
 chapter01/changelog.xml | 40 ++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 16 +++++-----
 chapter08/ncurses.xml   | 10 +++---
 packages.ent            | 69 +++++++++++++++++++++--------------------
 4 files changed, 89 insertions(+), 46 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 862f90455..3f2ae8e29 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,46 @@
     <listitem>
       <para>2024-01-21</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Update to jinja2-3.1.3 (security fix).  Fixes
+          <ulink url='&lfs-ticket-root;5411'>#5411</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to bc-6.7.5.  Fixes
+          <ulink url='&lfs-ticket-root;5408'>#5408</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to attr-2.5.2.  Fixes
+          <ulink url='&lfs-ticket-root;5412'>#5412</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to ncurses-6.4-20230520 (security fix).
+          Fixes <ulink url='&lfs-ticket-root;5416'>#5416</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to markupsafe-2.1.4.  Fixes
+          <ulink url='&lfs-ticket-root;5418'>#5418</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to linux-6.7.1.  Fixes
+          <ulink url='&lfs-ticket-root;5406'>#5406</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iproute2-6.7.0.  Fixes
+          <ulink url='&lfs-ticket-root;5410'>#5410</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to vim-9.1.0041.  Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to iana-etc-20240117.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[xry111] - Update to shadow-4.14.3.  Fixes
+          <ulink url='&lfs-ticket-root;5413'>#5413</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Fix CVE-2024-0684 for coreutils-9.4.  Fixes
           <ulink url="&lfs-ticket-root;5417">#5417</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index e0c77ed72..918bc0f0b 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -29,9 +29,9 @@
     <!--<listitem>
       <para>Acl-&acl-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Attr-&attr-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Autoconf-&autoconf-version;</para>
     </listitem>
@@ -134,9 +134,9 @@
     <listitem>
       <para>IPRoute2-&iproute2-version;</para>
     </listitem>
-    <!--<listitem revision="systemd">
+    <listitem>
       <para>Jinja2-&jinja2-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Kbd-&kbd-version;</para>
     </listitem>
@@ -179,9 +179,9 @@
     <!--<listitem>
       <para>Man-pages-&man-pages-version;</para>
     </listitem>-->
-    <!--<listitem revision="systemd">
+    <listitem>
       <para>MarkupSafe-&markupsafe-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Meson-&meson-version;</para>
     </listitem>
@@ -191,9 +191,9 @@
     <listitem>
       <para>MPFR-&mpfr-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Ncurses-&ncurses-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index 14113d7e3..83ce508d6 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -99,9 +99,9 @@
         <term><parameter>--enable-widec</parameter></term>
         <listitem>
           <para>This switch causes wide-character libraries (e.g., <filename
-          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
+          class="libraryfile">libncursesw.so.&ncurses-release;</filename>)
           to be built instead of normal ones (e.g., <filename
-          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
+          class="libraryfile">libncurses.so.&ncurses-release;</filename>).
           These wide-character libraries are usable in both multibyte and
           traditional 8-bit locales, while normal libraries work properly
           only in 8-bit locales. Wide-character and normal libraries are
@@ -127,7 +127,7 @@
          make will spawn new shell processes during "make install".  -->
 
     <para>The installation of this package will overwrite
-    <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
+    <filename class="libraryfile">libncursesw.so.&ncurses-release;</filename>
     in-place.  It may crash the shell process which is using code and data
     from the library file.  Install the package with
     <literal>DESTDIR</literal>, and replace the library file correctly using
@@ -137,8 +137,8 @@
     <xref linkend='ch-tools-ncurses'/>):</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
-install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
-rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
+install -vm755 dest/usr/lib/libncursesw.so.&ncurses-release; /usr/lib
+rm -v  dest/usr/lib/libncursesw.so.&ncurses-release;
 sed -e 's/^#if.*XOPEN.*$/#if 1/' \
     -i dest/usr/include/curses.h
 cp -av dest/* /</userinput></screen>
diff --git a/packages.ent b/packages.ent
index b1cc7c1d5..fba1f5405 100644
--- a/packages.ent
+++ b/packages.ent
@@ -21,10 +21,10 @@
 <!ENTITY acl-fin-du "6.1 MB">
 <!ENTITY acl-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY attr-version "2.5.1">
-<!ENTITY attr-size "456 KB">
+<!ENTITY attr-version "2.5.2">
+<!ENTITY attr-size "484 KB">
 <!ENTITY attr-url "&savannah;/releases/attr/attr-&attr-version;.tar.gz">
-<!ENTITY attr-md5 "ac1c5a7a084f0f83b8cace34211f64d8">
+<!ENTITY attr-md5 "227043ec2f6ca03c0948df5517f9c927">
 <!ENTITY attr-home "&savannah-nongnu;/projects/attr">
 <!ENTITY attr-fin-du "4.1 MB">
 <!ENTITY attr-fin-sbu "less than 0.1 SBU">
@@ -57,10 +57,10 @@
 <!ENTITY bash-fin-du "52 MB">
 <!ENTITY bash-fin-sbu "1.1 SBU">
 
-<!ENTITY bc-version "6.7.4">
-<!ENTITY bc-size "456 KB">
+<!ENTITY bc-version "6.7.5">
+<!ENTITY bc-size "460 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "7826138b08c72f4618d6e48860101196">
+<!ENTITY bc-md5 "e249b1f86f886d6fb71c15f72b65dd3d">
 <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
 <!ENTITY bc-fin-du "7.7 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20231205">
-<!ENTITY iana-etc-size "592 KB">
+<!ENTITY iana-etc-version "20240117">
+<!ENTITY iana-etc-size "596 KB">
 <!ENTITY iana-etc-url "https://github.com/Mic92/iana-etc/releases/download/&iana-etc-version;/iana-etc-&iana-etc-version;.tar.gz">
-<!ENTITY iana-etc-md5 "7904f5aefaccd74e24af738da0e8bdaf">
+<!ENTITY iana-etc-md5 "215feb4b55043a6c18e84a5ed58b705f">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.8 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@@ -341,18 +341,18 @@
 <!ENTITY intltool-fin-du "1.5 MB">
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "6.6.0">
-<!ENTITY iproute2-size "897 KB">
+<!ENTITY iproute2-version "6.7.0">
+<!ENTITY iproute2-size "900 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "6716fc3188dbea226997fa2478a190d7">
+<!ENTITY iproute2-md5 "35d8277d1469596b7edc07a51470a033">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "17 MB">
 <!ENTITY iproute2-fin-sbu "0.1 SBU">
 
-<!ENTITY jinja2-version "3.1.2">
-<!ENTITY jinja2-size "262 KB">
+<!ENTITY jinja2-version "3.1.3">
+<!ENTITY jinja2-size "264 KB">
 <!ENTITY jinja2-url "&pypi-src;/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
-<!ENTITY jinja2-md5 "d31148abd89c1df1cdb077a55db27d02">
+<!ENTITY jinja2-md5 "caf5418c851eac59e70a78d9730d4cea">
 <!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
 <!ENTITY jinja2-fin-du "3.4 MB">
 <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
@@ -430,13 +430,13 @@
 <!ENTITY libxcrypt-fin-sbu "0.1 SBU">
 
 <!ENTITY linux-major-version "6">
-<!ENTITY linux-minor-version "6">
-<!ENTITY linux-patch-version "8">
+<!ENTITY linux-minor-version "7">
+<!ENTITY linux-patch-version "1">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "136,800 KB">
+<!ENTITY linux-size "138,096 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "a3deb764c4f8a77ff49735d6b3057409">
+<!ENTITY linux-md5 "d8a7394e0e349dd373e9722e141c8b61">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
  allnoconfig + some configs we recommend for the users, rounded down to
@@ -486,10 +486,10 @@
 <!ENTITY man-pages-fin-du "33 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY markupsafe-version "2.1.3">
-<!ENTITY markupsafe-size "19 KB">
+<!ENTITY markupsafe-version "2.1.4">
+<!ENTITY markupsafe-size "20 KB">
 <!ENTITY markupsafe-url "&pypi-src;/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
-<!ENTITY markupsafe-md5 "ca33f119bd0551ce15837f58bb180214">
+<!ENTITY markupsafe-md5 "8138329a11cf4bd0f9db780b2af26c66">
 <!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
 <!ENTITY markupsafe-fin-du "548 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
@@ -518,10 +518,13 @@
 <!ENTITY mpfr-fin-du "43 MB">
 <!ENTITY mpfr-fin-sbu "0.2 SBU">
 
-<!ENTITY ncurses-version "6.4">
-<!ENTITY ncurses-size "3,528 KB">
-<!ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz">
-<!ENTITY ncurses-md5 "5a62487b5d4ac6b132fe2bf9f8fad29b">
+<!ENTITY ncurses-release "6.4">
+<!ENTITY ncurses-version "&ncurses-release;-20230520">
+<!ENTITY ncurses-size "2,156 KB">
+<!-- switch back to invisible-mirror.net for 6.5 -->
+<!--ENTITY ncurses-url "https://invisible-mirror.net/archives/ncurses/ncurses-&ncurses-version;.tar.gz"-->
+<!ENTITY ncurses-url "&anduin-sources;/ncurses-&ncurses-version;.tar.xz">
+<!ENTITY ncurses-md5 "c5367e829b6d9f3f97b280bb3e6bfbc3">
 <!ENTITY ncurses-home "&gnu-software;ncurses/">
 <!ENTITY ncurses-tmp-du "51 MB">
 <!ENTITY ncurses-tmp-sbu "0.3 SBU">
@@ -636,10 +639,10 @@
 <!ENTITY setuptools-fin-du "30 MB">
 <!ENTITY setuptools-fin-sbu "0.1 SBU">
 
-<!ENTITY shadow-version "4.14.2">
-<!ENTITY shadow-size "1,758 KB">
+<!ENTITY shadow-version "4.14.3">
+<!ENTITY shadow-size "1,760 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "effc1aa17590305647413125b966f1dd">
+<!ENTITY shadow-md5 "b9a7f56d0c63297c0d11d742be2f8ffd">
 <!ENTITY shadow-home "&github;/shadow-maint/shadow/">
 <!ENTITY shadow-fin-du "46 MB">
 <!ENTITY shadow-fin-sbu "0.1 SBU">
@@ -735,13 +738,13 @@
 <!ENTITY util-linux-fin-du "310 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">
 
-<!ENTITY vim-version "9.0.2189">
+<!ENTITY vim-version "9.1.0041">
 <!-- <!ENTITY vim-majmin "90"> -->
-<!ENTITY vim-docdir "vim/vim90">
-<!ENTITY vim-size "17,196 KB">
+<!ENTITY vim-docdir "vim/vim91">
+<!ENTITY vim-size "17,224 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 "0a750075a7da900b96691bf6fcc919c6">
+<!ENTITY vim-md5 "79dfe62be5d347b1325cbd5ce2a1f9b3">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "229 MB">
 <!ENTITY vim-fin-sbu "2.3 SBU">

From 75d26160ceac72d6b08c6ed11bebf657da353c70 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 22 Jan 2024 01:19:31 +0800
Subject: [PATCH 5/8] pkgconf: Update the fix for modversion regression (#5414)

---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 4 ++++
 chapter03/patches.xml   | 9 ++++-----
 chapter08/pkgconf.xml   | 4 ++--
 patches.ent             | 4 ++++
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 3f2ae8e29..aba69a0de 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,10 @@
     <listitem>
       <para>2024-01-21</para>
       <itemizedlist>
+        <listitem>
+          <para>[xry111] - Apply upstream fix for pkgconf-2.1.0 regression.
+          Fixes <ulink url='&lfs-ticket-root;5414'>#5414</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[xry111] - Update to jinja2-3.1.3 (security fix).  Fixes
           <ulink url='&lfs-ticket-root;5411'>#5411</ulink>.</para>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 918bc0f0b..2dd0a8d02 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -298,6 +298,10 @@
       <para>&glibc-upstream-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&pkgconf-upstream-fix-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 263f3ec1b..50ff56a6f 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -117,15 +117,14 @@
       </listitem>
     </varlistentry>
 -->
-<!--
+
     <varlistentry>
-      <term>Perl Upstream Fix Patch - <token>&perl-fix-patch-size;</token>:</term>
+      <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&perl-fix-patch;"/></para>
-        <para>MD5 sum: <literal>&perl-fix-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&pkgconf-upstream-fix-patch;"/></para>
+        <para>MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
 
     <varlistentry>
       <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml
index 0155356aa..139e0c810 100644
--- a/chapter08/pkgconf.xml
+++ b/chapter08/pkgconf.xml
@@ -45,9 +45,9 @@
     <title>Installation of Pkgconf</title>
 
     <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
-    <para>Fix a regression in pkgconf-2.0.3 breaking BLFS packages:</para>
+    <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>
 
-    <screen><userinput remap="pre">sed -i 's/str\(cmp.*package\)/strn\1, strlen(pkg-&gt;why)/' cli/main.c</userinput></screen>
+    <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>
 
     <para>Prepare Pkgconf for compilation:</para>
 
diff --git a/patches.ent b/patches.ent
index 1bcd45dc3..d27c717de 100644
--- a/patches.ent
+++ b/patches.ent
@@ -22,6 +22,10 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!ENTITY pkgconf-upstream-fix-patch "pkgconf-&pkgconf-version;-upstream_fix-1.patch">
+<!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
+<!ENTITY pkgconf-upstream-fix-patch-size "4 KB">
+
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-2.patch">
 <!ENTITY readline-fixes-patch-md5 "d2477ebe908cc99763d90dde7fd9549a">
 <!ENTITY readline-fixes-patch-size "5.7 KB">

From 24d03240bf2406c189ce98b69cc1678ce78e5d10 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 22 Jan 2024 01:28:02 +0800
Subject: [PATCH 6/8] kernel: Regenerate kernel config with 6.7.1

No content change!
---
 chapter10/kernel/kernel.version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter10/kernel/kernel.version b/chapter10/kernel/kernel.version
index e411592c2..06a765991 100644
--- a/chapter10/kernel/kernel.version
+++ b/chapter10/kernel/kernel.version
@@ -1 +1 @@
-6.6.3
+6.7.1

From 46b5c6b63bbf30b84b37be75a0f494c85be66d09 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 22 Jan 2024 01:32:56 +0800
Subject: [PATCH 7/8] gcc: Fix libcc1 description

libcpp is the preprocessor library, but it's a static library which is
only used by GCC itself and not installed.

libcc1 is actually a library for GDB to "compile" expressions, so we can
use fancy expressions in commands, like "print sin(x + 2.0)": the
expression sin(x + 2.0) needs to be "compiled" for evaluation.
---
 chapter08/gcc.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 349d83c2a..7f21cf853 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -534,7 +534,7 @@ mv -v /usr/lib/*gdb.py /usr/share/gdb/auto-load/usr/lib</userinput></screen>
       <varlistentry id="libcc1">
         <term><filename class="libraryfile">libcc1</filename></term>
         <listitem>
-          <para>The C preprocessing library</para>
+          <para>A library that allows GDB to make use of GCC</para>
           <indexterm zone="ch-system-gcc libcc1">
             <primary sortas="b-libcc1">libcc1</primary>
           </indexterm>

From 47bc996103ea5b9e5f29d582826aeb469554ecdc Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Mon, 22 Jan 2024 02:20:43 +0800
Subject: [PATCH 8/8] Makefile: Ensure wget-list and md5sums regenerated when
 patches.xml or packages.xml has changed

---
 Makefile | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index c45a56943..1f1de8d23 100644
--- a/Makefile
+++ b/Makefile
@@ -150,9 +150,11 @@ profile-html:
                 stylesheets/lfs-xsl/profile.xsl      \
                 $(RENDERTMP)/lfs-full.xml
 
+DOWNLOADS_DEP = chapter03/packages.xml chapter03/patches.xml \
+                packages.ent patches.ent general.ent
+
 wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
-$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
-                      packages.ent patches.ent general.ent
+$(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
 	$(Q)mkdir -p $(BASEDIR)
 	$(Q)xsltproc --xinclude --nonet            \
@@ -160,9 +162,7 @@ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
                 stylesheets/wget-list.xsl     \
                 chapter03/chapter03.xml
 
-$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
-                             chapter03/chapter03.xml \
-                             packages.ent patches.ent general.ent
+$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	$(Q)xsltproc --nonet --xinclude                   \
                 --stringparam profile.revision $(REV) \
                 --output $(RENDERTMP)/wget-list.xml   \
@@ -174,8 +174,7 @@ $(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
                 $(RENDERTMP)/wget-list.xml
 
 md5sums: $(BASEDIR)/md5sums
-$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
-                    packages.ent patches.ent
+$(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
 	@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
 	$(Q)mkdir -p $(BASEDIR)