Package updates

Update to gawk-5.1.1.
Update to meson-0.60.0.
Update to libcap-2.60.
Update to gdbm-1.22.
Update to file-5.41.
Update to linux-5.14.15.
Update to iana-etc-20211025.
Update to tzdata-2021e.

Change /bin to /usr/bin in passwd, and revisedchroot.
Fix systemd for new meson.

11 files changed, 129 insertions, 86 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index b52723164..df2d03e0c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,44 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
     <listitem>
+      <para>2021-11-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to gawk-5.1.1. Fixes
+          <ulink url="&lfs-ticket-root;4946">#4946</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-0.60.0. Fixes
+          <ulink url="&lfs-ticket-root;4945">#4945</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.60. Fixes
+          <ulink url="&lfs-ticket-root;4944">#4944</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to gdbm-1.22. Fixes
+          <ulink url="&lfs-ticket-root;4943">#4943</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to file-5.41. Fixes
+          <ulink url="&lfs-ticket-root;4942">#4942</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.14.15. Fixes
+          <ulink url="&lfs-ticket-root;4941">#4941</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20211025. Fixes
+          <ulink url="&lfs-ticket-root;4940">#4940</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to tzdata-2021e. Fixes
+          <ulink url="&lfs-ticket-root;4939">#4939</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2021-10-15</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8ee6fae1d..e50392e46 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -84,28 +84,28 @@
     <!--<listitem>
        <para>Expect-&expect-version;</para>
     </listitem>-->
-   <!--<listitem>
+   <listitem>
        <para>File-&file-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Findutils-&findutils-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Flex-&flex-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Gawk-&gawk-version;</para>
-    </listitem>-->
-   <!--<listitem>
+    </listitem>
+    <!--<listitem>
        <para>GCC-&gcc-version;</para>
     </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>
@@ -114,19 +114,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>
@@ -135,7 +135,7 @@
     <!--<listitem>
       <para>Intltool-&intltool-version;</para>
     </listitem>-->
-   <listitem>
+    <listitem>
       <para>IPRoute2-&iproute2-version;</para>
     </listitem>
     <listitem revision="systemd">
@@ -144,22 +144,22 @@
     <!--<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>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Libffi-&libffi-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -168,10 +168,10 @@
     <!--<listitem>
       <para>Libtool-&libtool-version;</para>
     </listitem>-->
-   <listitem>
+    <listitem>
       <para>Linux-&linux-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -180,13 +180,13 @@
     <!--<listitem>
       <para>Man-DB-&man-db-version;</para>
     </listitem>-->
-   <!--<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>
@@ -201,13 +201,13 @@
     <!--<listitem>
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Openssl-&openssl-version;</para>
     </listitem>-->
     <!--<listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Perl-&perl-version;</para>
     </listitem>-->
     <!--<listitem>
@@ -228,16 +228,16 @@
     <!--<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">
+    <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
     </listitem>
     <!--<listitem>
@@ -246,16 +246,16 @@
     <!--<listitem>
       <para>Tcl-&tcl-version;</para>
     </listitem>-->
-   <!--<listitem>
+    <!--<listitem>
       <para>Texinfo-&texinfo-version;</para>
     </listitem>-->
     <listitem>
       <para>Tzdata-&tzdata-version;</para>
     </listitem>
-   <!--<listitem>
+    <!--<listitem>
       <para>Util-Linux-&util-linux-version;</para>
     </listitem>-->
-   <listitem>
+    <listitem>
       <para>Vim-&vim-version;</para>
     </listitem>
     <!--<listitem>
@@ -267,7 +267,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 8921684ce..3087d8ffa 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -59,7 +59,7 @@
         <para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+<!--
     <varlistentry>
       <term>File Upstream Fixes Patch - <token>&file-upstream-fixes-patch-size;</token>:</term>
       <listitem>
@@ -67,7 +67,7 @@
         <para>MD5 sum: <literal>&file-upstream-fixes-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter07/createfiles.xml b/chapter07/createfiles.xml
index 79fdaaf97..85d24c6a6 100644
--- a/chapter07/createfiles.xml
+++ b/chapter07/createfiles.xml
@@ -61,30 +61,30 @@ EOF</userinput></screen>
   command:</para>
 
 <screen revision="sysv"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
