From c97cd380ca58605b2b1ca3a4721770a2314bc562 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Tue, 14 Mar 2023 20:47:46 -0500
Subject: [PATCH 1/5] Package updates. Update to bc-6.4.0. Update to grep-3.9.
 Update to linux-6.2.6. Update to iana-etc-20230306.

---
 chapter01/changelog.xml | 21 +++++++++++++++++++++
 chapter01/whatsnew.xml  |  8 ++++----
 packages.ent            | 24 ++++++++++++------------
 3 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 20cf06f58..24634ea69 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,27 @@
     <listitem revision="sysv"> or <listitem revision="systemd"> as
     appropriate for the entry or if needed the entire day's listitem.
     -->
+    <listitem>
+      <para>2023-03-15</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bc-6.4.0.  Fixes
+          <ulink url='&lfs-ticket-root;5217'>#5217</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to grep-3.9.  Fixes
+          <ulink url='&lfs-ticket-root;5225'>#5225</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.2.6.  Fixes
+          <ulink url='&lfs-ticket-root;5226'>#5226</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20230306.  Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
     <listitem>
       <para>2023-03-04</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 21722a863..6153628ac 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -118,9 +118,9 @@
     <!--<listitem>
       <para>Gperf-&gperf-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Grep-&grep-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Groff-&groff-version;</para>
     </listitem>-->
@@ -130,9 +130,9 @@
     <!--<listitem>
       <para>Gzip-&gzip-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IANA-Etc-&iana-etc-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Inetutils-&inetutils-version;</para>
     </listitem>-->
diff --git a/packages.ent b/packages.ent
index ce26b0be5..592402c1c 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.3.1">
-<!ENTITY bc-size "448 KB">
+<!ENTITY bc-version "6.4.0">
+<!ENTITY bc-size "450 KB">
 <!ENTITY bc-url "https://github.com/gavinhoward/bc/releases/download/&bc-version;/bc-&bc-version;.tar.xz">
-<!ENTITY bc-md5 "70caa7c8a273d7152ad015823e887455">
+<!ENTITY bc-md5 "b10f1832f169610db6ebd313c432f69e">
 <!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">
@@ -281,10 +281,10 @@
 <!ENTITY gperf-fin-du "6.1 MB">
 <!ENTITY gperf-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY grep-version "3.8">
-<!ENTITY grep-size "1,670 KB">
+<!ENTITY grep-version "3.9">
+<!ENTITY grep-size "1,641 KB">
 <!ENTITY grep-url "&gnu;grep/grep-&grep-version;.tar.xz">
-<!ENTITY grep-md5 "dc6e4d18d4659e6e7552fc4a183c8ac9">
+<!ENTITY grep-md5 "ee315ef80638e0ca3fd5e0c8526b7b2a">
 <!ENTITY grep-home "&gnu-software;grep/">
 <!ENTITY grep-tmp-du "25 MB">
 <!ENTITY grep-tmp-sbu "0.2 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20230202">
-<!ENTITY iana-etc-size "586 KB">
+<!ENTITY iana-etc-version "20230306">
+<!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 "e64685d046cd0dfe94b5c66e294cf9ef">
+<!ENTITY iana-etc-md5 "b25ebfa2a9ae359a64abaa8331347505">
 <!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">
@@ -424,12 +424,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "2">
-<!ENTITY linux-patch-version "2">
+<!ENTITY linux-patch-version "6">
 <!--<!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,236 KB">
+<!ENTITY linux-size "133,263 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "03b17feb98f92131a465b09f3a12e715">
+<!ENTITY linux-md5 "b1e4f3e49a05c6e26c0e18e363a3dc9a">
 <!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,

From 9a9655b33be828e8c9ca383cc88b597705df5e6d Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 15 Mar 2023 13:41:04 +0800
Subject: [PATCH 2/5] chapter01/how: Remove commented out text about LFS LiveCD

Fix duplicated 'a LiveCD from a commercial distribution.'
---
 chapter01/how.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/chapter01/how.xml b/chapter01/how.xml
index eb6f249d2..107c415aa 100644
--- a/chapter01/how.xml
+++ b/chapter01/how.xml
@@ -24,15 +24,7 @@
   <ulink url="&lfs-root;hints/downloads/files/partitioning-for-lfs.txt"/>.</para></note>
 
   <para>As an alternative to installing a separate distribution on your
