From 44c33588fd45ef0d632dcf87274faebace6c991b Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Wed, 31 Jul 2024 10:36:46 -0500
Subject: [PATCH] Package updates

Update to iana-etc-20240723.
Update to glibc-2.40.
Update to iproute2-6.10.0.
Update to linux-6.10.2.
Update to lz4-1.10.0.
Update to meson-1.5.1.
Update to setuptools-71.1.0.
Update to sysklogd-2.6.1.
Update to systemd-256.4.
Update to sysvinit-3.10.
---
 chapter01/changelog.xml | 46 +++++++++++++++++++++++++
 chapter01/whatsnew.xml  | 16 ++++-----
 chapter03/patches.xml   |  3 +-
 chapter08/glibc.xml     |  4 +--
 packages.ent            | 75 +++++++++++++++++++++--------------------
 patches.ent             |  4 +--
 6 files changed, 98 insertions(+), 50 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2a6c247ad..12d2f79f4 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,52 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-08-01</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20240723. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glibc-2.40. Fixes
+          <ulink url='&lfs-ticket-root;5529'>#5529</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iproute2-6.10.0. Fixes
+          <ulink url='&lfs-ticket-root;5523'>#5523</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.10.2. Fixes
+          <ulink url='&lfs-ticket-root;5521'>#5521</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to lz4-1.10.0. Fixes
+          <ulink url='&lfs-ticket-root;5528'>#5526</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-1.5.1. Fixes
+          <ulink url='&lfs-ticket-root;5527'>#5527</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to setuptools-71.1.0. Fixes
+          <ulink url='&lfs-ticket-root;5524'>#5524</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to sysklogd-2.6.1. Fixes
+          <ulink url='&lfs-ticket-root;5522'>#5522</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to systemd-256.4. Fixes
+          <ulink url='&lfs-ticket-root;5518'>#5518</ulink>.</para>
+        </listitem>
+        <listitem revision='sysv'>
+          <para>[bdubbs] - Update to sysvinit-3.10. Fixes
+          <ulink url='&lfs-ticket-root;5528'>#5528</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-07-15</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 728396d0a..11bad5db3 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -101,9 +101,9 @@
     <listitem>
       <para>Gettext-&gettext-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Glibc-&glibc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>GMP-&gmp-version;</para>
     </listitem>-->
@@ -167,9 +167,9 @@
     <listitem>
       <para>Linux-&linux-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Lz4-&lz4-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>M4-&m4-version;</para>
     </listitem>-->
@@ -239,9 +239,9 @@
     <listitem>
       <para>Systemd-&systemd-version;</para>
     </listitem>
-    <!--<listitem revision="sysv">
+    <listitem revision="sysv">
       <para>SysVinit-&sysvinit-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Tar-&tar-version;</para>
     </listitem>-->
@@ -254,9 +254,9 @@
     <!--<listitem>
       <para>Tzdata-&tzdata-version;</para>
     </listitem>-->
-    <!--<listitem revision="sysv">
+    <listitem revision="sysv">
       <para>Udev from Systemd-&systemd-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Util-linux-&util-linux-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 95d81b1de..b807d76f9 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -77,6 +77,7 @@
       </listitem>
     </varlistentry>
 -->
+<!--
     <varlistentry>
       <term>Glibc Upstream Fix Patch - <token>&glibc-upstream-patch-size;</token>:</term>
       <listitem>
@@ -84,7 +85,7 @@
         <para>MD5 sum: <literal>&glibc-upstream-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry>
       <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter08/glibc.xml b/chapter08/glibc.xml
index 21a73a35d..1f12e915a 100644
--- a/chapter08/glibc.xml
+++ b/chapter08/glibc.xml
@@ -49,11 +49,11 @@
     store their runtime data in the FHS-compliant locations:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
-
+<!--
     <para>Now fix a security vulnerability:</para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../&glibc-upstream-patch;</userinput></screen>
-
+-->
     <para>The Glibc documentation recommends building Glibc
     in a dedicated build directory:</para>
 
diff --git a/packages.ent b/packages.ent
index 26fcf7f5f..b02018b31 100644
--- a/packages.ent
+++ b/packages.ent
@@ -255,10 +255,10 @@
 <!ENTITY gettext-fin-du "250 MB">
 <!ENTITY gettext-fin-sbu "1.4 SBU">
 
