From c6550e11c86cf253a48910ede162a962a7d6b08d Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 11 Feb 2023 16:11:35 -0600
Subject: [PATCH] Package updates. Update to iana-etc-20230202. Update to
 zstd-1.5.4. Update to Python3-3.11.2. Update to e2fsprogs-1.47.0. Update to
 dbus-1.14.6. Update to linux-6.1.11. Update to libcap-2.67. Update to
 bc-6.2.4.

---
 chapter01/changelog.xml  | 38 ++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml   | 10 ++++----
 chapter03/patches.xml    |  2 ++
 chapter08/util-linux.xml |  4 +++-
 chapter08/zstd.xml       |  4 ----
 packages.ent             | 50 ++++++++++++++++++++--------------------
 patches.ent              |  3 ++-
 7 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 6f6819e6a..ca258f78e 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,44 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2023-02-11</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230202. Addresses 
+          <ulink url="&lfs-ticket-root;5006">#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zstd-1.5.4. Fixes
+          <ulink url="&lfs-ticket-root;5215">#5215</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to Python3-3.11.2. Fixes
+          <ulink url="&lfs-ticket-root;5214">#5214</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to e2fsprogs-1.47.0. Fixes
+          <ulink url="&lfs-ticket-root;5214">#5213</ulink>.</para>
+        </listitem>
+        <listitem revision="systemd">
+          <para>[bdubbs] - Update to dbus-1.14.6. Fixes
+          <ulink url="&lfs-ticket-root;5212">#5212</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.1.11. Fixes
+          <ulink url="&lfs-ticket-root;5210">#5210</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.67. Fixes
+          <ulink url="&lfs-ticket-root;5209">#5209</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-6.2.4. Fixes
+          <ulink url="&lfs-ticket-root;5207">#5207</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-02-07</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 2326b6a5c..cd9d32d26 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -274,9 +274,9 @@
     <listitem>
       <para>Zlib-&zlib-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Zstd-&zstd-version;</para>
-    </listitem>-->
+    </listitem>
   </itemizedlist>
 
   <!--<itemizedlist>
@@ -309,9 +309,9 @@
     <title>Removed:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
-    <!--<listitem>
-      <para>perl-5.34.0-upstream_fixes-1.patch</para>
-    </listitem>-->
+    <listitem>
+      <para>zstd-1.5.2-upstream_fixes-1.patch</para>
+    </listitem>
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 05b49d319..ae39a70bb 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -153,6 +153,7 @@
       </listitem>
     </varlistentry>
 -->
+<!--
     <varlistentry>
       <term>Zstd Upstream Fixes Patch - <token>&zstd-upstream-fixes-patch-size;</token>:</term>
       <listitem>
@@ -160,6 +161,7 @@
         <para>MD5 sum: <literal>&zstd-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
+-->
   </variablelist>
 
   <para>Total size of these patches: about <returnvalue/></para>
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 221743d3d..8290f87c2 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -101,7 +101,9 @@
 su tester -c "make -k check"</userinput></screen>
 
     <para>The <emphasis>hardlink</emphasis> tests will fail if the host's kernel
-    does not have the option CONFIG_CRYPTO_USER_API_HASH set.</para>
+    does not have the option CONFIG_CRYPTO_USER_API_HASH set. In addition,
+    two sub-tests from misc: mbsencode and one sub-test from script: replay are 
+    known to fail.</para>
 
     <para>Install the package:</para>
 
diff --git a/chapter08/zstd.xml b/chapter08/zstd.xml
index 902f982e4..ae793a34b 100644
--- a/chapter08/zstd.xml
+++ b/chapter08/zstd.xml
@@ -42,10 +42,6 @@
   <sect2 role="installation">
     <title>Installation of Zstd</title>
 
-    <para>Apply a patch to fix some issues identified by upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&zstd-upstream-fixes-patch;</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make prefix=/usr</userinput></screen>
diff --git a/packages.ent b/packages.ent
index 576ef6640..a2d388802 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,10 +58,10 @@
 <!ENTITY bash-fin-du "50 MB">
 <!ENTITY bash-fin-sbu "1.4 SBU">
 
-<!ENTITY bc-version "6.2.3">
-<!ENTITY bc-size "448 KB">
+<!ENTITY bc-version "6.2.4">
+<!ENTITY bc-size "447 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "897adcfd53f06135b884d71874a63069">
+<!ENTITY bc-md5 "5245ff400df17b66be7621c7a6498953">
 <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
 <!ENTITY bc-fin-du "7.4 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -114,10 +114,10 @@
 <!ENTITY coreutils-fin-du "159 MB">
 <!ENTITY coreutils-fin-sbu "2.8 SBU">
 
-<!ENTITY dbus-version "1.14.4">
-<!ENTITY dbus-size "1,337 KB">
+<!ENTITY dbus-version "1.14.6">
+<!ENTITY dbus-size "1,339 KB">
 <!ENTITY dbus-url "https://dbus.freedesktop.org/releases/dbus/dbus-&dbus-version;.tar.xz">
