From 87fbad76f17664bcfd92aa3272a4b432c10c3db7 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sat, 3 Jun 2023 17:48:12 -0500
Subject: [PATCH] Package updates. Update to iana-etc-20230524. Update to
 MarkupSafe-2.1.3 (Python Module) Update to linux-6.3.5. Update to
 openssl-3.1.1. Update to meson-1.1.1. Update to diffutils-3.10. Update to
 bc-6.6.0.

---
 chapter01/changelog.xml | 35 ++++++++++++++++++++++++++++++++++-
 chapter01/whatsnew.xml  | 12 ++++++------
 general.ent             |  2 +-
 packages.ent            | 38 +++++++++++++++++++-------------------
 4 files changed, 60 insertions(+), 27 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2c0f240ac..481efe10a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,40 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2023-06-03</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230524.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem revision='systemd'>
+          <para>[bdubbs] - Update to MarkupSafe-2.1.3 (Python Module)
+          <ulink url='&lfs-ticket-root;5268'>#5268</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.3.5. Fixes
+          <ulink url='&lfs-ticket-root;5264'>#5264</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to openssl-3.1.1. Fixes
+          <ulink url='&lfs-ticket-root;5267'>#5267</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to meson-1.1.1. Fixes
+          <ulink url='&lfs-ticket-root;5266'>#5266</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to diffutils-3.10. Fixes
+          <ulink url='&lfs-ticket-root;5262'>#5262</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to bc-6.6.0. Fixes
+          <ulink url='&lfs-ticket-root;5263'>#5263</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision='sysv'>
       <para>2023-05-25</para>
       <itemizedlist>
@@ -49,7 +83,6 @@
       </itemizedlist>
     </listitem>
 
-
     <listitem>
       <para>2023-05-18</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 293fbb274..dbdc59ac9 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -85,9 +85,9 @@
     <!--<listitem revision="systemd">
       <para>D-Bus-&dbus-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Diffutils-&diffutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
        <para>E2fsprogs-&e2fsprogs-version;</para>
     </listitem>-->
@@ -202,9 +202,9 @@
     <listitem>
       <para>Man-pages-&man-pages-version;</para>
     </listitem>
-    <!--<listitem revision="systemd">
+    <listitem revision="systemd">
       <para>MarkupSafe-&markupsafe-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Meson-&meson-version;</para>
     </listitem>
@@ -220,9 +220,9 @@
     <!--<listitem>
       <para>Ninja-&ninja-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Openssl-&openssl-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Patch-&patch-version;</para>
     </listitem>-->
diff --git a/general.ent b/general.ent
index 1cc9fe030..912a360d6 100644
--- a/general.ent
+++ b/general.ent
@@ -91,7 +91,7 @@
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
-<!ENTITY min-kernel      "3.2">
+<!ENTITY min-kernel      "4.14">
 <!--
 <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
 <!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
diff --git a/packages.ent b/packages.ent
index 9615dc893..f086a44ae 100644
--- a/packages.ent
+++ b/packages.ent
@@ -58,10 +58,10 @@
 <!ENTITY bash-fin-du "52 MB">
 <!ENTITY bash-fin-sbu "1.2 SBU">
 
-<!ENTITY bc-version "6.5.0">
-<!ENTITY bc-size "452 KB">
+<!ENTITY bc-version "6.6.0">
+<!ENTITY bc-size "455 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "e4757f48340dfe74af0d5be7ea56f7c7">
+<!ENTITY bc-md5 "a148cbaaf8ff813b7289a00539e74a5f">
 <!ENTITY bc-home "https://git.gavinhoward.com/gavin/bc">
 <!ENTITY bc-fin-du "7.6 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
@@ -130,10 +130,10 @@
 <!ENTITY dejagnu-tmp-du "6.9 MB">
 <!ENTITY dejagnu-tmp-sbu "0.1 SBU">
 