-<literal>root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/dev/null:/bin/false
-daemon:x:6:6:Daemon User:/dev/null:/bin/false
-messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/bin/false
-uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/bin/false
-nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
+<literal>root:x:0:0:root:/root:/usr/bin/bash
+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>
 EOF</userinput></screen>
 
 <screen revision="systemd"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
-<literal>root:x:0:0:root:/root:/bin/bash
-bin:x:1:1:bin:/dev/null:/bin/false
-daemon:x:6:6:Daemon User:/dev/null:/bin/false
-messagebus:x:18:18:D-Bus Message Daemon User:/run/dbus:/bin/false
-systemd-bus-proxy:x:72:72:systemd Bus Proxy:/:/bin/false
-systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/bin/false
-systemd-journal-remote:x:74:74:systemd Journal Remote:/:/bin/false
-systemd-journal-upload:x:75:75:systemd Journal Upload:/:/bin/false
-systemd-network:x:76:76:systemd Network Management:/:/bin/false
-systemd-resolve:x:77:77:systemd Resolver:/:/bin/false
-systemd-timesync:x:78:78:systemd Time Synchronization:/:/bin/false
-systemd-coredump:x:79:79:systemd Core Dumper:/:/bin/false
-uuidd:x:80:80:UUID Generation Daemon User:/dev/null:/bin/false
-systemd-oom:x:81:81:systemd Out Of Memory Daemon:/:/bin/false
-nobody:x:99:99:Unprivileged User:/dev/null:/bin/false</literal>
+<literal>root:x:0:0:root:/root:/usr/bin/bash
+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
+systemd-bus-proxy:x:72:72:systemd Bus Proxy:/:/usr/bin/false
+systemd-journal-gateway:x:73:73:systemd Journal Gateway:/:/usr/bin/false
+systemd-journal-remote:x:74:74:systemd Journal Remote:/:/usr/bin/false
+systemd-journal-upload:x:75:75:systemd Journal Upload:/:/usr/bin/false
+systemd-network:x:76:76:systemd Network Management:/:/usr/bin/false
+systemd-resolve:x:77:77:systemd Resolver:/:/usr/bin/false
+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>
 EOF</userinput></screen>
 
   <para>The actual password for <systemitem class="username">root</systemitem>
@@ -175,7 +175,7 @@ EOF</userinput></screen>
   user. We add this user here and delete this account at the end of that
   chapter.</para>
 
-<screen><userinput>echo "tester:x:101:101::/home/tester:/bin/bash" &gt;&gt; /etc/passwd
+<screen><userinput>echo "tester:x:101:101::/home/tester:/usr/bin/bash" &gt;&gt; /etc/passwd
 echo "tester:x:101:" &gt;&gt; /etc/group
 install -o tester -d /home/tester</userinput></screen>
 
@@ -185,7 +185,7 @@ install -o tester -d /home/tester</userinput></screen>
   files have been created, user name and group name resolution will now
   work:</para>
 
-<screen role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+<screen role="nodump"><userinput>exec /usr/bin/bash --login +h</userinput></screen>
 
   <para>Note the use of the <parameter>+h</parameter> directive. This tells
   <command>bash</command> not to use its internal path hashing. Without this
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index 699a24e43..36bbcf0d9 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -94,7 +94,7 @@ EOF</userinput></screen>
     <para>Run the newly compiled <command>bash</command> program (replacing the one that is
     currently being executed):</para>
 
-<screen role="nodump"><userinput>exec /bin/bash --login +h</userinput></screen>
+ <screen role="nodump"><userinput>exec /usr/bin/bash --login +h</userinput></screen>
 
     <note>
       <para>The parameters used make the <command>bash</command>
diff --git a/chapter08/file.xml b/chapter08/file.xml
index 8baf349b1..eb9f41a2b 100644
--- a/chapter08/file.xml
+++ b/chapter08/file.xml
@@ -41,10 +41,6 @@
   <sect2 role="installation">
     <title>Installation of File</title>
 
-    <para>First, fix a few regressions in File:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../file-&file-version;-upstream_fixes-1.patch</userinput></screen>
-
     <para>Prepare File for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter08/gcc.xml b/chapter08/gcc.xml
