From 57f97c0ed6463cb178a76ca8de51ccfa4d9ff195 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Mon, 21 Jul 2025 07:13:36 +0200
Subject: [PATCH] Merge trunk

---
 chapter01/changelog.xml      | 87 +++++++++++++++++++++++++++++++++++-
 chapter01/whatsnew.xml       |  8 ++--
 chapter03/patches.xml        |  2 -
 chapter05/binutils-pass1.xml | 10 +++++
 chapter06/ncurses.xml        |  2 +-
 chapter08/e2fsprogs.xml      |  2 +-
 chapter08/perl.xml           |  4 +-
 chapter08/util-linux.xml     |  4 +-
 chapter09/networkd.xml       | 15 +++++++
 packages.ent                 | 86 +++++++++++++++++------------------
 patches.ent                  |  2 +
 11 files changed, 166 insertions(+), 56 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 494fa74fb..e51f2c83d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,8 +39,93 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+
     <listitem>
-      <para>2025-06-25</para>
+      <para>2025-07-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.1.1552 (Security update). Fixes
+          <ulink url='&lfs-ticket-root;5760'>#5760</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to readline-8.3. Fixes
+          <ulink url='&lfs-ticket-root;5755'>#5755</ulink>.</para>
+        </listitem>
+        <listitem revision='sysv'>
+          <para>[bdubbs] - Update to perl-5.42.0. Fixes
+          <ulink url='&lfs-ticket-root;5756'>#5756</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.5.1. Fixes
+          <ulink url='&lfs-ticket-root;5723'>#5723</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ninja-1.13.1. Fixes
+          <ulink url='&lfs-ticket-root;5759'>#5759</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.15.6. Fixes
+          <ulink url='&lfs-ticket-root;5757'>#5757</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gettext-0.25.1. Fixes
+          <ulink url='&lfs-ticket-root;5753'>#5753</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.47.3. Fixes
+          <ulink url='&lfs-ticket-root;5758'>#5758</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bash-5.3. Fixes
+          <ulink url='&lfs-ticket-root;5754'>#5754</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2025-07-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20250618. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.1.1497. Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to util-linux-2.41.1. Fixes
+          <ulink url='&lfs-ticket-root;5749'>#5749</ulink>.</para>
+        </listitem>
+        <listitem revision='sysv'>
+          <para>[bdubbs] - Update to shadow-4.18.0. Fixes
+          <ulink url='&lfs-ticket-root;5750'>#5750</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pkgconf-2.5.1. Fixes
+          <ulink url='&lfs-ticket-root;5746'>#5746</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to ninja-1.13.0. Fixes
+          <ulink url='&lfs-ticket-root;5745'>#5745</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.15.4. Fixes
+          <ulink url='&lfs-ticket-root;5748'>#5748</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to less-679. Fixes
+          <ulink url='&lfs-ticket-root;5747'>#5747</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to automake-1.18.1. Fixes
+          <ulink url='&lfs-ticket-root;5752'>#5752</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2025-06-15</para>
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Update to meson-1.8.2. Fixes
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 7b03c7f02..fba20d15d 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -65,9 +65,9 @@
     <listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
        <para>Expat-&expat-version;</para>
     </listitem>
@@ -197,9 +197,9 @@
     <!--<listitem>
       <para>Ncurses-&ncurses-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Ninja-&ninja-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>OpenSSL-&openssl-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index bea48d151..a1181e7f0 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -124,7 +124,6 @@
         <para>MD5 sum: <literal>&libpipeline-checks-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
 
     <varlistentry>
       <term>Perl Upstream Fix Patch - <token>&perl-upstream-fix-patch-size;</token>:</term>
@@ -134,7 +133,6 @@
       </listitem>
     </varlistentry>
 
-<!--
     <varlistentry>
       <term>Python Security Fix Patch - <token>&python-security-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/binutils-pass1.xml b/chapter05/binutils-pass1.xml
