From 1fde5b2617369cdf70948bcf07c217bb19c9be94 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Thu, 18 May 2023 13:36:37 -0500
Subject: [PATCH] Package updates. Update to util-linux-2.39. Update to
 linux-6.3.3. Update to libcap-2.69. Update to grep-3.11. Update to
 flit_core-3.9.0. Update to eudev-3.2.12.

---
 chapter01/changelog.xml  | 30 ++++++++++++++++++++++++++++++
 chapter01/whatsnew.xml   | 15 +++++++++------
 chapter07/util-linux.xml |  4 ++--
 chapter08/eudev.xml      |  4 ++--
 chapter08/util-linux.xml |  2 ++
 packages.ent             | 38 +++++++++++++++++++-------------------
 6 files changed, 64 insertions(+), 29 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 58c77b66b..08359561c 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,36 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2023-05-18</para>
+      <itemizedlist>
+        <listitem revision='sysv'>
+          <para>[bdubbs] - Update to util-linux-2.39.  Fixes
+          <ulink url='&lfs-ticket-root;5259'>#5259</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.3. Fixes
+          <ulink url='&lfs-ticket-root;5261'>#5261</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to libcap-2.69. Fixes
+          <ulink url='&lfs-ticket-root;5258'>#5258</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-3.11. Fixes
+          <ulink url='&lfs-ticket-root;5256'>#5256</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to flit_core-3.9.0. Fixes
+          <ulink url='&lfs-ticket-root;5257'>#5257</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to eudev-3.2.12. Fixes
+          <ulink url='&lfs-ticket-root;5260'>#5260</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2023-05-13</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 8c2bfda05..293fbb274 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -91,9 +91,9 @@
     <!--<listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
     </listitem>-->
-    <!--<listitem revision="sysv">
+    <listitem revision="sysv">
        <para>Eudev-&eudev-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
        <para>Expat-&expat-version;</para>
     </listitem>-->
@@ -109,6 +109,9 @@
     <!--<listitem>
       <para>Flex-&flex-version;</para>
     </listitem>-->
+    <listitem>
+      <para>Flit-core-&flit-core-version;</para>
+    </listitem>
     <!--<listitem>
       <para>Gawk-&gawk-version;</para>
     </listitem>-->
@@ -169,9 +172,9 @@
     <!--<listitem>
       <para>LFS-Bootscripts-&lfs-bootscripts-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Libcap-&libcap-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Libelf-&elfutils-version; (from elfutils)</para>
     </listitem>
@@ -268,9 +271,9 @@
     <!--<listitem>
       <para>Tzdata-&tzdata-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Util-Linux-&util-linux-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Vim-&vim-version;</para>
     </listitem>
diff --git a/chapter07/util-linux.xml b/chapter07/util-linux.xml
index 9adf2995c..2f88e7d5f 100644
--- a/chapter07/util-linux.xml
+++ b/chapter07/util-linux.xml
@@ -53,6 +53,7 @@
 
 <screen><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime    \
             --libdir=/usr/lib    \
+            --runstatedir=/run   \
             --docdir=/usr/share/doc/util-linux-&util-linux-version; \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -62,8 +63,7 @@
             --disable-runuser    \
             --disable-pylibmount \
             --disable-static     \
-            --without-python     \
-            runstatedir=/run</userinput></screen>
+            --without-python</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
diff --git a/chapter08/eudev.xml b/chapter08/eudev.xml
index f4c5ac5d2..c9b0e7617 100644
--- a/chapter08/eudev.xml
+++ b/chapter08/eudev.xml
@@ -39,11 +39,11 @@
 
   <sect2 role="installation">
     <title>Installation of Eudev</title>
-
+    <!-- No longer seems needed. bdubbs 5/18/23
     <para>First fix the location of udev rules in the .pc file:</para>
 
 <screen><userinput remap="pre">sed -i '/udevdir/a udev_dir=${udevdir}' src/udev/udev.pc.in</userinput></screen>
-
+-->
     <para>Prepare Eudev for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr           \
diff --git a/chapter08/util-linux.xml b/chapter08/util-linux.xml
index 44d55697d..7a21e2a1a 100644
--- a/chapter08/util-linux.xml
+++ b/chapter08/util-linux.xml
@@ -47,6 +47,7 @@
 <screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --bindir=/usr/bin    \
             --libdir=/usr/lib    \
+            --runstatedir=/run   \
             --sbindir=/usr/sbin  \
             --disable-chfn-chsh  \
             --disable-login      \
@@ -64,6 +65,7 @@
 <screen revision="systemd"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime \
             --bindir=/usr/bin    \
             --libdir=/usr/lib    \
+            --runstatedir=/run   \
             --sbindir=/usr/sbin  \
             --disable-chfn-chsh  \
             --disable-login      \
diff --git a/packages.ent b/packages.ent
index 88a61d6d2..9615dc893 100644
--- a/packages.ent
+++ b/packages.ent
@@ -156,10 +156,10 @@
 <!ENTITY elfutils-fin-du "120 MB">
 <!ENTITY elfutils-fin-sbu "0.3 SBU">
 