index fc8748fc3..a37e37774 100644
--- a/chapter08/gcc.xml
+++ b/chapter08/gcc.xml
@@ -105,7 +105,10 @@ cd       build</userinput></screen>
 
     <important>
       <para>In this section, the test suite for GCC is considered
-      critical. Do not skip it under any circumstance.</para>
+      important, but it takes a long time. First time builders are 
+      encouraged to not skip it.  The time to run the tests can be
+      reduced significantly by adding -jx to the make command below
+      where x is the number of cores on your system.</para>
     </important>
 
    <para>One set of tests in the GCC test suite is known to exhaust the default
diff --git a/chapter08/revisedchroot.xml b/chapter08/revisedchroot.xml
index 3071240af..bc519d491 100644
--- a/chapter08/revisedchroot.xml
+++ b/chapter08/revisedchroot.xml
@@ -24,7 +24,7 @@ chroot "$LFS" /usr/bin/env -i          \
     HOME=/root TERM="$TERM"            \
     PS1='(lfs chroot) \u:\w\$ '        \
     PATH=/usr/bin:/usr/sbin            \
-    /bin/bash --login</userinput></screen>
+    /usr/bin/bash --login</userinput></screen>
 
   <para>Here the <parameter>+h</parameter> option is not used anymore, since
   all the previous programs have been replaced: hashing is therefore
diff --git a/chapter08/systemd.xml b/chapter08/systemd.xml
index f003a1c47..46719cc27 100644
--- a/chapter08/systemd.xml
+++ b/chapter08/systemd.xml
@@ -56,9 +56,13 @@
     <systemitem class="groupname">sgx</systemitem>, from the default udev
     rules:</para>
 
- <screen><userinput remap="pre"> sed -i -e 's/GROUP="render"/GROUP="video"/' \
+ <screen><userinput remap="pre">sed -i -e 's/GROUP="render"/GROUP="video"/' \
         -e 's/GROUP="sgx", //' rules.d/50-udev-default.rules.in</userinput></screen>
 
+    <para>Fix a mesaon problem:</para>
+
+ <screen><userinput remap="pre">sed -i 's/+ want_libfuzzer.*$/and want_libfuzzer/' meson.build</userinput></screen>
+
     <para>Prepare systemd for compilation:</para>
 
 <screen><userinput remap="configure">mkdir -p build
diff --git a/packages.ent b/packages.ent
index 6140150c9..709c03663 100644
--- a/packages.ent
+++ b/packages.ent
@@ -180,10 +180,10 @@
 <!ENTITY expect-tmp-du "3.9 MB">
 <!ENTITY expect-tmp-sbu "0.2 SBU">
 
-<!ENTITY file-version "5.40">
-<!ENTITY file-size "981 KB">
+<!ENTITY file-version "5.41">
+<!ENTITY file-size "1040 KB">
 <!ENTITY file-url "https://astron.com/pub/file/file-&file-version;.tar.gz">
-<!ENTITY file-md5 "72540ea1cc8c6e1dee35d6100ec66589">
+<!ENTITY file-md5 "18233bb0a0089dfdc7dfbc93b96f231b">
 <!ENTITY file-home "https://www.darwinsys.com/file/">
 <!ENTITY file-tmp-du "31 MB">
 <!ENTITY file-tmp-sbu "0.2 SBU">
@@ -208,10 +208,10 @@
 <!ENTITY flex-fin-du "32 MB">
 <!ENTITY flex-fin-sbu "0.4 SBU">
 
-<!ENTITY gawk-version "5.1.0">
-<!ENTITY gawk-size "3,081 KB">
+<!ENTITY gawk-version "5.1.1">
+<!ENTITY gawk-size "3,075 KB">
 <!ENTITY gawk-url "&gnu;gawk/gawk-&gawk-version;.tar.xz">
-<!ENTITY gawk-md5 "8470c34eeecc41c1aa0c5d89e630df50">
+<!ENTITY gawk-md5 "83650aa943ff2fd519b2abedf8506ace">
 <!ENTITY gawk-home "&gnu-software;gawk/">
 <!ENTITY gawk-tmp-du "43 MB">
 <!ENTITY gawk-tmp-sbu "0.2 SBU">