index f6b7f0f90..fe3a1c4a6 100644
--- a/chapter05/binutils-pass1.xml
+++ b/chapter05/binutils-pass1.xml
@@ -82,6 +82,16 @@ cd       build</userinput></screen>
     <variablelist>
       <title>The meaning of the configure options:</title>
 
+      <note>
+        <para>
+          Contrary to other packages, not all the options listed below appear
+          when running <command>./configure --help</command>. For example,
+          to find the <option>--with-sysroot</option> option, you have to run
+          <command>ld/configure --help</command>. All the options can be
+          listed at once with <command>./configure --help=recursive</command>.
+        </para>
+      </note>
+
       <varlistentry>
         <term><parameter>--prefix=$LFS/tools</parameter></term>
         <listitem>
diff --git a/chapter06/ncurses.xml b/chapter06/ncurses.xml
index 903e9818e..061c70505 100644
--- a/chapter06/ncurses.xml
+++ b/chapter06/ncurses.xml
@@ -43,7 +43,7 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
 
-    <para>First, run the following commands to build the <quote>tic</quote>
+    <para>First, run the following commands to build the <command>tic</command>
       program on the build host. We install it in
       <filename class="directory">$LFS/tools</filename>, so that it is found
       in the <envar>PATH</envar> when needed:</para>
diff --git a/chapter08/e2fsprogs.xml b/chapter08/e2fsprogs.xml
index 89f1fadb3..6d8a1e13c 100644
--- a/chapter08/e2fsprogs.xml
+++ b/chapter08/e2fsprogs.xml
@@ -153,7 +153,7 @@ install-info --dir-file=/usr/share/info/dir /usr/share/info/com_err.info</userin
       For example, some utilities (not in LFS or BLFS) cannot recognize a
       <systemitem class='filesystem'>ext4</systemitem> file system with
       <literal>metadata_csum_seed</literal> feature enabled.
-      <emphasis role='bold'>If</emphasis> you need such an utility, you may
+      <emphasis role='bold'>If</emphasis> you need such a utility, you may
       remove the feature from the default
       <systemitem class='filesystem'>ext4</systemitem> feature list with the
       command:
diff --git a/chapter08/perl.xml b/chapter08/perl.xml
index 0416aa85e..fb07aea21 100644
--- a/chapter08/perl.xml
+++ b/chapter08/perl.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of Perl</title>
-
+<!--
     <para>First, apply a security patch identified upstream:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&perl-upstream-fix-patch;</userinput></screen>
-
+-->
     <para>This version of Perl builds the Compress::Raw::Zlib and
     Compress::Raw::BZip2 modules. By
     default Perl will use an internal copy of the sources for the build.
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 0cb1e6b78..4ceeef9a2 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -129,8 +129,8 @@ su tester -c "make -k check"</userinput></screen>
     </para>
 
     <para>
-      Two other tests, lsfd: SOURCE column and utmp: last, are known to
-      fail in the chroot environment.
+      One test, <literal>kill: decode functions</literal>, is known to fail
+      with bash-5.3-rc1 or newer.
     </para>
 
     <para>Install the package:</para>
diff --git a/chapter09/networkd.xml b/chapter09/networkd.xml
index eb348ec1e..7c947a9eb 100644
--- a/chapter09/networkd.xml
+++ b/chapter09/networkd.xml
@@ -213,6 +213,21 @@ EOF</userinput></screen>
       <filename>/run/systemd/resolve/stub-resolv.conf</filename>. So it's
       unnecessary to create a <filename>/etc/resolv.conf</filename>
       manually.</para>
+
+      <note>
+        <para>
+          If you want to use <command>systemd-resolved</command> for the
+          LFS system but you need to access the Internet in the chroot
+          environment (for example, for building a BLFS package of which the
+          build process requires an Internet connection), create the
+          <filename>/etc/resolv.conf</filename> file following the
+          static configuration below for the chroot environment so the name
+          resolution will work in the chroot environment.  When you exit
+          the chroot environment, remove it so
+          <command>systemd-resolved</command> will create the symlink on
+          boot.
+        </para>
+      </note>
       <!--Create a
       symlink in <filename>/etc</filename> to use the generated file:</para>
 