-<!ENTITY glibc-version "2.39">
-<!ENTITY glibc-size "18,092 KB">
+<!ENTITY glibc-version "2.40">
+<!ENTITY glibc-size "18,313 KB">
 <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "be81e87f72b5ea2c0ffe2bedfeb680c6">
+<!ENTITY glibc-md5 "b390feef233022114950317f10c4fa97">
 <!ENTITY glibc-home "&gnu-software;libc/">
 <!ENTITY glibc-tmp-du "846 MB">
 <!ENTITY glibc-tmp-sbu "1.5 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20240701">
+<!ENTITY iana-etc-version "20240723">
 <!ENTITY iana-etc-size "590 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 "d9ce95852cab1024eae4e40bc9ba1b49">
+<!ENTITY iana-etc-md5 "0592f2c2051a9eac7611d5067113ef3d">
 <!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">
@@ -341,10 +341,10 @@
 <!ENTITY intltool-fin-du "1.5 MB">
 <!ENTITY intltool-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY iproute2-version "6.9.0">
-<!ENTITY iproute2-size "897 KB">
+<!ENTITY iproute2-version "6.10.0">
+<!ENTITY iproute2-size "900 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "0ca5c21a5a42157fbb88b39791963364">
+<!ENTITY iproute2-md5 "6282e47de9c5b230e83537fba7181c9c">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-fin-du "17 MB">
 <!ENTITY iproute2-fin-sbu "0.1 SBU">
@@ -430,30 +430,31 @@
 <!ENTITY libxcrypt-fin-sbu "0.1 SBU">
 
 <!ENTITY linux-major-version "6">
-<!ENTITY linux-minor-version "9">
-<!ENTITY linux-patch-version "9">
+<!ENTITY linux-minor-version "10">
+<!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 "140,754 KB">
+<!ENTITY linux-size "141,756 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "15bd6e9fea3d295a3919efe5495bc8b7">
+<!ENTITY linux-md5 "519d1120e7715120ebbe042fddccf67f">
 <!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
- allow ongoing cleanups; max is allmodconfig but IKHEADERS unset; typical
- is the "daily use" config for the workstation measuring the min/max values.
- The disk usage is the sum of the size of linux-6.5.3 directory and the
- installed kernel image & modules.  -->
-<!ENTITY linux-knl-du "1.8 - 10.6 GB (typically about 2 GB)">
-<!ENTITY linux-knl-sbu "0.6 - 20.4 SBU (typically about 1.4 SBU)">
+<!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : 
+ minimum is allnoconfig 
+ typical is defconfig 
+ max     is allyesconfig 
+ The disk usage is the sum of the size of linux-6.10.1 directory.  
+ It does not include an installed kernel or any modules.
+-->
+<!ENTITY linux-knl-du "1.7 - 14 GB (typically about 2.3 GB)">
+<!ENTITY linux-knl-sbu "0.4 - 32 SBU (typically about 2.5 SBU)">
 
 <!ENTITY linux-headers-tmp-du "1.5 GB">
 <!ENTITY linux-headers-tmp-sbu "less than 0.1 SBU">
 
-<!ENTITY lz4-version "1.9.4">
-<!ENTITY lz4-size "348 KB">
+<!ENTITY lz4-version "1.10.0">
+<!ENTITY lz4-size "379 KB">
 <!ENTITY lz4-url "&github;/lz4/lz4/releases/download/v&lz4-version;/lz4-&lz4-version;.tar.gz">
-<!ENTITY lz4-md5 "e9286adb64040071c5e23498bf753261">
+<!ENTITY lz4-md5 "dead9f5f1966d9ae56e1e32761e4e675">
 <!ENTITY lz4-home "https://lz4.org/">
 <!ENTITY lz4-fin-du "83 MB">
 <!ENTITY lz4-fin-sbu "0.1 SBU">
@@ -502,10 +503,10 @@
 <!ENTITY markupsafe-fin-du "508 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "1.5.0">
+<!ENTITY meson-version "1.5.1">
 <!ENTITY meson-size "2,205 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "caa086c7659cce6a4eb604f93793019c">
+<!ENTITY meson-md5 "c4f2b3e5ea632685f61ba1b833c4905c">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "42 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -636,10 +637,10 @@
 <!ENTITY sed-fin-du "30 MB">
 <!ENTITY sed-fin-sbu "0.3 SBU">
 
