From 96026a103a050853137c244a66145e7006092f17 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 12 Feb 2024 11:05:36 -0600
Subject: [PATCH] Package updates. Update to shadow-4.14.4. Update to
 setuptools-69.1.0 (Python module). Update to python-3.12.2. Update to
 pkgconf-2.1.1. Update to MarkupSafe-2.1.5 (Python module). Update to
 man-pages-6.06. Update to expat-2.6.0. Update to linux-6.7.4.

---
 chapter01/changelog.xml | 38 ++++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 16 ++++++--------
 chapter03/patches.xml   |  4 ++--
 chapter08/pkgconf.xml   |  5 -----
 packages.ent            | 48 ++++++++++++++++++++---------------------
 patches.ent             |  4 ----
 6 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 0a646f658..f7bd0c405 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>2024-02-12</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to shadow-4.14.4.  Fixes
+          <ulink url='&lfs-ticket-root;5437'>#5437</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to setuptools-69.1.0 (Python module).  Fixes
+          <ulink url='&lfs-ticket-root;5439'>#5439</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to python-3.12.2.  Fixes
+          <ulink url='&lfs-ticket-root;5434'>#5434</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to pkgconf-2.1.1.  Fixes
+          <ulink url='&lfs-ticket-root;5432'>#5432</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to MarkupSafe-2.1.5 (Python module).  Fixes
+          <ulink url='&lfs-ticket-root;5431'>#5431</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to man-pages-6.06.  Fixes
+          <ulink url='&lfs-ticket-root;5438'>#5438</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to expat-2.6.0.  Fixes
+          <ulink url='&lfs-ticket-root;5435'>#5435</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.7.4.  Fixes
+          <ulink url='&lfs-ticket-root;5433'>#5433</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision='systemd'>
       <para>2024-02-10</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index f7b9ed05c..d1cc11706 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -71,9 +71,9 @@
     <!--<listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
        <para>Expat-&expat-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
        <para>Expect-&expect-version;</para>
     </listitem>-->
@@ -176,9 +176,9 @@
     <listitem>
       <para>Man-DB-&man-db-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Man-pages-&man-pages-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>MarkupSafe-&markupsafe-version;</para>
     </listitem>
@@ -224,9 +224,9 @@
     <!--<listitem>
       <para>Sed-&sed-version;</para>
     </listitem>-->
-    <!--<listitem>  After version 12.1 release - see Added
+    <listitem>  <!-- After version 12.1 release - see Added -->
       <para>Setuptools-&setuptools-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Shadow-&shadow-version;</para>
     </listitem>
@@ -294,10 +294,6 @@
       <para>&bash-upstream-fixes-patch;</para>
     </listitem>
 
-    <listitem>
-      <para>&pkgconf-upstream-fix-patch;</para>
-    </listitem>
-
     <listitem>
       <para>&readline-fixes-patch;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c48e2ce0e..067dc9aea 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -117,7 +117,7 @@
       </listitem>
     </varlistentry>
 -->
-
+<!--
     <varlistentry>
       <term>Pkgconf Upstream Fix Patch - <token>&pkgconf-upstream-fix-patch-size;</token>:</term>
       <listitem>
@@ -125,7 +125,7 @@
         <para>MD5 sum: <literal>&pkgconf-upstream-fix-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/pkgconf.xml b/chapter08/pkgconf.xml
index 139e0c810..3e7e737fa 100644
--- a/chapter08/pkgconf.xml
+++ b/chapter08/pkgconf.xml
@@ -44,11 +44,6 @@
 
     <title>Installation of Pkgconf</title>
 
-    <!-- https://github.com/pkgconf/pkgconf/issues/317 -->
-    <para>Fix a regression in pkgconf-2.1.0 breaking BLFS packages:</para>
-
-    <screen><userinput remap="pre">patch -Np1 -i ../&pkgconf-upstream-fix-patch;</userinput></screen>
-
     <para>Prepare Pkgconf for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr              \
diff --git a/packages.ent b/packages.ent
index 6d319968a..ccff2c3f2 100644
--- a/packages.ent
+++ b/packages.ent
@@ -156,10 +156,10 @@
 <!ENTITY elfutils-fin-du "122 MB">
 <!ENTITY elfutils-fin-sbu "0.3 SBU">
 
-<!ENTITY expat-version "2.5.0">
-<!ENTITY expat-size "450 KB">
+<!ENTITY expat-version "2.6.0">
+<!ENTITY expat-size "473 KB">
 <!ENTITY expat-url "&sourceforge;expat/expat-&expat-version;.tar.xz">
-<!ENTITY expat-md5 "ac6677b6d1b95d209ab697ce8b688704">
+<!ENTITY expat-md5 "bd169cb11f4b9bdfddadf9e88a5c4d4b">
 <!ENTITY expat-home "https://libexpat.github.io/">
 <!ENTITY expat-fin-du "12 MB">
 <!ENTITY expat-fin-sbu "0.1 SBU">
@@ -431,12 +431,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "7">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "4">
 <!--<!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,128 KB">
+<!ENTITY linux-size "138,130 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "a542a2aea4db4cf09e932fff02c8d1d1">
+<!ENTITY linux-md5 "370e1b6155ae63133380e421146619e0">
 <!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
@@ -478,18 +478,18 @@
 <!ENTITY man-db-fin-du "40 MB">
 <!ENTITY man-db-fin-sbu "0.2 SBU">
 