diff --git a/packages.ent b/packages.ent
index 55344b8f6..bee70fbf9 100644
--- a/packages.ent
+++ b/packages.ent
@@ -38,19 +38,19 @@
 <!ENTITY autoconf-fin-sbu-tests "0.4">
 <!ENTITY autoconf-fin-sbu "less than 0.1 SBU (about &autoconf-fin-sbu-tests; SBU with tests)">
 
-<!ENTITY automake-version "1.18">
+<!ENTITY automake-version "1.18.1">
 <!ENTITY am-minor-version "1.18">
 <!ENTITY automake-size "1,614 KB">
 <!ENTITY automake-url "&gnu;automake/automake-&automake-version;.tar.xz">
-<!ENTITY automake-md5 "1320dd6a6aae0d97668daa089086c083">
+<!ENTITY automake-md5 "cea31dbf1120f890cbf2a3032cfb9a68">
 <!ENTITY automake-home "&gnu-software;automake/">
 <!ENTITY automake-fin-du "121 MB">
 <!ENTITY automake-fin-sbu "less than 0.1 SBU (about 1.1 SBU with tests)">
 
-<!ENTITY bash-version "5.3-rc2">
-<!ENTITY bash-size "10,774 KB">
+<!ENTITY bash-version "5.3">
+<!ENTITY bash-size "11,089 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "9c440d7c5ca37433e496c5e22f8918c6">
+<!ENTITY bash-md5 "4c7fb7d82586f93ab1d833ef20378ee8">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-tmp-du "68 MB">
 <!ENTITY bash-tmp-sbu "0.2 SBU">
@@ -132,10 +132,10 @@
 <!ENTITY diffutils-fin-du "50 MB">
 <!ENTITY diffutils-fin-sbu "0.4 SBU">
 
-<!ENTITY e2fsprogs-version "1.47.2">
-<!ENTITY e2fsprogs-size "9,763 KB">
+<!ENTITY e2fsprogs-version "1.47.3">
+<!ENTITY e2fsprogs-size "9,851 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "752e5a3ce19aea060d8a203f2fae9baa">
+<!ENTITY e2fsprogs-md5 "113d7a7ee0710d2a670a44692a35fd2e">
 <!ENTITY e2fsprogs-home "https://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-fin-du "99 MB">
 <!ENTITY e2fsprogs-fin-sbu "2.4 SBU on a spinning disk, 0.5 SBU on an SSD">
@@ -237,10 +237,10 @@
 <!ENTITY gdbm-fin-du "13 MB">
 <!ENTITY gdbm-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY gettext-version "0.25">
-<!ENTITY gettext-size "9,701 KB">
+<!ENTITY gettext-version "0.25.1">
+<!ENTITY gettext-size "9,699 KB">
 <!ENTITY gettext-url "&gnu;gettext/gettext-&gettext-version;.tar.xz">
-<!ENTITY gettext-md5 "355a09fa53ae2e87dd493e040d437874">
+<!ENTITY gettext-md5 "78fe5203bc80e9d916f9509026f07de9">
 <!ENTITY gettext-home "&gnu-software;gettext/">
 <!ENTITY gettext-tmp-du "349 MB">
 <!ENTITY gettext-tmp-sbu "1.3 SBU">
@@ -309,10 +309,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20250519">
+<!ENTITY iana-etc-version "20250618">
 <!ENTITY iana-etc-size "592 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 "45778351c7eda633946a777cd8e24eb8">
+<!ENTITY iana-etc-md5 "56333fb4fd9cea3d36787784f442ed90">
 <!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">
@@ -375,10 +375,10 @@
 <!ENTITY kmod-fin-du "11 MB">
 <!ENTITY kmod-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY less-version "678">
+<!ENTITY less-version "679">
 <!ENTITY less-size "857 KB">
 <!ENTITY less-url "https://www.greenwoodsoftware.com/less/less-&less-version;.tar.gz">
