From 813ab55675c99ee4040c38ee468d4bf9b70bdd19 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 30 Apr 2022 09:38:48 -0500
Subject: Package updates and nobody uid change. Change nobody/nogroup uid/git
 to 65534. Update to meson-0.62.1. Update to libpipeline-1.5.6. Update to
 elfutils-0.187. Update to Jinja2-3.1.2. Update to vim-8.2.4814. Update to
 sysvinit-3.03. Update to linux-5.17.5. Update to gcc-11.3.0. Update to
 coreutils-9.1. Update to bc-5.2.4.

---
 chapter01/changelog.xml   | 49 ++++++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml    | 60 +++++++++++++++++++++++------------------------
 chapter03/patches.xml     |  5 ++--
 chapter07/createfiles.xml |  8 +++----
 chapter08/coreutils.xml   | 10 +++-----
 chapter08/gcc.xml         | 13 ++--------
 packages.ent              | 60 +++++++++++++++++++++++------------------------
 patches.ent               | 10 ++++----
 8 files changed, 126 insertions(+), 89 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index d437be0fc..7fb586b09 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,55 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2022-05-01</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Change nobody/nogroup uid/git to 65534. </para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.62.1.  Fixes
+          <ulink url="&lfs-ticket-root;5052">#5052</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libpipeline-1.5.6.  Fixes
+          <ulink url="&lfs-ticket-root;5053">#5053</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to elfutils-0.187.  Fixes
+          <ulink url="&lfs-ticket-root;5054">#5054</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[bdubbs] - Update to Jinja2-3.1.2.  Fixes
+          <ulink url="&lfs-ticket-root;5055">#5055</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-8.2.4814.  Addresses
+          <ulink url="&lfs-ticket-root;4500">#4500</ulink>.</para>
+        </listitem>
+        <listitem revision="sysv">
+          <para>[bdubbs] - Update to sysvinit-3.03.  Fixes
+          <ulink url="&lfs-ticket-root;5046">#5046</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.17.5.  Fixes
+          <ulink url="&lfs-ticket-root;5050">#5050</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gcc-11.3.0.  Fixes
+          <ulink url="&lfs-ticket-root;5051">#5051</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to coreutils-9.1.  Fixes
+          <ulink url="&lfs-ticket-root;5048">#5048</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-5.2.4.  Fixes
+          <ulink url="&lfs-ticket-root;5049">#5049</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2022-04-15</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 04cc9985e..6ae480aa0 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -35,19 +35,19 @@
     <!--<listitem>
       <para>Autoconf-&autoconf-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Automake-&automake-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Bash &bash-version;</para>
     </listitem>-->
     <listitem>
       <para>Bc &bc-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>Binutils-&binutils-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Bison-&bison-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -56,21 +56,21 @@
     <!--<listitem>
       <para>Check-&check-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Coreutils-&coreutils-version;</para>
-    </listitem>-->
-   <!--<listitem>
+    </listitem>
+    <!--<listitem>
       <para>DejaGNU-&dejagnu-version;</para>
     </listitem>-->
     <listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>Diffutils-&diffutils-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
     </listitem>-->
@@ -92,16 +92,16 @@
     <!--<listitem>
       <para>Gawk-&gawk-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <listitem>
        <para>GCC-&gcc-version;</para>
-    </listitem>-->
-   <!--<listitem>
+    </listitem>
+    <!--<listitem>
        <para>GDBM-&gdbm-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Glibc-&glibc-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -110,19 +110,19 @@
     <!--<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>
       <para>Gzip-&gzip-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>IANA-Etc-&iana-etc-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -140,10 +140,10 @@
     <!--<listitem>
       <para>Kbd-&kbd-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Kmod-&kmod-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Less-&less-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -152,22 +152,22 @@
     <listitem>
       <para>Libcap-&libcap-version;</para>
     </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>
       <para>Linux-&linux-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -176,7 +176,7 @@
     <listitem>
       <para>Man-DB-&man-db-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>Man-pages-&man-pages-version;</para>
     </listitem>-->
     <listitem revision="systemd">
