From cdf280e3373c65b8979a3d152d9b2b39003c39ff Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 31 Jan 2024 08:42:20 -0600
Subject: [PATCH] Package updates. Update to openssl-3.2.1. Update to
 zlib-1.3.1. Update to xz-5.4.6. Update to linux-6.7.2. Update to
 iana-etc-20240125. Update to binutils-2.42. Update to acl-2.3.2. Update
 upstream fixes for readline-8.2. Apply upstream fix for bash-5.2.21.

---
 chapter01/changelog.xml | 42 +++++++++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 12 +++++++----
 chapter03/patches.xml   | 10 +++++-----
 chapter08/bash.xml      |  4 ++++
 chapter08/binutils.xml  |  2 +-
 packages.ent            | 44 ++++++++++++++++++++---------------------
 patches.ent             | 10 +++++++---
 7 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index aba69a0de..d16a6181b 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,48 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-02-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.2.1. Fixes
+          <ulink url='&lfs-ticket-root;5425'>#5425</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to zlib-1.3.1. Fixes
+          <ulink url='&lfs-ticket-root;5419'>#5419</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to xz-5.4.6. Fixes
+          <ulink url='&lfs-ticket-root;5423'>#5423</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.7.2. Fixes
+          <ulink url='&lfs-ticket-root;5422'>#5422</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20240125. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.42. Fixes
+          <ulink url='&lfs-ticket-root;5424'>#5424</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to acl-2.3.2. Fixes
+          <ulink url='&lfs-ticket-root;5421'>#5421</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update upstream fixes for readline-8.2. Fixes
+          <ulink url='&lfs-ticket-root;5420'>#5420</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Apply upstream fix for bash-5.2.21. Fixes
+          <ulink url='&lfs-ticket-root;5420'>#5420</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-01-21</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 2dd0a8d02..ceca1c108 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -26,9 +26,9 @@
     <!--<listitem>
     <para>None</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Acl-&acl-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Attr-&attr-version;</para>
     </listitem>
@@ -44,9 +44,9 @@
     <listitem>
       <para>Bc-&bc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bison-&bison-version;</para>
     </listitem>-->
@@ -290,6 +290,10 @@
     <title>Added:</title>
     <listitem><para></para></listitem>  <!-- satisfy build -->
 
+    <listitem>
+      <para>&bash-upstream-fixes-patch;</para>
+    </listitem>
+
     <listitem>
       <para>setuptools-&setuptools-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 50ff56a6f..106527518 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -27,14 +27,14 @@
     </varlistentry>
 -->
 
-<!--    <varlistentry>
-      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
+    <varlistentry>
+      <term>Bash Upstream Fixes Patch - <token>&bash-upstream-fixes-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&bash-upstream-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
--->
+
 <!--
     <varlistentry>
       <term>Binutils LTO Fix Patch - <token>&binutils-lto-patch-size;</token>:</term>
diff --git a/chapter08/bash.xml b/chapter08/bash.xml
index 2656d8ca3..4e7a418f5 100644
--- a/chapter08/bash.xml
+++ b/chapter08/bash.xml
@@ -40,6 +40,10 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
+    <para>First, fix some issues identified upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-upstream-fixes-patch;</userinput></screen>
+
     <para>Prepare Bash for compilation:</para>
 
     <screen><userinput remap="configure">./configure --prefix=/usr             \
diff --git a/chapter08/binutils.xml b/chapter08/binutils.xml
index d5e19c84b..0d770a6c8 100644
--- a/chapter08/binutils.xml
+++ b/chapter08/binutils.xml
@@ -139,7 +139,7 @@ cd       build</userinput></screen>
     <option>--enable-default-pie</option> and
     <option>--enable-default-ssp</option> options are passed to GCC.</para>
 
-    <para>Three tests in the gprofng suite are also known to fail.</para>
+ <!--    <para>Three tests in the gprofng suite are also known to fail.</para>-->
 
     <para>Install the package:</para>
 
diff --git a/packages.ent b/packages.ent
index cfdbd2790..22e143878 100644
--- a/packages.ent
+++ b/packages.ent
@@ -13,10 +13,10 @@
      *-knl-*     Package info for Kernel stuff
 -->
 
-<!ENTITY acl-version "2.3.1">
-<!ENTITY acl-size "348 KB">
+<!ENTITY acl-version "2.3.2">
+<!ENTITY acl-size "363 KB">
 <!ENTITY acl-url "&savannah;/releases/acl/acl-&acl-version;.tar.xz">
-<!ENTITY acl-md5 "95ce715fe09acca7c12d3306d0f076b2">
+<!ENTITY acl-md5 "590765dee95907dbc3c856f7255bd669">
 <!ENTITY acl-home "&savannah-nongnu;/projects/acl">
 <!ENTITY acl-fin-du "6.1 MB">
 <!ENTITY acl-fin-sbu "less than 0.1 SBU">
@@ -65,10 +65,10 @@
 <!ENTITY bc-fin-du "7.7 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY binutils-version "2.41">