-<!ENTITY dbus-md5 "e36f0f160751fa7ce103782166852c6b">
+<!ENTITY dbus-md5 "e809d7aa905ad82adeaf1d59db5445b1">
 <!ENTITY dbus-home "https://www.freedesktop.org/wiki/Software/dbus">
 <!ENTITY dbus-fin-du "19 MB">
 <!ENTITY dbus-fin-sbu "0.2 SBU">
@@ -140,10 +140,10 @@
 <!ENTITY diffutils-fin-du "35 MB">
 <!ENTITY diffutils-fin-sbu "0.6 SBU">
 
-<!ENTITY e2fsprogs-version "1.46.6">
-<!ENTITY e2fsprogs-size "9,400 KB">
+<!ENTITY e2fsprogs-version "1.47.0">
+<!ENTITY e2fsprogs-size "9,412 KB">
 <!ENTITY e2fsprogs-url "https://downloads.sourceforge.net/project/e2fsprogs/e2fsprogs/v&e2fsprogs-version;/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "ffcc9cbcc9fac7efe3e52d41e36099f3">
+<!ENTITY e2fsprogs-md5 "6b4f18a33873623041857b4963641ee9">
 <!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net/">
 <!ENTITY e2fsprogs-fin-du "94 MB">
 <!ENTITY e2fsprogs-fin-sbu "4.4 SBU on a spinning disk, 1.2 SBU on an SSD">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20230109">
+<!ENTITY iana-etc-version "20230202">
 <!ENTITY iana-etc-size "586 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 "5ea005b6c179b6ff166d1cb6f6a46b6c">
+<!ENTITY iana-etc-md5 "e64685d046cd0dfe94b5c66e294cf9ef">
 <!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">
@@ -390,10 +390,10 @@
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.66">
-<!ENTITY libcap-size "178 KB">
+<!ENTITY libcap-version "2.67">
+<!ENTITY libcap-size "183 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "00afd6e13bc94b2543b1a70770bdb41f">
+<!ENTITY libcap-md5 "06333f4301657298890fd8d6f1fb4793">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "2.7 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@@ -424,12 +424,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "1">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-patch-version "11">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "131,632 KB">
+<!ENTITY linux-size "131,653 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "ab1ac5556bd2c808e62bde0db04915f6">
+<!ENTITY linux-md5 "f91621912cd58ac6d4128d4057980e7d">
 <!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,
@@ -588,19 +588,19 @@
 <!-- If python minor version changes, updates in python and
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.11.1">
+<!ENTITY python-version "3.11.2">
 <!ENTITY python-minor "3.11">
-<!ENTITY python-size "19,392 KB">
+<!ENTITY python-size "19,428 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "4efe92adf28875c77d3b9b2e8d3bc44a">
+<!ENTITY python-md5 "a957cffb58a89303b62124896881950b">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-tmp-du "364 MB">
 <!ENTITY python-tmp-sbu "0.9 SBU">
 <!ENTITY python-fin-du "283 MB">
 <!ENTITY python-fin-sbu "3.4 SBU">
 <!ENTITY python-docs-url "https://www.python.org/ftp/python/doc/&python-version;/python-&python-version;-docs-html.tar.bz2">
-<!ENTITY python-docs-md5 "32f5cd7d63adf58ca4e0687dc530ce8b">
-<!ENTITY python-docs-size "7,522 KB">
+<!ENTITY python-docs-md5 "eb4132c780b60b5782a4f66b29b08d5c">
+<!ENTITY python-docs-size "7,598 KB">
 
 <!ENTITY readline-version "8.2">
 <!ENTITY readline-soversion "8.2"><!-- used for stripping -->
@@ -762,10 +762,10 @@
 <!ENTITY zlib-fin-du "6.1 MB">
 <!ENTITY zlib-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY zstd-version "1.5.2">
-<!ENTITY zstd-size "1,892 KB">
+<!ENTITY zstd-version "1.5.4">
+<!ENTITY zstd-size "2,111 KB">
 <!ENTITY zstd-url "https://github.com/facebook/zstd/releases/download/v&zstd-version;/zstd-&zstd-version;.tar.gz">
-<!ENTITY zstd-md5 "072b10f71f5820c24761a65f31f43e73">
+<!ENTITY zstd-md5 "2352b1f9ccc7446641046bb3d440c3ed">
 <!ENTITY zstd-home "https://facebook.github.io/zstd/">
 <!ENTITY zstd-fin-du "56 MB">
 <!ENTITY zstd-fin-sbu "1.1 SBU">
diff --git a/patches.ent b/patches.ent
index ba133d90b..6e66a4b59 100644
--- a/patches.ent
+++ b/patches.ent
@@ -101,7 +101,8 @@
 <!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788">
 <!ENTITY xz-upstream-fix-patch-size "3.7 KB">
 -->
+<!--
 <!ENTITY zstd-upstream-fixes-patch "zstd-&zstd-version;-upstream_fixes-1.patch">
 <!ENTITY zstd-upstream-fixes-patch-md5 "a7e576e3f87415fdf388392b257cdcf3">
 <!ENTITY zstd-upstream-fixes-patch-size "4 KB">
-
+-->