-<!ENTITY man-pages-version "6.05.01">
-<!ENTITY man-pages-size "2,144 KB">
+<!ENTITY man-pages-version "6.06">
+<!ENTITY man-pages-size "2,116 KB">
 <!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "de4563b797cf9b1e0b0d73628b35e442">
+<!ENTITY man-pages-md5 "26b39e38248144156d437e1e10cb20bf">
 <!ENTITY man-pages-home "https://www.kernel.org/doc/man-pages/">
 <!ENTITY man-pages-fin-du "33 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY markupsafe-version "2.1.4">
-<!ENTITY markupsafe-size "20 KB">
+<!ENTITY markupsafe-version "2.1.5">
+<!ENTITY markupsafe-size "19 KB">
 <!ENTITY markupsafe-url "&pypi-src;/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
-<!ENTITY markupsafe-md5 "8138329a11cf4bd0f9db780b2af26c66">
+<!ENTITY markupsafe-md5 "8fe7227653f2fb9b1ffe7f9f2058998a">
 <!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
 <!ENTITY markupsafe-fin-du "548 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
@@ -571,10 +571,10 @@
 <!ENTITY perl-fin-du "239 MB">
 <!ENTITY perl-fin-sbu "7.1 SBU">
 
-<!ENTITY pkgconf-version "2.1.0">
+<!ENTITY pkgconf-version "2.1.1">
 <!ENTITY pkgconf-size "305 KB">
 <!ENTITY pkgconf-url "https://distfiles.ariadne.space/pkgconf/pkgconf-&pkgconf-version;.tar.xz">
-<!ENTITY pkgconf-md5 "0f2eadbb9dea5aed95147272ae1592cc">
+<!ENTITY pkgconf-md5 "bc29d74c2483197deb9f1f3b414b7918">
 <!ENTITY pkgconf-home "http://pkgconf.org/">
 <!ENTITY pkgconf-fin-du "4.6 MB">
 <!ENTITY pkgconf-fin-sbu "less than 0.1 SBU">
@@ -598,19 +598,19 @@
 <!-- If python minor version changes, updates in python and
      meson pages will be needed: python3.6 and python3.6m -->
 
-<!ENTITY python-version "3.12.1">
+<!ENTITY python-version "3.12.2">
 <!ENTITY python-minor "3.12">
-<!ENTITY python-size "20,102 KB">
+<!ENTITY python-size "20,109 KB">
 <!ENTITY python-url "https://www.python.org/ftp/python/&python-version;/Python-&python-version;.tar.xz">
-<!ENTITY python-md5 "50f827c800483776c8ef86e6a53831fa">
+<!ENTITY python-md5 "e7c178b97bf8f7ccd677b94d614f7b3c">
 <!ENTITY python-home "https://www.python.org/">
 <!ENTITY python-tmp-du "533 MB">
 <!ENTITY python-tmp-sbu "0.4 SBU">
 <!ENTITY python-fin-du "370 MB">
 <!ENTITY python-fin-sbu "1.9 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 "d5c21b804c219b06256495eae30fd153">
-<!ENTITY python-docs-size "7,998 KB">
+<!ENTITY python-docs-md5 "8a6310f6288e7f60c3565277ec3b5279">
+<!ENTITY python-docs-size "8,065 KB">
 
 <!ENTITY readline-version "8.2">
 <!ENTITY readline-soversion "8.2"><!-- used for stripping -->
@@ -631,18 +631,18 @@
 <!ENTITY sed-fin-du "30 MB">
 <!ENTITY sed-fin-sbu "0.3 SBU">
 
-<!ENTITY setuptools-version "69.0.3">
+<!ENTITY setuptools-version "69.1.0">
 <!ENTITY setuptools-size "2,168 KB">
 <!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-<!ENTITY setuptools-md5 "b82de45aaa6b9bb911226660212ebb83">
+<!ENTITY setuptools-md5 "6f6eb780ce12c90d81ce243747ed7ab0">
 <!ENTITY setuptools-home "&pypi-home;/setuptools/">
 <!ENTITY setuptools-fin-du "30 MB">
 <!ENTITY setuptools-fin-sbu "0.1 SBU">
 
-<!ENTITY shadow-version "4.14.3">
-<!ENTITY shadow-size "1,760 KB">
+<!ENTITY shadow-version "4.14.4">
+<!ENTITY shadow-size "1,764 KB">
 <!ENTITY shadow-url "&github;/shadow-maint/shadow/releases/download/&shadow-version;/shadow-&shadow-version;.tar.xz">
-<!ENTITY shadow-md5 "b9a7f56d0c63297c0d11d742be2f8ffd">
+<!ENTITY shadow-md5 "2189c4552a78c71010dd4ff2bc4ba1e4">
 <!ENTITY shadow-home "&github;/shadow-maint/shadow/">
 <!ENTITY shadow-fin-du "46 MB">
 <!ENTITY shadow-fin-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index b10f24414..17966e30c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -26,10 +26,6 @@
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
 
-<!ENTITY pkgconf-upstream-fix-patch "pkgconf-&pkgconf-version;-upstream_fix-1.patch">
-<!ENTITY pkgconf-upstream-fix-patch-md5 "77d5bb10840724a0e3dc08efee548363">
-<!ENTITY pkgconf-upstream-fix-patch-size "4 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">