-<!ENTITY less-md5 "19b055a2ee7db1bf910380fd04c41ffc">
+<!ENTITY less-md5 "0386dc14f6a081a94dfb4c2413864eed">
 <!ENTITY less-home "https://www.greenwoodsoftware.com/less/">
 <!ENTITY less-fin-du "14 MB">
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
@@ -433,12 +433,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "15">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "6">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "147,636 KB">
+<!ENTITY linux-size "147,622 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "adb5495ce6e317091541057344fcf0a6">
+<!ENTITY linux-md5 "019a3cea6458f01331dfa5afdd1ce252">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : 
  minimum is allnoconfig 
@@ -540,18 +540,18 @@
 <!ENTITY ncurses-fin-du "46 MB">
 <!ENTITY ncurses-fin-sbu "0.2 SBU">
 
-<!ENTITY ninja-version "1.12.1">
-<!ENTITY ninja-size "235 KB">
+<!ENTITY ninja-version "1.13.1">
+<!ENTITY ninja-size "286 KB">
 <!ENTITY ninja-url "&github;/ninja-build/ninja/archive/v&ninja-version;/ninja-&ninja-version;.tar.gz">
-<!ENTITY ninja-md5 "6288992b05e593a391599692e2f7e490">
+<!ENTITY ninja-md5 "c35f8f55f4cf60f1a916068d8f45a0f8">
 <!ENTITY ninja-home "https://ninja-build.org/">
 <!ENTITY ninja-fin-du "37 MB">
 <!ENTITY ninja-fin-sbu "0.2 SBU">
 
-<!ENTITY openssl-version "3.5.0">
-<!ENTITY openssl-size "51,892 KB">
+<!ENTITY openssl-version "3.5.1">
+<!ENTITY openssl-size "51,913 KB">
 <!ENTITY openssl-url "&github;/openssl/openssl/releases/download/openssl-&openssl-version;/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "51da7d2bdf7f4f508cb024f562eb9b03">
+<!ENTITY openssl-md5 "562a4e8d14ee5272f677a754b9c1ca5c">
 <!ENTITY openssl-home "https://www.openssl-library.org/">
 <!ENTITY openssl-fin-du "920 MB">
 <!ENTITY openssl-fin-sbu "1.8 SBU">
@@ -575,23 +575,23 @@
 <!ENTITY patch-fin-sbu "0.2 SBU">
 
 <!ENTITY perl-version-major "5">
-<!ENTITY perl-version-minor "40">
-<!ENTITY perl-version-patch "2">
+<!ENTITY perl-version-minor "42">
+<!ENTITY perl-version-patch "0">
 <!ENTITY perl-version-min "&perl-version-major;.&perl-version-minor;">
 <!ENTITY perl-version "&perl-version-major;.&perl-version-minor;.&perl-version-patch;">
-<!ENTITY perl-size "13,598 KB">
+<!ENTITY perl-size "14,084 KB">
 <!ENTITY perl-url "https://www.cpan.org/src/5.0/perl-&perl-version;.tar.xz">
-<!ENTITY perl-md5 "9ad7a269dc4053cdbeecd4fde444291b">
+<!ENTITY perl-md5 "7a6950a9f12d01eb96a9d2ed2f4e0072">
 <!ENTITY perl-home "https://www.perl.org/">
 <!ENTITY perl-tmp-du "285 MB">
 <!ENTITY perl-tmp-sbu "0.6 SBU">
 <!ENTITY perl-fin-du "245 MB">
 <!ENTITY perl-fin-sbu "1.3 SBU">
 
-<!ENTITY pkgconf-version "2.4.3">
-<!ENTITY pkgconf-size "314 KB">
+<!ENTITY pkgconf-version "2.5.1">
+<!ENTITY pkgconf-size "321 KB">
 <!ENTITY pkgconf-url "https://distfiles.ariadne.space/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
