Automatic merge of trunk into multilib

chapter01/changelog.xml

@@ -40,6 +40,40 @@
     appropriate for the entry or if needed the entire day's listitem.
     -->
 
+    <listitem>
+      <para>2024-08-05</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bash-5.2.32. Fixes
+          <ulink url='&lfs-ticket-root;5532'>#5532</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to iana-etc-20240801. Addresses
+          <ulink url='&lfs-ticket-root;5006'>#5006</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to vim-9.1.0660. Addresses
+          <ulink url='&lfs-ticket-root;4500'>#4500</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to binutils-2.43. Fixes
+          <ulink url='&lfs-ticket-root;5535'>#5535</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to linux-6.10.3. Fixes
+          <ulink url='&lfs-ticket-root;5534'>#5534</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to readline-8.2.13. Fixes
+          <ulink url='&lfs-ticket-root;5533'>#5533</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to wheel-0.44.0. Fixes
+          <ulink url='&lfs-ticket-root;5536'>#5536</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2024-08-01</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -38,15 +38,15 @@
     <listitem>
       <para>Automake-&automake-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Bash-&bash-version;</para>
-    </listitem>-->
+    </listitem>
     <listitem>
       <para>Bc-&bc-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Binutils-&binutils-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Bison-&bison-version;</para>
     </listitem>-->
@@ -221,9 +221,9 @@
     <listitem>
       <para>Python-&python-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Readline-&readline-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Sed-&sed-version;</para>
     </listitem>-->
@@ -301,8 +301,12 @@
 
   <itemizedlist>
     <title>Removed:</title>
-    <listitem><para></para></listitem>  <!-- satisfy build -->
+    <listitem>
-
+      <para>bash-5.2.21-upstream_fixes-1.patch</para>
+    </listitem>  
+    <listitem>
+      <para>readline-8.2-upstream_fixes-3.patch</para>
+    </listitem>  
   </itemizedlist>
 
 </sect1>

chapter03/patches.xml

@@ -26,7 +26,7 @@
       </listitem>
     </varlistentry>
 -->
-
+<!--
     <varlistentry>
       <term>Bash Upstream Fixes Patch - <token>&bash-upstream-fixes-patch-size;</token>:</term>
       <listitem>
@@ -34,7 +34,7 @@
         <para>MD5 sum: <literal>&bash-upstream-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
 <!--
     <varlistentry>
       <term>Binutils LTO Fix Patch - <token>&binutils-lto-patch-size;</token>:</term>
@@ -127,6 +127,7 @@
       </listitem>
     </varlistentry>
 -->
+<!--
     <varlistentry>
       <term>Readline Upstream Fix Patch - <token>&readline-fixes-patch-size;</token>:</term>
       <listitem>
@@ -134,7 +135,7 @@
         <para>MD5 sum: <literal>&readline-fixes-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
-
+-->
     <varlistentry revision="sysv">
       <term>SysVinit Consolidated Patch - <token>&sysvinit-consolidated-patch-size;</token>:</term>
       <listitem>

chapter08/bash.xml

@@ -40,10 +40,6 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
-    <para>First, fix some issues identified upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&bash-upstream-fixes-patch;</userinput></screen>
-
     <para>Prepare Bash for compilation:</para>
 
     <screen><userinput remap="configure">./configure --prefix=/usr             \

chapter08/readline.xml

@@ -56,10 +56,6 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen>
 
 <screen><userinput>sed -i 's/-Wl,-rpath,[^ ]*//' support/shobj-conf</userinput></screen>
 
-    <para>Now fix a problem identified upstream:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&readline-fixes-patch;</userinput></screen>
-
     <para>Prepare Readline for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr    \

packages.ent

@@ -47,10 +47,10 @@
 <!ENTITY automake-fin-du "115 MB">
 <!ENTITY automake-fin-sbu "less than 0.1 SBU (about 1.6 SBU with tests)">
 
-<!ENTITY bash-version "5.2.21">
+<!ENTITY bash-version "5.2.32">
-<!ENTITY bash-size "10,696 KB">
+<!ENTITY bash-size "10,697 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "ad5b38410e3bf0e9bcc20e2765f5e3f9">
+<!ENTITY bash-md5 "f204835b2e06c06e37b5ad776ff907f4">
 <!ENTITY bash-home "&gnu-software;bash/">
 <!ENTITY bash-tmp-du "67 MB">
 <!ENTITY bash-tmp-sbu "0.2 SBU">
