From 3b604e73d1714cdebb1a1877cc9fa19769d448e2 Mon Sep 17 00:00:00 2001
From: Thomas Trepl <thomas@linuxfromscratch.org>
Date: Wed, 4 Jun 2025 07:20:48 +0200
Subject: [PATCH] Merge changes Upgrade to bash-5.3-rc2 and readline-8.3-rc2

---
 chapter03/patches.xml |  2 +-
 chapter07/python.xml  | 14 +++++++++++---
 chapter08/ncurses.xml |  2 +-
 chapter08/python.xml  |  8 --------
 chapter11/reboot.xml  |  9 +++------
 packages.ent          | 12 ++++++------
 6 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 435fa6acd..94b36acb5 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -53,7 +53,7 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Coreutils Upstream Fixe Patch - <token>&coreutils-upstream-patch-size;</token>:</term>
+      <term>Coreutils Upstream Fix Patch - <token>&coreutils-upstream-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&coreutils-upstream-patch;"/></para>
         <para>MD5 sum: <literal>&coreutils-upstream-patch-md5;</literal></para>
diff --git a/chapter07/python.xml b/chapter07/python.xml
index 872cf4a36..a75d5ad6f 100644
--- a/chapter07/python.xml
+++ b/chapter07/python.xml
@@ -52,9 +52,10 @@
 
     <para>Prepare Python for compilation:</para>
 
-<screen><userinput remap="configure">./configure --prefix=/usr   \
-            --enable-shared \
-            --without-ensurepip</userinput></screen>
+<screen><userinput remap="configure">./configure --prefix=/usr       \
+            --enable-shared     \
+            --without-ensurepip \
+            --without-static-libpython</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure option:</title>
@@ -74,6 +75,13 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+        <term><parameter>--without-static-libpython</parameter></term>
+        <listitem>
+          <para>This switch prevents building a large, but unneeded, static
+          library.</para>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter08/ncurses.xml b/chapter08/ncurses.xml
index eb2a4525b..764dc38eb 100644
--- a/chapter08/ncurses.xml
+++ b/chapter08/ncurses.xml
@@ -127,7 +127,7 @@
          make will spawn new shell processes during "make install".  -->
 
     <para>The installation of this package will overwrite
-    <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
+    <filename class="libraryfile">libncursesw.so.&ncurses-base-version;</filename>
     in-place.  It may crash the shell process which is using code and data
     from the library file.  Install the package with
     <literal>DESTDIR</literal>, and replace the library file correctly using
diff --git a/chapter08/python.xml b/chapter08/python.xml
index 0cbce0b0c..63a7e24cd 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -77,14 +77,6 @@
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term><parameter>--without-static-libpython</parameter></term>
-      <listitem>
-        <para>This switch prevents building a large, but unneeded, static
-        library.</para>
-      </listitem>
-    </varlistentry>
-
     </variablelist>
 
     <para>Compile the package:</para>
diff --git a/chapter11/reboot.xml b/chapter11/reboot.xml
index 5a8cfd51e..497445346 100644
--- a/chapter11/reboot.xml
+++ b/chapter11/reboot.xml
@@ -88,17 +88,14 @@
       </para>
 
       <itemizedlist>
-        <listitem><para>/etc/bashrc                  </para></listitem>
-        <listitem><para>/etc/dircolors               </para></listitem>
         <listitem><para>/etc/fstab                   </para></listitem>
         <listitem><para>/etc/hosts                   </para></listitem>
         <listitem><para>/etc/inputrc                 </para></listitem>
         <listitem><para>/etc/profile                 </para></listitem>
-        <listitem><para>/etc/resolv.conf             </para></listitem>
+        <listitem><para>/etc/resolv.conf
+          <phrase revision='systemd'>(optional)</phrase></para></listitem>
         <listitem><para>/etc/vimrc                   </para></listitem>
-        <listitem><para>/root/.bash_profile          </para></listitem>
-        <listitem><para>/root/.bashrc                </para></listitem>
-        <listitem revision="sysv"><para>/etc/sysconfig/ifconfig.eth0 </para></listitem>
+        <listitem revision="sysv"><para>/etc/sysconfig/ifconfig.eth0</para></listitem>
       </itemizedlist>
     </listitem>
   </itemizedlist>
diff --git a/packages.ent b/packages.ent
index e720a5139..bfccaf328 100644
--- a/packages.ent
+++ b/packages.ent
@@ -47,10 +47,10 @@
 <!ENTITY automake-fin-du "121 MB">
 <!ENTITY automake-fin-sbu "less than 0.1 SBU (about 1.1 SBU with tests)">
 
-<!ENTITY bash-version "5.3-rc1">
-<!ENTITY bash-size "10,491 KB">
+<!ENTITY bash-version "5.3-rc2">
+<!ENTITY bash-size "10,734 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "f58f56196606a0d0cef9b96b733d256c">
+<!ENTITY bash-md5 "9c440d7c5ca37433e496c5e22f8918c6">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-tmp-du "68 MB">
 <!ENTITY bash-tmp-sbu "0.2 SBU">
@@ -629,11 +629,11 @@
 <!ENTITY python-docs-md5 "5b65ca5579dac14e425cd247af6fd043">
 <!ENTITY python-docs-size "10,112 KB">
 
-<!ENTITY readline-version "8.3-rc1">
+<!ENTITY readline-version "8.3-rc2">
 <!ENTITY readline-soversion "8.3"><!-- used for stripping -->
-<!ENTITY readline-size "3,336 KB">
+<!ENTITY readline-size "3,337 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "65e32c25e6ba871e5b026d22d0b81002">
+<!ENTITY readline-md5 "d580a2ab42aa69d09c237b1e2058914d">
 <!ENTITY readline-home "https://tiswww.case.edu/php/chet/readline/rltop.html">
 <!ENTITY readline-fin-du "16 MB">
 <!ENTITY readline-fin-sbu "less than 0.1 SBU">