-<!ENTITY pkgconf-md5 "781a513f4ca3d068155482a37986d594">
+<!ENTITY pkgconf-md5 "3291128c917fdb8fccd8c9e7784b643b">
 <!ENTITY pkgconf-home "https://github.com/pkgconf/pkgconf">
 <!ENTITY pkgconf-fin-du "4.7 MB">
 <!ENTITY pkgconf-fin-sbu "less than 0.1 SBU">
@@ -629,11 +629,11 @@
 <!ENTITY python-docs-md5 "8f34b29779cc1d5d1e8c0a913c307129">
 <!ENTITY python-docs-size "10,130 KB">
 
-<!ENTITY readline-version "8.3-rc2">
+<!ENTITY readline-version "8.3">
 <!ENTITY readline-soversion "8.3"><!-- used for stripping -->
-<!ENTITY readline-size "3,338 KB">
+<!ENTITY readline-size "3,340 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "d580a2ab42aa69d09c237b1e2058914d">
+<!ENTITY readline-md5 "25a73bfb2a3ad7146c5e9d4408d9f6cd">
 <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html">
 <!ENTITY readline-fin-du "16 MB">
 <!ENTITY readline-fin-sbu "less than 0.1 SBU">
@@ -656,10 +656,10 @@
 <!ENTITY setuptools-fin-du "26 MB">
 <!ENTITY setuptools-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY shadow-version "4.17.4">
-<!ENTITY shadow-size "2,273 KB">
+<!ENTITY shadow-version "4.18.0">
+<!ENTITY shadow-size "2,293 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "469666ea82c203ce5b0116d26b3793a9">
+<!ENTITY shadow-md5 "30ef46f54363db1d624587be68794ef2">
 <!ENTITY shadow-home "&github;/shadow-maint/shadow/">
 <!ENTITY shadow-fin-du "114 MB">
 <!ENTITY shadow-fin-sbu "0.1 SBU">
@@ -745,20 +745,20 @@
 <!ENTITY udev-fin-sbu "0.3 SBU">
 
 <!ENTITY util-linux-minor "2.41">
-<!ENTITY util-linux-version "2.41"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "9,313 KB">
+<!ENTITY util-linux-version "2.41.1"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "9,382 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "e666a34b03554c18a1073347b16661ce">
+<!ENTITY util-linux-md5 "7e5e68845e2f347cf96f5448165f1764">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "182 MB">
 <!ENTITY util-linux-tmp-sbu "0.2 SBU">
 <!ENTITY util-linux-fin-du "316 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">
 
-<!ENTITY vim-version "9.1.1418">
+<!ENTITY vim-version "9.1.1552">
 <!-- <!ENTITY vim-majmin "90"> -->
 <!ENTITY vim-docdir "vim/vim91">
-<!ENTITY vim-size "18,414 KB">
+<!ENTITY vim-size "18,242 KB">
 <!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
 <!-- N.B. LFS 9.0 uses
      https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz
@@ -772,7 +772,7 @@
      example, https://github.com/vim/vim/tags?after=v8.1.1847 will show
      us v8.1.1846. -->
 <!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
-<!ENTITY vim-md5 "a39c2c90361a39f2206302bb64f51022">
+<!ENTITY vim-md5 "30f8b97fb27bbeac10c2ca80db937ed8">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "251 MB">
 <!ENTITY vim-fin-sbu "3.4 SBU">
diff --git a/patches.ent b/patches.ent
index 7c0a42133..9560fefaa 100644
--- a/patches.ent
+++ b/patches.ent
@@ -35,9 +35,11 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
+<!--
 <!ENTITY perl-upstream-fix-patch "perl-&perl-version;-upstream_fix-1.patch">
 <!ENTITY perl-upstream-fix-patch-md5 "1983b48fee837a98db47fb5dba934744">
 <!ENTITY perl-upstream-fix-patch-size "13 KB">
+-->
 
 <!--
 <!ENTITY python-security-fixes-patch "Python-&python-version;-security_fixes-1.patch">