-<!ENTITY eudev-version "3.2.11">
-<!ENTITY eudev-size "2,075 KB">
+<!ENTITY eudev-version "3.2.12">
+<!ENTITY eudev-size "2,145 KB">
 <!ENTITY eudev-url "https://github.com/eudev-project/eudev/releases/download/v&eudev-version;/eudev-&eudev-version;.tar.gz">
-<!ENTITY eudev-md5 "417ba948335736d4d81874fba47a30f7">
+<!ENTITY eudev-md5 "6f1559ca7c27013ff68816e2732498a3">
 <!ENTITY eudev-fin-du "83 MB">
 <!ENTITY eudev-fin-sbu "0.1 SBU">
 
@@ -207,10 +207,10 @@
 <!ENTITY flex-fin-du "33 MB">
 <!ENTITY flex-fin-sbu "0.1 SBU">
 
-<!ENTITY flit-core-version "3.8.0">
-<!ENTITY flit-core-size "44 KB">
+<!ENTITY flit-core-version "3.9.0">
+<!ENTITY flit-core-size "41 KB">
 <!ENTITY flit-core-url "&pypi-src;/f/flit-core/flit_core-&flit-core-version;.tar.gz">
-<!ENTITY flit-core-md5 "7c41da13273f7787709a24f74e0f5a99">
+<!ENTITY flit-core-md5 "3bc52f1952b9a78361114147da63c35b">
 <!ENTITY flit-core-home "&pypi-home;/flit-core/">
 <!ENTITY flit-core-fin-du "736 KB">
 <!ENTITY flit-core-fin-sbu "less than 0.1 SBU">
@@ -289,10 +289,10 @@
 <!ENTITY gperf-fin-du "6.1 MB">
 <!ENTITY gperf-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "3.10">
-<!ENTITY grep-size "1,652 KB">
+<!ENTITY grep-version "3.11">
+<!ENTITY grep-size "1,664 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "ab3f063ad4596b7d094fb5f66cf327d6">
+<!ENTITY grep-md5 "7c9bbd74492131245f7cdb291fa142c0">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-tmp-du "25 MB">
 <!ENTITY grep-tmp-sbu "0.2 SBU">
@@ -398,10 +398,10 @@
 <!ENTITY lfs-bootscripts-cfg-du "BOOTSCRIPTS-INSTALL-KB KB">
 <!ENTITY lfs-bootscripts-cfg-sbu "less than 0.1 SBU">
 
-<!ENTITY libcap-version "2.68">
-<!ENTITY libcap-size "188 KB">
+<!ENTITY libcap-version "2.69">
+<!ENTITY libcap-size "185 KB">
 <!ENTITY libcap-url "&kernel;linux/libs/security/linux-privs/libcap2/libcap-&libcap-version;.tar.xz">
-<!ENTITY libcap-md5 "ffb9e9c87704f92ac75201327841e753">
+<!ENTITY libcap-md5 "4667bacb837f9ac4adb4a1a0266f4b65">
 <!ENTITY libcap-home "https://sites.google.com/site/fullycapable/">
 <!ENTITY libcap-fin-du "2.9 MB">
 <!ENTITY libcap-fin-sbu "less than 0.1 SBU">
@@ -432,12 +432,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "3">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "3">
 <!--<!ENTITY linux-version "&linux-major-version;.&linux-minor-version;">-->
 <!ENTITY linux-version "&linux-major-version;.&linux-minor-version;.&linux-patch-version;">
-<!ENTITY linux-size "133,704 KB">
+<!ENTITY linux-size "133,722 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "646d9e1f4f62d01f53dc2fd6b4ea9005">
+<!ENTITY linux-md5 "900468549dbd8cc9b44efd85d9e934e6">
 <!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,
@@ -711,11 +711,11 @@
 <!ENTITY udev-lfs-md5     "27cd82f9a61422e186b9d6759ddf1634">
 <!ENTITY udev-lfs-home    " ">
 
-<!ENTITY util-linux-minor "2.38">
-<!ENTITY util-linux-version "2.38.1"> <!-- 2.33.x -->
-<!ENTITY util-linux-size "7,321 KB">
+<!ENTITY util-linux-minor "2.39">
+<!ENTITY util-linux-version "2.39"> <!-- 2.33.x -->
+<!ENTITY util-linux-size "7,914 KB">
 <!ENTITY util-linux-url "&kernel;linux/utils/util-linux/v&util-linux-minor;/util-linux-&util-linux-version;.tar.xz">
-<!ENTITY util-linux-md5 "cd11456f4ddd31f7fbfdd9488c0c0d02">
+<!ENTITY util-linux-md5 "16579e594a8ef2e6236b38b9ab36cccf">
 <!ENTITY util-linux-home "https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/">
 <!ENTITY util-linux-tmp-du "150 MB">
 <!ENTITY util-linux-tmp-sbu "0.2 SBU">