From 0b1054551522a77af69069a96269436e9165230a Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 1 Aug 2021 11:58:29 -0500
Subject: [PATCH] Fackage updates and fixes. Remove unneeded sed commands from
 automake and coreutils. Update to linux-5.13.7. Update to e2fsprogs-1.46.3.

---
 chapter01/changelog.xml | 19 +++++++++++++++++++
 chapter08/automake.xml  |  4 ++--
 chapter08/coreutils.xml |  2 ++
 packages.ent            | 12 ++++++------
 4 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index ab574e5a5..59ebfd16b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -42,6 +42,25 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2021-08-01</para>
+      <itemizedlist>
+        <listitem>
+           <para>[bdubbs] - Remove unneeded sed commands from automake and
+           coreutils. Fixes 
+           <ulink url="&lfs-ticket-root;4895">#4895</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-5.13.7. Fixes
+          <ulink url="&lfs-ticket-root;4893">#4893</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.46.3. Fixes
+          <ulink url="&lfs-ticket-root;4896">#4896</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
 
     <listitem>
       <para>2021-07-27</para>
diff --git a/chapter08/automake.xml b/chapter08/automake.xml
index 33db7bcb9..b97ac9f4a 100644
--- a/chapter08/automake.xml
+++ b/chapter08/automake.xml
@@ -40,11 +40,11 @@
 
   <sect2 role="installation">
     <title>Installation of Automake</title>
-
+<!--
     <para>Fix a failing test:</para>
 
 <screen><userinput remap="pre">sed -i "s/''/etags/" t/tags-lisp-space.sh</userinput></screen>
-
+-->
     <para>Prepare Automake for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr --docdir=/usr/share/doc/automake-&automake-version;</userinput></screen>
diff --git a/chapter08/coreutils.xml b/chapter08/coreutils.xml
index c5d2a5032..ce2728fd6 100644
--- a/chapter08/coreutils.xml
+++ b/chapter08/coreutils.xml
@@ -56,9 +56,11 @@
    <!-- 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>Suppress a test which on some machines can loop forever:</para>
 
 <screen><userinput remap="pre">sed -i '/test.lock/s/^/#/' gnulib-tests/gnulib.mk</userinput></screen>
+-->
 <!--
 <para>Fix a problem with autoconf-2.70 in an included gnulib .m4 file:</para>
 
diff --git a/packages.ent b/packages.ent
index ddcd52b97..76c26c89c 100644
--- a/packages.ent
+++ b/packages.ent
@@ -140,10 +140,10 @@
 <!ENTITY diffutils-fin-du "33 MB">
 <!ENTITY diffutils-fin-sbu "0.4 SBU">
 
-<!ENTITY e2fsprogs-version "1.46.2">
-<!ENTITY e2fsprogs-size "9,2675 KB">
+<!ENTITY e2fsprogs-version "1.46.3">
+<!ENTITY e2fsprogs-size "9,2688 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "e8ef5fa3b72557be5e9fe564a25da6eb">
+<!ENTITY e2fsprogs-md5 "0edcffc4b601a4191bfa152f61b406b2">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-fin-du "102 MB">
 <!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.5 SBU on an SSD">
@@ -428,12 +428,12 @@
 
 <!ENTITY linux-major-version "5">
 <!ENTITY linux-minor-version "13">
-<!ENTITY linux-patch-version "4">
+<!ENTITY linux-patch-version "7">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "116,536 KB">
+<!ENTITY linux-size "116,544 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "50aa48ae38a736b3f313a777574af3d3">
+<!ENTITY linux-md5 "9bd74571c148a7753f5a237ba52f8ee5">
 <!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,