@@ -224,13 +224,13 @@
     <!--<listitem>
       <para>Sed-&sed-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Shadow-&shadow-version;</para>
     </listitem>-->
-   <!--<listitem revision="sysv">
+    <!--<listitem revision="sysv">
       <para>Sysklogd-&sysklogd-version;</para>
     </listitem>-->
-   <!--<listitem revision="systemd">
+    <!--<listitem revision="systemd">
       <para>Systemd-&systemd-version;</para>
     </listitem>-->
     <listitem revision="sysv">
@@ -263,7 +263,7 @@
     <listitem>
       <para>Zlib-&zlib-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>Zstd-&zstd-version;</para>
     </listitem>-->
   </itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 83ada1927..bed7d4735 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -59,14 +59,15 @@
         <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>Coreutils Chmod Fix Patch - <token>&coreutils-chmod-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&coreutils-chmod-patch;"/></para>
         <para>MD5 sum: <literal>&coreutils-chmod-patch-md5;</literal></para>
       </listitem>
-    </varlistentry>
+   </varlistentry>
+-->
 <!--
     <varlistentry>
       <term>File Upstream Fixes Patch - <token>&file-upstream-fixes-patch-size;</token>:</term>
diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml
index 7b038ef3d..7df2acde6 100644
--- a/chapter07/createfiles.xml
+++ b/chapter07/createfiles.xml
@@ -66,7 +66,7 @@ bin:x:1:1:bin:/dev/null:/usr/bin/false
 daemon:x:6:6:Daemon User:/dev/null:/usr/bin/false
 messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/usr/bin/false
 uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/usr/bin/false
-nobody:x:99:99:Unprivileged User:/dev/null:/usr/bin/false</literal>
+nobody:x:65534:65534:Unprivileged User:/dev/null:/usr/bin/false</literal>
 EOF</userinput></screen>
 
 <screen revision="systemd"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
@@ -83,7 +83,7 @@ systemd-timesync:x:78:78:systemd Time Synchronization:/:/usr/bin/false
 systemd-coredump:x:79:79:systemd Core Dumper:/:/usr/bin/false
 uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/usr/bin/false
 systemd-oom:x:81:81:systemd Out Of Memory Daemon:/:/usr/bin/false
-nobody:x:99:99:Unprivileged User:/dev/null:/usr/bin/false</literal>
+nobody:x:65534:65534:Unprivileged User:/dev/null:/usr/bin/false</literal>
 EOF</userinput></screen>
 
   <para>The actual password for <systemitem class="username">root</systemitem>
@@ -116,7 +116,7 @@ mail:x:34:
 kvm:x:61:
 uuidd:x:80:
 wheel:x:97:
-nogroup:x:99:
+nogroup:x:65534:
 users:x:999:</literal>
 EOF</userinput></screen>
 
@@ -153,7 +153,7 @@ systemd-coredump:x:79:
 uuidd:x:80:
 systemd-oom:x:81:
 wheel:x:97:
-nogroup:x:99:
+nogroup:x:65534:
 users:x:999:</literal>
 EOF</userinput></screen>
 
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index 9ae9993ce..08b090fc0 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -56,15 +56,10 @@
    <!-- this has been fixed in upstream gnulib, when a new version of
    coreutils is released, please check #4055 to see if the change has been
    picked up in this package -->
-
+<!--
    <para>Now, fix a problem with chmod return values:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&coreutils-chmod-patch;</userinput></screen>
-
-<!--
-<para>Fix a problem with autoconf-2.70 in an included gnulib .m4 file:</para>
-
-<screen><userinput remap="pre">echo '# deleted' > m4/std-gnu11.m4</userinput></screen>
 -->
     <para>Now prepare Coreutils for compilation:</para>
 