-  machine, you may wish to use a LiveCD from a commercial distribution.
-  <!-- the Linux From Scratch LiveCD or --> a LiveCD from a
-  commercial distribution. <!-- The LFS LiveCD works well as a host system,
-  providing all the tools you need to successfully follow the instructions in
-  this book. The LiveCD version is behind the current book, but is still useful
-  as a host for building the current book.  The <quote>-nosrc</quote> or
-  <quote>-min</quote> editions of the LiveCD are the most appropriate for
-  building a current LFS system.  For more information about the LFS LiveCD or
-  to download a copy, visit <ulink url="&livecd-root;"/>. --></para>
+  machine, you may wish to use a LiveCD from a commercial distribution.</para>
 
   <!--
   <note>

From 23a6c4c492e3e30704f0f1dc0facc32006936707 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 15 Mar 2023 14:01:24 +0800
Subject: [PATCH 3/5] reboot: Use &blfs-book; to simply the link to BLFS

By the way, use &root; for root user.
---
 chapter11/reboot.xml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index d1ae5917d..a277ed5d6 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -77,7 +77,7 @@
 
     <listitem>
       <para>
-        Ensure a password is set for the root user.
+        Ensure a password is set for the &root; user.
       </para>
     </listitem>
 
@@ -141,13 +141,7 @@ umount -v $LFS</userinput></screen>
 
   <para>When the reboot is complete, the LFS system is ready for use.  What you
   will see is a simple <quote>login: </quote> prompt.  At this point, you can
-  proceed to 
-  <phrase revision="sysv">
-    <ulink url="https://www.linuxfromscratch.org/blfs/view/stable/">
-     the BLFS Book</ulink></phrase>
-  <phrase revision="systemd">
-    <ulink url="https://www.linuxfromscratch.org/blfs/view/stable-systemd/">
-    the BLFS Book</ulink></phrase> 
+  proceed to <ulink url="&blfs-book;">the BLFS Book</ulink>
   where you can add more software to suit your needs.</para>
 
   <para>

From bbaf00d41541380665f0b146d60d12afb44cc62b Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 15 Mar 2023 14:17:56 +0800
Subject: [PATCH 4/5] openssl: Add a warning about minor version bump and
 OpenSSH

Let's prevent bad thing from happening when we update to 3.1.0...
---
 chapter08/openssl.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index 6a97bcc2a..10cfe26ce 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -98,6 +98,20 @@ make MANSUFFIX=ssl install</userinput></screen>
         number</emphasis>.
       </para>
 
+      <para>
+        If <application>OpenSSH</application> is installed, it will be an
+        exception of the general rule above.  It contains an
+        over-restrictive OpenSSL version check, so both SSH client and SSH
+        server will refuse to start if <application>OpenSSH</application>
+        is updated with MAJOR version number unchanged but MINOR version
+        number changed.  You need to rebuild
+        <application>OpenSSH</application> after such an upgrade.
+        <emphasis role='bold'>If <application>OpenSSH</application> is being
+        used to access the system, you must rebuild and reinstall it
+        after upgrading OpenSSL to a new MINOR version number before logout
+        or you won't be able to login via SSH anymore.</emphasis>
+      </para>
+
       <para>
         However, any running programs linked to those libraries need to be stopped
         and restarted. Read the related entries in

From ad09ba40a1d521857bf440b093167d91e5172f04 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 15 Mar 2023 15:00:34 +0800
Subject: [PATCH 5/5] openssl: Fix a typo, and add a link to OpenSSH issue

---
 chapter08/openssl.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/chapter08/openssl.xml b/chapter08/openssl.xml
index 10cfe26ce..0c3c41a7c 100644
--- a/chapter08/openssl.xml
+++ b/chapter08/openssl.xml
@@ -98,11 +98,12 @@ make MANSUFFIX=ssl install</userinput></screen>
         number</emphasis>.
       </para>
 
+      <!-- https://bugzilla.mindrot.org/show_bug.cgi?id=3548 -->
       <para>
         If <application>OpenSSH</application> is installed, it will be an
         exception of the general rule above.  It contains an
         over-restrictive OpenSSL version check, so both SSH client and SSH
-        server will refuse to start if <application>OpenSSH</application>
+        server will refuse to start if OpenSSL
         is updated with MAJOR version number unchanged but MINOR version
         number changed.  You need to rebuild
         <application>OpenSSH</application> after such an upgrade.