-<!ENTITY binutils-size "26,139 KB">
+<!ENTITY binutils-version "2.42">
+<!ENTITY binutils-size "26,922 KB">
 <!ENTITY binutils-url "https://sourceware.org/pub/binutils/releases/binutils-&binutils-version;.tar.xz">
-<!ENTITY binutils-md5 "256d7e0ad998e423030c84483a7c1e30">
+<!ENTITY binutils-md5 "a075178a9646551379bfb64040487715">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-tmpp1-du "647 MB">
 <!ENTITY binutils-tmpp1-sbu "1 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20240117">
-<!ENTITY iana-etc-size "596 KB">
+<!ENTITY iana-etc-version "20240125">
+<!ENTITY iana-etc-size "589 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 "215feb4b55043a6c18e84a5ed58b705f">
+<!ENTITY iana-etc-md5 "aed66d04de615d76c70890233081e584">
 <!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">
@@ -431,12 +431,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "7">
-<!ENTITY linux-patch-version "1">
+<!ENTITY linux-patch-version "2">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "138,096 KB">
+<!ENTITY linux-size "138,085 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "d8a7394e0e349dd373e9722e141c8b61">
+<!ENTITY linux-md5 "62b0a6c979a54569295d34ed57f47875">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.5.3 / gcc-13.2.0 on x86_64 with -j4 : minimum is
  allnoconfig + some configs we recommend for the users, rounded down to
@@ -539,10 +539,10 @@
 <!ENTITY ninja-fin-du "75 MB">
 <!ENTITY ninja-fin-sbu "0.3 SBU">
 
-<!ENTITY openssl-version "3.2.0">
-<!ENTITY openssl-size "17,284 KB">
+<!ENTITY openssl-version "3.2.1">
+<!ENTITY openssl-size "17,318 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "7903549a14abebc5c323ce4e85f2cbb2">
+<!ENTITY openssl-md5 "c239213887804ba00654884918b37441">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "587 MB">
 <!ENTITY openssl-fin-sbu "3.0 SBU">
@@ -765,24 +765,24 @@
 <!ENTITY xml-parser-fin-du "2.3 MB">
 <!ENTITY xml-parser-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY xz-version "5.4.5">
-<!ENTITY xz-size "1,642 KB">
-<!ENTITY xz-url "https://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "1d33e0be05c53e7a5641acf5c8b35fdd">
+<!ENTITY xz-version "5.4.6">
+<!ENTITY xz-size "1,645 KB">
+<!ENTITY xz-url "https://github.com/tukaani-project/xz/releases/download/v&xz-version;/xz-&xz-version;.tar.xz">
+<!ENTITY xz-md5 "7ade7bd1181a731328f875bec62a9377">
 <!ENTITY xz-home "https://tukaani.org/xz">
 <!ENTITY xz-tmp-du "22 MB">
 <!ENTITY xz-tmp-sbu "0.1 SBU">
 <!ENTITY xz-fin-du "24 MB">
 <!ENTITY xz-fin-sbu "0.1 SBU">
 
-<!ENTITY zlib-version "1.3">
-<!ENTITY zlib-size "1,461 KB">
+<!ENTITY zlib-version "1.3.1">
+<!ENTITY zlib-size "1,478 KB">
 <!-- DO NOT remove "fossils"!
      The upstream removes https://zlib.net/zlib-&zlib-version;.tar.xz
      once a newer version is released EVEN IF there is no security fixes.
      Unfortunately there is no .xz files in fossils directory.  -->
 <!ENTITY zlib-url "https://zlib.net/fossils/zlib-&zlib-version;.tar.gz">
-<!ENTITY zlib-md5 "60373b133d630f74f4a1f94c1185a53f">
+<!ENTITY zlib-md5 "9855b6d802d7fe5b7bd5b196a2271655">
 <!ENTITY zlib-home "https://zlib.net/">
 <!ENTITY zlib-fin-du "6.2 MB">
 <!ENTITY zlib-fin-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index bad5abff6..c2f957aad 100644
--- a/patches.ent
+++ b/patches.ent
@@ -2,6 +2,10 @@
 
 <!-- Start of Common Patches -->
 
+<!ENTITY bash-upstream-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
+<!ENTITY bash-upstream-fixes-patch-md5 "2d1691a629c558e894dbb78ee6bf34ef">
+<!ENTITY bash-upstream-fixes-patch-size "5.9 KB">
+
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
@@ -26,9 +30,9 @@
 <!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
 <!ENTITY pkgconf-upstream-fix-patch-size "4 KB">
 
-<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-2.patch">
-<!ENTITY readline-fixes-patch-md5 "d2477ebe908cc99763d90dde7fd9549a">
-<!ENTITY readline-fixes-patch-size "5.7 KB">
+<!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
+<!ENTITY readline-fixes-patch-md5 "9ed497b6cb8adcb8dbda9dee9ebce791">
+<!ENTITY readline-fixes-patch-size "13 KB">
 
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "17ffccbb8e18c39e8cedc32046f3a475">