@@ -133,8 +128,9 @@ FORCE_UNSAFE_CONFIGURE=1 ./configure \
 
 <screen><userinput remap="test">su tester -c "PATH=$PATH make RUN_EXPENSIVE_TESTS=yes check"</userinput></screen>
 
+<!-- test-getlogin is now skipped
     <para>The test-getlogin test is known to fail in the LFS chroot environment.</para>
-
+-->
     <para>Remove the temporary group:</para>
 
 <screen><userinput remap="test">sed -i '/dummy/d' /etc/group</userinput></screen>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index 16bb5f99f..5bf97ea43 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -40,7 +40,7 @@
 
   <sect2 role="installation">
     <title>Installation of GCC</title>
-
+<!--
     <para>At first, fix an issue breaking
     <filename class="libraryfile">libasan.a</filename> building this package
     with Glibc-2.34 or later:</para>
@@ -48,7 +48,7 @@
 <screen><userinput remap="pre">sed -e '/static.*SIGSTKSZ/d' \
     -e 's/return kAltStackSize/return SIGSTKSZ * 4/' \
     -i libsanitizer/sanitizer_common/sanitizer_posix_libcdep.cpp</userinput></screen>
-
+-->
     <para>If building on x86_64, change the default directory name for 64-bit
     libraries to <quote>lib</quote>:</para>
 
@@ -135,15 +135,6 @@ su tester -c "PATH=$PATH make -k check"</userinput></screen>
     <!-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101081 -->
     <para>Eight tests related to analyzer are known to fail.</para>
 
-    <!-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101751 -->
-    <para>One test named <filename>asan_test.C</filename> is known to
-    fail.</para>
-
-    <!-- https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100117 -->
-    <para>In libstdc++, one test named <filename>49745.cc</filename> is
-    known to fail because the header dependencies in glibc have
-    changed.</para>
-
     <para>In libstdc++, one numpunct test and six tests related to get_time are
     known to fail.  These are all because the locale definitions in glibc have
     changed but libstdc++ does not currently support those changes.</para>
diff --git a/packages.ent b/packages.ent
index 60d7a6f61..37daba503 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,10 +58,10 @@
 <!ENTITY bash-fin-du "50 MB">
 <!ENTITY bash-fin-sbu "1.5 SBU">
 
-<!ENTITY bc-version "5.2.3">
+<!ENTITY bc-version "5.2.4">
 <!ENTITY bc-size "428 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "804afda772aad9f8dd77847f8944a17d">
+<!ENTITY bc-md5 "a2592b0cd87e383c3b594d3ccc515272">
 <!ENTITY bc-home "https://git.yzena.com/gavin/bc">
 <!ENTITY bc-fin-du "7.1 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -104,10 +104,10 @@
 <!ENTITY check-fin-du "12 MB">
 <!ENTITY check-fin-sbu "0.1 SBU (about 3.8 SBU with tests)">
 
-<!ENTITY coreutils-version "9.0">
-<!ENTITY coreutils-size "5,482 KB">
+<!ENTITY coreutils-version "9.1">
+<!ENTITY coreutils-size "5,570 KB">
 <!ENTITY coreutils-url "&gnu;coreutils/coreutils-&coreutils-version;.tar.xz">
-<!ENTITY coreutils-md5 "0d79ae8a6124546e3b94171375e5e5d0">
+<!ENTITY coreutils-md5 "8b1ca4e018a7dce9bb937faec6618671">
 <!ENTITY coreutils-home "&gnu-software;coreutils/">
 <!ENTITY coreutils-tmp-du "158 MB">
 <!ENTITY coreutils-tmp-sbu "0.6 SBU">
@@ -148,10 +148,10 @@
 <!ENTITY e2fsprogs-fin-du "93 MB">
 <!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.3 SBU on an SSD">
 
