浏览代码

Add latest upstream patches for Bash. Fixes #2620.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9246 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 15 年之前
父节点
当前提交
c42320cbb2
共有 6 个文件被更改,包括 28 次插入3 次删除
  1. 4 0
      chapter01/changelog.xml
  2. 3 3
      chapter01/whatsnew.xml
  3. 8 0
      chapter03/patches.xml
  4. 4 0
      chapter05/bash.xml
  5. 4 0
      chapter06/bash.xml
  6. 5 0
      patches.ent

+ 4 - 0
chapter01/changelog.xml

@@ -39,6 +39,10 @@
     <listitem>
     <listitem>
       <para>2010-04-20</para>
       <para>2010-04-20</para>
       <itemizedlist>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] Add upstream fixes 001-005 for Bash.  Fixes
+          <ulink url="&lfs-ticket-root;2620">#2620</ulink>.</para>
+        </listitem>
         <listitem>
         <listitem>
           <para>[matthew] Remove the Vim fixes patch as it is out of date and
           <para>[matthew] Remove the Vim fixes patch as it is out of date and
           looks to be applying fixes still in upstream's development cycle.
           looks to be applying fixes still in upstream's development cycle.

+ 3 - 3
chapter01/whatsnew.xml

@@ -207,14 +207,14 @@
 
 
   </itemizedlist>-->
   </itemizedlist>-->
 
 
-  <!--<itemizedlist>
+  <itemizedlist>
     <title>Added:</title>
     <title>Added:</title>
 
 
     <listitem>
     <listitem>
-      <para>PLACEHOLDER</para>
+      <para>bash-4.1-fixes-1.patch</para>
     </listitem>
     </listitem>
 
 
-  </itemizedlist>-->
+  </itemizedlist>
 
 
   <itemizedlist>
   <itemizedlist>
     <title>Removed:</title>
     <title>Removed:</title>

+ 8 - 0
chapter03/patches.xml

@@ -18,6 +18,14 @@
 
 
   <variablelist role="materials">
   <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>
     <varlistentry>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term>
       <listitem>
       <listitem>

+ 4 - 0
chapter05/bash.xml

@@ -43,6 +43,10 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of Bash</title>
     <title>Installation of Bash</title>
 
 
+    <para>Apply a patch that fixes several bugs reported and fixed by the upstream Bash maintainer:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+
     <para>Prepare Bash for compilation:</para>
     <para>Prepare Bash for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen>
 <screen><userinput remap="configure">./configure --prefix=/tools --without-bash-malloc</userinput></screen>

+ 4 - 0
chapter06/bash.xml

@@ -40,6 +40,10 @@
   <sect2 role="installation">
   <sect2 role="installation">
     <title>Installation of Bash</title>
     <title>Installation of Bash</title>
 
 
+    <para>Apply a patch that fixes several bugs reported and fixed by the upstream Bash maintainer:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+
     <para>Prepare Bash for compilation:</para>
     <para>Prepare Bash for compilation:</para>
 
 
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \
 <screen><userinput remap="configure">./configure --prefix=/usr --bindir=/bin \

+ 5 - 0
patches.ent

@@ -2,6 +2,11 @@
 
 
 <!-- Start of Common Patches -->
 <!-- Start of Common Patches -->
 
 
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "677396905ccdbc9dbe72745fd73f4bae">
+<!ENTITY bash-fixes-patch-size "3.8 KB">
+
+
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">
 <!ENTITY bzip2-docs-patch-size "1.6 KB">