-<!ENTITY setuptools-version "70.3.0">
-<!ENTITY setuptools-size "2,279 KB">
+<!ENTITY setuptools-version "71.1.0">
+<!ENTITY setuptools-size "2,366 KB">
 <!ENTITY setuptools-url "&pypi-src;/s/setuptools/setuptools-&setuptools-version;.tar.gz">
-<!ENTITY setuptools-md5 "2ba75817d4b434bb6e3d67d48a808457">
+<!ENTITY setuptools-md5 "2d7f698adca86005a771f8709686d5e4">
 <!ENTITY setuptools-home "&pypi-home;/setuptools/">
 <!ENTITY setuptools-fin-du "20 MB">
 <!ENTITY setuptools-fin-sbu "less than 0.1 SBU">
@@ -652,22 +653,22 @@
 <!ENTITY shadow-fin-du "49 MB">
 <!ENTITY shadow-fin-sbu "0.1 SBU">
 
-<!ENTITY sysklogd-version "2.5.2">
-<!ENTITY sysklogd-size "449 KB">
+<!ENTITY sysklogd-version "2.6.1">
+<!ENTITY sysklogd-size "452 KB">
 <!ENTITY sysklogd-url "https://github.com/troglobit/sysklogd/releases/download/v&sysklogd-version;/sysklogd-&sysklogd-version;.tar.gz">
-<!ENTITY sysklogd-md5 "8d731aa7215a899f1070029c9794b423">
+<!ENTITY sysklogd-md5 "dcf0836a0fcc6568efaad230850d9c86">
 <!ENTITY sysklogd-home "https://www.infodrom.org/projects/sysklogd/">
 <!ENTITY sysklogd-fin-du "680 KB">
 <!ENTITY sysklogd-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY systemd-version  "256.1">
+<!ENTITY systemd-version  "256.4">
 <!--<!ENTITY systemd-stable   "6b4878d">-->
 <!-- The above entity is used whenever we move to a stable backport branch. In the event of a critical problem or kernel
      change that is incompatible, we will switch to the backport branch until the next stable release. -->
-<!ENTITY systemd-size     "15,277 KB">
+<!ENTITY systemd-size     "15,291 KB">
 <!ENTITY systemd-url      "&github;/systemd/systemd/archive/v&systemd-version;/systemd-&systemd-version;.tar.gz">
 <!--<!ENTITY systemd-url      "&anduin-sources;/systemd-&systemd-version;-&systemd-stable;.tar.xz">-->
-<!ENTITY systemd-md5      "46c30853682f8017df979c3d26b9c9dc">
+<!ENTITY systemd-md5      "03bd1ff158ec0bc55428c77a8f8495bd">
 <!ENTITY systemd-home     "https://www.freedesktop.org/wiki/Software/systemd/">
 <!ENTITY systemd-man-version "256.1">
 <!ENTITY systemd-man-size "676 KB">
@@ -677,10 +678,10 @@
 <!ENTITY systemd-fin-du   "247 MB">
 <!ENTITY systemd-fin-sbu  "0.7 SBU">
 
-<!ENTITY sysvinit-version "3.09">
-<!ENTITY sysvinit-size "234 KB">
+<!ENTITY sysvinit-version "3.10">
+<!ENTITY sysvinit-size "235 KB">
 <!ENTITY sysvinit-url "&github;/slicer69/sysvinit/releases/download/&sysvinit-version;/sysvinit-&sysvinit-version;.tar.xz">
-<!ENTITY sysvinit-md5 "688074f8642c955469a0b1ecae5c488b">
+<!ENTITY sysvinit-md5 "b8fbe11062cf16d3b6a3709b7f6978d2">
 <!ENTITY sysvinit-home "&savannah-nongnu;/projects/sysvinit">
 <!ENTITY sysvinit-fin-du "2.5 MB">
 <!ENTITY sysvinit-fin-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 8b29af8a5..3dc18d14c 100644
--- a/patches.ent
+++ b/patches.ent
@@ -21,11 +21,11 @@
 <!ENTITY glibc-fhs-patch "glibc-&glibc-version;-fhs-1.patch">
 <!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
 <!ENTITY glibc-fhs-patch-size "2.8 KB">
-
+<!--
 <!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fix-2.patch">
 <!ENTITY glibc-upstream-patch-md5 "e9f8f23746755bf880772cfa59c1896c">
 <!ENTITY glibc-upstream-patch-size "8.0 KB">
-
+-->
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">