-<!ENTITY elfutils-version "0.186"> <!-- libelf -->
-<!ENTITY elfutils-size "9,015 KB">
+<!ENTITY elfutils-version "0.187"> <!-- libelf -->
+<!ENTITY elfutils-size "9,024 KB">
 <!ENTITY elfutils-url "https://sourceware.org/ftp/elfutils/&elfutils-version;/elfutils-&elfutils-version;.tar.bz2">
-<!ENTITY elfutils-md5 "2c095e31e35d6be7b3718477b6d52702">
+<!ENTITY elfutils-md5 "cc04f07b53a71616b22553c0a458cf4b">
 <!ENTITY elfutils-home "https://sourceware.org/elfutils/">
 <!ENTITY elfutils-fin-du "116 MB">
 <!ENTITY elfutils-fin-sbu "0.9 SBU">
@@ -217,11 +217,11 @@
 <!ENTITY gawk-fin-du "43 MB">
 <!ENTITY gawk-fin-sbu "0.4 SBU">
 
-<!ENTITY gcc-version "11.2.0">
-<!ENTITY gcc-size "78,996 KB">
+<!ENTITY gcc-version "11.3.0">
+<!ENTITY gcc-size "79,240 KB">
 <!ENTITY gcc-url "&gnu;gcc/gcc-&gcc-version;/gcc-&gcc-version;.tar.xz">
-<!ENTITY gcc-md5 "31c86f2ced76acac66992eeedce2fce2">
-<!ENTITY gcc-sha256 "d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b">
+<!ENTITY gcc-md5 "4ee3e8c4c99e7b3444eb79f00f5f7a7e">
+<!ENTITY gcc-sha256 "b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39">
 <!ENTITY gcc-home "https://gcc.gnu.org/">
 <!ENTITY gcc-tmpp1-du "3.3 GB">
 <!ENTITY gcc-tmpp1-sbu "11 SBU">
@@ -353,10 +353,10 @@
 <!ENTITY iproute2-fin-du "15 MB">
 <!ENTITY iproute2-fin-sbu "0.2 SBU">
 
-<!ENTITY jinja2-version "3.1.1">
-<!ENTITY jinja2-size "261 KB">
+<!ENTITY jinja2-version "3.1.2">
+<!ENTITY jinja2-size "262 KB">
 <!ENTITY jinja2-url "https://files.pythonhosted.org/packages/source/J/Jinja2/Jinja2-&jinja2-version;.tar.gz">
-<!ENTITY jinja2-md5 "964afcd0853f67f20f7b2e34e5935564">
+<!ENTITY jinja2-md5 "d31148abd89c1df1cdb077a55db27d02">
 <!ENTITY jinja2-home "https://jinja.palletsprojects.com/en/3.0.x/">
 <!ENTITY jinja2-fin-du "3.7 MB">
 <!ENTITY jinja2-fin-sbu "less than 0.1 SBU">
@@ -409,10 +409,10 @@
 <!ENTITY libffi-fin-du "10 MB">
 <!ENTITY libffi-fin-sbu "1.9 SBU">
 
-<!ENTITY libpipeline-version "1.5.5">
-<!ENTITY libpipeline-size "934 KB">
+<!ENTITY libpipeline-version "1.5.6">
+<!ENTITY libpipeline-size "954 KB">
 <!ENTITY libpipeline-url "&savannah;/releases/libpipeline/libpipeline-&libpipeline-version;.tar.gz">
-<!ENTITY libpipeline-md5 "3e725c76bfea1985e87e851ee50c2e29">
+<!ENTITY libpipeline-md5 "829c9ba46382b0b3e12dd11fcbc1bb27">
 <!ENTITY libpipeline-home "http://libpipeline.nongnu.org/">
 <!ENTITY libpipeline-fin-du "9.7 MB">
 <!ENTITY libpipeline-fin-sbu "0.1 SBU">
@@ -427,12 +427,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "17">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "5">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "125,417 KB">
+<!ENTITY linux-size "125,421 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "965ff63d08de58223d7f1717b9bb5be8">
+<!ENTITY linux-md5 "2d9d725a716d27c82ea31d2b4e802158">
 <!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,