@@ -65,10 +65,10 @@
 <!ENTITY bc-fin-du "7.8 MB">
 <!ENTITY bc-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY binutils-version "2.42">
+<!ENTITY binutils-version "2.43">
-<!ENTITY binutils-size "26,922 KB">
+<!ENTITY binutils-size "27,516 KB">
 <!ENTITY binutils-url "https://sourceware.org/pub/binutils/releases/binutils-&binutils-version;.tar.xz">
-<!ENTITY binutils-md5 "a075178a9646551379bfb64040487715">
+<!ENTITY binutils-md5 "a54bb52cd75555416f316fbbe885925a">
 <!ENTITY binutils-home "&gnu-software;binutils/">
 <!ENTITY binutils-tmpp1-du "663 MB">
 <!ENTITY binutils-tmpp1-sbu "1 SBU">
@@ -317,10 +317,10 @@
 <!ENTITY gzip-fin-du "21 MB">
 <!ENTITY gzip-fin-sbu "0.3 SBU">
 
-<!ENTITY iana-etc-version "20240723">
+<!ENTITY iana-etc-version "20240801">
 <!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 "0592f2c2051a9eac7611d5067113ef3d">
+<!ENTITY iana-etc-md5 "ff9aeab0f9978975c6ee0b966d6988d6">
 <!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">
@@ -441,12 +441,12 @@
 
 <!ENTITY linux-major-version "6">
 <!ENTITY linux-minor-version "10">
-<!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 "141,756 KB">
+<!ENTITY linux-size "141,734 KB">
 <!ENTITY linux-url "&kernel;linux/kernel/v&linux-major-version;.x/linux-&linux-version;.tar.xz">
-<!ENTITY linux-md5 "519d1120e7715120ebbe042fddccf67f">
+<!ENTITY linux-md5 "669cfdae956b047b98d24b6582a3ca4b">
 <!ENTITY linux-home "https://www.kernel.org/">
 <!-- measured for 6.10.1 / gcc-14.1.0 on x86_64 with -j4 : 
  minimum is allnoconfig 
@@ -628,11 +628,11 @@
 <!ENTITY python-docs-md5 "cca155c92f53882cf45a69364315640d">
 <!ENTITY python-docs-size "8,258 KB">
 
-<!ENTITY readline-version "8.2">
+<!ENTITY readline-version "8.2.13">
 <!ENTITY readline-soversion "8.2"><!-- used for stripping -->
-<!ENTITY readline-size "2,973 KB">
+<!ENTITY readline-size "2,974 KB">
 <!ENTITY readline-url "&gnu;readline/readline-&readline-version;.tar.gz">
-<!ENTITY readline-md5 "4aa1b31be779e6b84f9a96cb66bc50f6">
+<!ENTITY readline-md5 "05080bf3801e6874bb115cd6700b708f">
 <!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">
@@ -754,10 +754,10 @@
 <!ENTITY util-linux-fin-du "313 MB">
 <!ENTITY util-linux-fin-sbu "0.5 SBU">
 
-<!ENTITY vim-version "9.1.0580">
+<!ENTITY vim-version "9.1.0660">
 <!-- <!ENTITY vim-majmin "90"> -->
 <!ENTITY vim-docdir "vim/vim91">
-<!ENTITY vim-size "17,568 KB">
+<!ENTITY vim-size "17,629 KB">
 <!ENTITY vim-url "https://github.com/vim/vim/archive/v&vim-version;/vim-&vim-version;.tar.gz">
 <!-- N.B. LFS 9.0 uses
      https://github.com/vim/vim/archive/v8.1.1846/vim-8.1.1846.tar.gz
@@ -771,15 +771,15 @@
      example, https://github.com/vim/vim/tags?after=v8.1.1847 will show
      us v8.1.1846. -->
 <!--<!ENTITY vim-url "&anduin-sources;/vim-&vim-version;.tar.gz">-->
-<!ENTITY vim-md5 "3e871c0773a6c2a491d3d730475b5698">
+<!ENTITY vim-md5 "c512a99b3704f193be1a181cc644b2b2">
 <!ENTITY vim-home "https://www.vim.org">
 <!ENTITY vim-fin-du "236 MB">
 <!ENTITY vim-fin-sbu "2.5 SBU">
 
