Changeset c7997ec

Timestamp:

03/14/2011 10:06:41 PM (13 years ago)

Author:

Matthew Burgess <matthew@…>

Branches:

10.0, 10.0-rc1, 10.1, 10.1-rc1, 11.0, 11.0-rc1, 11.0-rc2, 11.0-rc3, 11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, 7.0, 7.1, 7.2, 7.3, 7.4, 7.5, 7.5-systemd, 7.6, 7.6-systemd, 7.7, 7.7-systemd, 7.8, 7.8-systemd, 7.9, 7.9-systemd, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, arm, bdubbs/gcc13, ml-11.0, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

67e8a9b

Parents:

194aae0

Message:

Add latest upstream patches for Bash-4.2. Fixes #2841.

git-svn-id: ​http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9486 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

Files:

• chapter01/changelog.xml (modified) (1 diff)
• chapter01/whatsnew.xml (modified) (1 diff)
• chapter03/patches.xml (modified) (1 diff)
• chapter05/bash.xml (modified) (1 diff)
• chapter06/bash.xml (modified) (1 diff)
• patches.ent (modified) (1 diff)

chapter01/changelog.xml

@@ -41 +41 @@
       <itemizedlist>
         <listitem>
+          <para>[matthew] - Add latest upstream patches for Bash-4.2. Fixes
+          <ulink url="&lfs-ticket-root;2841">#2841</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[matthew] - Upgrade to M4-1.4.16. Fixes
           <ulink url="&lfs-ticket-root;2840">#2840</ulink>.</para>

chapter01/whatsnew.xml

@@ -219 +219 @@
   <itemizedlist>
     <title>Added:</title>
-    <listitem><para></para></listitem>  <!-- satify build -->
-  <!--
-    <listitem>
-      <para>bzip2-&bzip2-version;-install_docs-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-&coreutils-version;-i18n-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-&coreutils-version;-uname-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>gcc-&gcc-version;-startfiles_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-&glibc-version;-gcc_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>perl-&perl-version;-libc-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>procps-&procps-version;-fix_HZ_errors-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>xz-&xz-version;</para>
-    </listitem>
-
-    <listitem>
-      <para>util-linux-&util-linux-version;</para>
-    </listitem>
-  -->
-
+    <listitem>
+      <para>bash-&bash-version;-fixes-1.patch</para>
+    </listitem>
   </itemizedlist>
 
   <itemizedlist>
     <title>Removed:</title>
-    <listitem><para></para></listitem>  <!-- satify build -->
-  <!--
-    <listitem>
-      <para>bash-4.1-fixes-2.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>bzip2-1.0.5-install_docs-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>bzip2-1.0.5-version_fixes-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-8.5-i18n-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>coreutils-8.5-uname-2.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>expect-5.44.1.15-no_tk-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>gcc-4.5.1-startfiles_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.12.1-gcc_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>glibc-2.12.1-makefile_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>man-db-2.5.7-fix_man_assertion-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>perl-5.12.1-libc-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>tar-1.23-overflow_fix-1.patch</para>
-    </listitem>
-
-    <listitem>
-      <para>util-linux-ng-2.18</para>
-    </listitem>
-  -->
+    <listitem><para></para></listitem>  <!-- satisfy build -->
   </itemizedlist>
 

chapter03/patches.xml

@@ -18 +18 @@
 
   <variablelist role="materials">
+
+    <varlistentry>
+      <term>Bash Upstream Fixes Patch - <token>&bash-fixes-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&bash-fixes-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
 
     <varlistentry>

chapter05/bash.xml

@@ -43 +43 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
+
+    <para>First, apply the following patch to fix various bugs that have been
+    addressed upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>

chapter06/bash.xml

@@ -40 +40 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
+
+    <para>First, apply the following patch to fix various bugs that have been
+    addressed upstream:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
     <para>Prepare Bash for compilation:</para>

patches.ent

@@ -2 +2 @@
 
 <!-- Start of Common Patches -->
+
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "abae789c2807cb7c7c4c452fa3986f85">
+<!ENTITY bash-fixes-patch-size "11 KB">
+
 
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">