@@ -490,10 +490,10 @@
 <!ENTITY markupsafe-fin-du "520 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.62.0">
-<!ENTITY meson-size "1,986 KB">
+<!ENTITY meson-version "0.62.1">
+<!ENTITY meson-size "1,988 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "2b8c86273f9f94aada9adcce895861d8">
+<!ENTITY meson-md5 "2f5301d0e7fd5544ab0004393ba44cbe">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "41 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -657,10 +657,10 @@
 <!ENTITY systemd-fin-du   "273 MB">
 <!ENTITY systemd-fin-sbu  "2.2 SBU">
 
-<!ENTITY sysvinit-version "3.02">
-<!ENTITY sysvinit-size "215 KB">
+<!ENTITY sysvinit-version "3.04">
+<!ENTITY sysvinit-size "216 KB">
 <!ENTITY sysvinit-url "&savannah;/releases/sysvinit/sysvinit-&sysvinit-version;.tar.xz">
-<!ENTITY sysvinit-md5 "db6ef4ee503211cb45cdd56735108942">
+<!ENTITY sysvinit-md5 "9a00e5f15dd2f038f10feee50677ebff">
 <!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
 <!ENTITY sysvinit-fin-du "1.4 MB">
 <!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
@@ -720,13 +720,13 @@
 <!ENTITY util-linux-fin-du "261 MB">
 <!ENTITY util-linux-fin-sbu "1.1 SBU">
 
-<!ENTITY vim-version "8.2.4567">
+<!ENTITY vim-version "8.2.4814">
 <!ENTITY vim-majmin "82">
 <!ENTITY vim-docdir "vim/vim82">
-<!ENTITY vim-size "10,436 KB">
+<!ENTITY vim-size "10,486 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.xz">
-<!ENTITY vim-md5 "939fdfad067dec0e67bc4f8ad219cb4e">
+<!ENTITY vim-md5 "3ffc16fd72de90ab72f7d94dee30a806">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "206 MB">
 <!ENTITY vim-fin-sbu "2.4 SBU">
diff --git a/patches.ent b/patches.ent
index dbbfdc2a6..2bd68296b 100644
--- a/patches.ent
+++ b/patches.ent
@@ -21,13 +21,13 @@
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 
 <!ENTITY coreutils-i18n-patch "coreutils-&coreutils-version;-i18n-1.patch">
-<!ENTITY coreutils-i18n-patch-md5 "1eeba2736dfea013509f9975365e4e32">
+<!ENTITY coreutils-i18n-patch-md5 "c1ac7edf095027460716577633da9fc5">
 <!ENTITY coreutils-i18n-patch-size "166 KB">
-
+<!--
 <!ENTITY coreutils-chmod-patch "coreutils-&coreutils-version;-chmod_fix-1.patch">
 <!ENTITY coreutils-chmod-patch-md5 "4709df88e68279e6ef357aa819ba5b1a">
 <!ENTITY coreutils-chmod-patch-size "3.8 KB">
-
+-->
 <!--
 <!ENTITY flex-fixes-patch "flex-&flex-version;-upstream_fixes-3.patch">
 <!ENTITY flex-fixes-patch-md5 "b46f6b0380e502a3dfb8b503227cd680">
@@ -39,11 +39,11 @@
 <!ENTITY file-upstream-fixes-md5 "d99090db596b9db2bed869662199a56a">
 <!ENTITY file-upstream-fixes-patch-size "4.0 KB">
 -->
-
+<!--
 <!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-upstream_fixes-1.patch">
 <!ENTITY gcc-upstream-fixes-patch-md5 "27266d2a771f2ff812cb6ec9c8b456b4">
 <!ENTITY gcc-upstream-fixes-patch-size "18.0 KB">
-
+-->
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
-- 
cgit v1.2.3-54-g00ecf