-<!ENTITY diffutils-version "3.9">
-<!ENTITY diffutils-size "1,551 KB">
+<!ENTITY diffutils-version "3.10">
+<!ENTITY diffutils-size "1,587 KB">
 <!ENTITY diffutils-url "&gnu;diffutils/diffutils-&diffutils-version;.tar.xz">
-<!ENTITY diffutils-md5 "cf0a65266058bf22fe3feb69e57ffc5b">
+<!ENTITY diffutils-md5 "2745c50f6f4e395e7b7d52f902d075bf">
 <!ENTITY diffutils-home "&gnu-software;diffutils/">
 <!ENTITY diffutils-tmp-du "26 MB">
 <!ENTITY diffutils-tmp-sbu "0.2 SBU">
@@ -325,10 +325,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20230418">
+<!ENTITY iana-etc-version "20230524">
 <!ENTITY iana-etc-size "587 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 "284e39f1cfdc0870923e65fc99ac3de0">
+<!ENTITY iana-etc-md5 "16d24a6c990cc98fea65eec05738a5a5">
 <!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">
@@ -432,12 +432,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "3">
-<!ENTITY linux-patch-version "3">
+<!ENTITY linux-patch-version "5">
 <!--<!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,722 KB">
+<!ENTITY linux-size "133,718 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "900468549dbd8cc9b44efd85d9e934e6">
+<!ENTITY linux-md5 "9b517d394dc1446890b4b15bdf8afa9f">
 <!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,
@@ -484,18 +484,18 @@
 <!ENTITY man-pages-fin-du "32 MB">
 <!ENTITY man-pages-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY markupsafe-version "2.1.2">
+<!ENTITY markupsafe-version "2.1.3">
 <!ENTITY markupsafe-size "19 KB">
 <!ENTITY markupsafe-url "&pypi-src;/M/MarkupSafe/MarkupSafe-&markupsafe-version;.tar.gz">
-<!ENTITY markupsafe-md5 "02f337b98aef11bd0fee9c5ae860173b">
+<!ENTITY markupsafe-md5 "ca33f119bd0551ce15837f58bb180214">
 <!ENTITY markupsafe-home "https://palletsprojects.com/p/markupsafe/">
 <!ENTITY markupsafe-fin-du "544 KB">
 <!ENTITY markupsafe-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY meson-version "1.1.0">
-<!ENTITY meson-size "2,075 KB">
+<!ENTITY meson-version "1.1.1">
+<!ENTITY meson-size "2,076 KB">
 <!ENTITY meson-url "&github;/mesonbuild/meson/releases/download/&meson-version;/meson-&meson-version;.tar.gz">
-<!ENTITY meson-md5 "94ea898bcf799470878e60809be80467">
+<!ENTITY meson-md5 "0f810b31b26156989ac9321fa2063a04">
 <!ENTITY meson-home "https://mesonbuild.com">
 <!ENTITY meson-fin-du "41 MB">
 <!ENTITY meson-fin-sbu "less than 0.1 SBU">
@@ -534,10 +534,10 @@
 <!ENTITY ninja-fin-du "77 MB">
 <!ENTITY ninja-fin-sbu "0.3 SBU">
 
-<!ENTITY openssl-version "3.1.0">
-<!ENTITY openssl-size "15,164 KB">
+<!ENTITY openssl-version "3.1.1">
+<!ENTITY openssl-size "15,181 KB">
 <!ENTITY openssl-url "https://www.openssl.org/source/openssl-&openssl-version;.tar.gz">
-<!ENTITY openssl-md5 "f6c520aa2206d4d1fa71ea30b5e9a56d">
+<!ENTITY openssl-md5 "1864b75e31fb4a6e0a07fd832529add3">
 <!ENTITY openssl-home "https://www.openssl.org/">
 <!ENTITY openssl-fin-du "520 MB">
 <!ENTITY openssl-fin-sbu "3.2 SBU">