-<!ENTITY wheel-version "0.43.0">
+<!ENTITY wheel-version "0.44.0">
-<!ENTITY wheel-size "97 KB">
+<!ENTITY wheel-size "99 KB">
 <!ENTITY wheel-url "&pypi-src;/w/wheel/wheel-&wheel-version;.tar.gz">
-<!ENTITY wheel-md5 "387af15d51367a19d834d6db413547d0">
+<!ENTITY wheel-md5 "440ff4fe51579b7ed16f02af8f8d9494">
 <!ENTITY wheel-home "&pypi-home;/wheel/">
 <!ENTITY wheel-fin-du "1.5 MB">
 <!ENTITY wheel-fin-sbu "less than 0.1 SBU">

part3intro/toolchaintechnotes.xml

@@ -192,9 +192,9 @@
       sure-fire way to determine the name of the dynamic linker is to inspect a
       random binary from the host system by running: <userinput>readelf -l
       &lt;name of binary&gt; | grep interpreter</userinput> and noting the
-      output. The authoritative reference covering all platforms is in the
+      output. The authoritative reference covering all platforms is in
-      <filename>shlib-versions</filename> file in the root of the glibc source
+      <ulink url='https://sourceware.org/glibc/wiki/ABIList'>a Glibc wiki
-      tree.</para>
+      page</ulink>.</para>
     </note>
 
     <para>In order to fake a cross-compilation in LFS, the name of the host triplet
@@ -359,20 +359,17 @@ checking what linker to use... /mnt/lfs/tools/i686-lfs-linux-gnu/bin/ld</compute
 
     <para>Next comes glibc. The most important
     considerations for building glibc are the compiler, binary tools, and
-    kernel headers. The compiler is generally not an issue since glibc will
+    kernel headers. The compiler and binary tools are generally not an issue
-    always use the compiler relating to the <parameter>--host</parameter>
+    since glibc will always those relating to the <parameter>--host</parameter>
     parameter passed to its configure script; e.g., in our case, the compiler
-    will be <command>$LFS_TGT-gcc</command>. The binary tools and kernel
+    will be <command>$LFS_TGT-gcc</command> and the <command>readelf</command>
-    headers can be a bit more complicated. Therefore, we take no risks and use
+    tool will be <command>$LFS_TGT-readelf</command>. The kernel headers can
-    the available configure switches to enforce the correct selections. After
+    be a bit more complicated. Therefore, we take no risks and use
+    the available configure switch to enforce the correct selection. After
     the run of <command>configure</command>, check the contents of the
     <filename>config.make</filename> file in the <filename
     class="directory">build</filename> directory for all important details.
-    Note the use of <parameter>CC="$LFS_TGT-gcc"</parameter> (with
+    These items highlight an important aspect of the glibc
-    <envar>$LFS_TGT</envar> expanded) to control which binary tools are used
-    and the use of the <parameter>-nostdinc</parameter> and
-    <parameter>-isystem</parameter> flags to control the compiler's include
-    search path. These items highlight an important aspect of the glibc
     package&mdash;it is very self-sufficient in terms of its build machinery,
     and generally does not rely on toolchain defaults.</para>
 

patches.ent

@@ -2,10 +2,11 @@
 
 <!-- Start of Common Patches -->
 
+<!--
 <!ENTITY bash-upstream-fixes-patch "bash-&bash-version;-upstream_fixes-1.patch">
 <!ENTITY bash-upstream-fixes-patch-md5 "2d1691a629c558e894dbb78ee6bf34ef">
 <!ENTITY bash-upstream-fixes-patch-size "5.9 KB">
-
+-->
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
@@ -29,11 +30,11 @@
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">
-
+<!--
 <!ENTITY readline-fixes-patch "readline-&readline-version;-upstream_fixes-3.patch">
 <!ENTITY readline-fixes-patch-md5 "9ed497b6cb8adcb8dbda9dee9ebce791">
 <!ENTITY readline-fixes-patch-size "13 KB">
-
+-->
 <!ENTITY sysvinit-consolidated-patch "sysvinit-&sysvinit-version;-consolidated-1.patch">
 <!ENTITY sysvinit-consolidated-patch-md5 "17ffccbb8e18c39e8cedc32046f3a475">
 <!ENTITY sysvinit-consolidated-patch-size "2.5 KB">