@@ -240,10 +240,10 @@
 <!ENTITY libstdcpp-tmpp2-du "1.1 GB">
 <!ENTITY libstdcpp-tmpp2-sbu "0.8 SBU">
 
-<!ENTITY gdbm-version "1.21">
-<!ENTITY gdbm-size "983 KB">
+<!ENTITY gdbm-version "1.22">
+<!ENTITY gdbm-size "1065 KB">
 <!ENTITY gdbm-url "&gnu;gdbm/gdbm-&gdbm-version;.tar.gz">
-<!ENTITY gdbm-md5 "a285c6e2dfed78668664c0555a7d202b">
+<!ENTITY gdbm-md5 "0bbd38f12656e4728e2f7c4708aec014">
 <!ENTITY gdbm-home "&gnu-software;gdbm/">
 <!ENTITY gdbm-fin-du "11 MB">
 <!ENTITY gdbm-fin-sbu "0.1 SBU">
@@ -321,10 +321,10 @@
 <!ENTITY gzip-fin-du "19 MB">
 <!ENTITY gzip-fin-sbu "0.1 SBU">
 
-<!ENTITY iana-etc-version "20211004">
+<!ENTITY iana-etc-version "20211025">
 <!ENTITY iana-etc-size "580 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 "7f174923f490329e2665ded727b1cc5c">
+<!ENTITY iana-etc-md5 "a286ad899ecefbb492d7b597ccb9e1ce">
 <!ENTITY iana-etc-home "https://www.iana.org/protocols">
 <!ENTITY iana-etc-fin-du "4.7 MB">
 <!ENTITY iana-etc-fin-sbu "less than 0.1 SBU">
@@ -394,10 +394,10 @@
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.59">
-<!ENTITY libcap-size "165 KB">
+<!ENTITY libcap-version "2.60">
+<!ENTITY libcap-size "167 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "585540ad79ee2692722877c0c528d165">
+<!ENTITY libcap-md5 "1eaaf6af4e0ebd638cd876644c8c68c4">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "3.2 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@@ -428,12 +428,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "14">
-<!ENTITY linux-patch-version "12">
+<!ENTITY linux-patch-version "15">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "117,880 KB">
+<!ENTITY linux-size "117,877 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "a52286fe206a3f7664ca5a6c5995b9ed">
+<!ENTITY linux-md5 "54c6f1371128e1a80dd700f52223aa64">
 <!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,
@@ -491,10 +491,10 @@
 <!ENTITY markupsafe-fin-du "516 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "0.59.2">
-<!ENTITY meson-size "1,907 KB">
+<!ENTITY meson-version "0.60.0">
+<!ENTITY meson-size "1,948 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "9d65e09b53b1dfab6339a0982176935d">
+<!ENTITY meson-md5 "a810ef49822de717d579413d30629648">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "40 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -697,10 +697,10 @@
 <!ENTITY texinfo-fin-du "112 MB">
 <!ENTITY texinfo-fin-sbu "0.6 SBU">
 
-<!ENTITY tzdata-version "2021c">
-<!ENTITY tzdata-size "412 KB">
+<!ENTITY tzdata-version "2021e">
+<!ENTITY tzdata-size "413 KB">
 <!ENTITY tzdata-url "https://www.iana.org/time-zones/repository/releases/tzdata&tzdata-version;.tar.gz">
-<!ENTITY tzdata-md5 "8c0ffa5162bca86eaa5ba1b4aec1a0fc">
+<!ENTITY tzdata-md5 "4fdfad906ebc85fef30221c10964cce9">
 <!ENTITY tzdata-home "https://www.iana.org/time-zones">
 
 <!ENTITY udev-lfs-version "udev-lfs-20171102">
diff --git a/patches.ent b/patches.ent
index d1277e9a1..03adb8998 100644
--- a/patches.ent
+++ b/patches.ent
@@ -30,9 +30,11 @@
 <!ENTITY flex-fixes-patch-size "3.4 KB">
 -->
 
+<!--
 <!ENTITY file-upstream-fixes-patch "file-&file-version;-upstream_fixes-1.patch">
 <!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">