[Clfs-commits] commit: r4393 - in /trunk: BOOK/ BOOK/final-system/common/ BOOK/final-system/multilib/ BOOK/introduction/common/ BOOK/materials/common/ patches/

[svn at cross-lfs.org]

Author: jim
Date: Fri Jan  9 00:23:23 2009
New Revision: 4393

Log:
Changed Patches to Bash

Added:
    trunk/patches/bash-3.2-branch_update-1.patch
    trunk/patches/bash-3.2-fixes-10.patch
Removed:
    trunk/patches/bash-3.2-fixes-9.patch
Modified:
    trunk/BOOK/final-system/common/bash.xml
    trunk/BOOK/final-system/multilib/bash.xml
    trunk/BOOK/introduction/common/changelog.xml
    trunk/BOOK/materials/common/patches.xml
    trunk/BOOK/patches.ent

Modified: trunk/BOOK/final-system/common/bash.xml
==============================================================================
--- trunk/BOOK/final-system/common/bash.xml (original)
+++ trunk/BOOK/final-system/common/bash.xml Fri Jan  9 00:23:23 2009
@@ -32,7 +32,12 @@
     <para os="p1">The following patch contains updates from the maintainer. The
     maintainer of Bash only releases these patches to fix serious issues:</para>
 
-<screen os="p2"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
+<screen os="p2"><userinput>patch -Np1 -i ../&bash-branch_update-patch;</userinput></screen>
+
+    <para os="p3">The following patch contains fixes that affect a CLFS system. These are
+    validated issues by the CLFS developers:</para>
+
+<screen os="p4"><userinput>patch -Np1 -i ../&bash-fixes-patch;</userinput></screen>
 
     <para os="g">Prepare Bash for compilation:</para>
 

Modified: trunk/BOOK/final-system/multilib/bash.xml
==============================================================================
--- trunk/BOOK/final-system/multilib/bash.xml (original)
+++ trunk/BOOK/final-system/multilib/bash.xml Fri Jan  9 00:23:23 2009
@@ -36,6 +36,14 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/bash.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='p3'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/bash.xml"
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="m1">The following sed points configure towards the correct
     library directory while searching for Readline:</para>

Modified: trunk/BOOK/introduction/common/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/common/changelog.xml (original)
+++ trunk/BOOK/introduction/common/changelog.xml Fri Jan  9 00:23:23 2009
@@ -47,6 +47,9 @@
         </listitem>
         <listitem>
           <para>[Jim] - Added Internationalization Patch to Grep.</para>
+        </listitem>
+        <listitem>
+          <para>[Jim] - Added New Patches to Bash. Fixes Issues known with CLFS builds.</para>
         </listitem>
       </itemizedlist>
     </listitem>

Modified: trunk/BOOK/materials/common/patches.xml
==============================================================================
--- trunk/BOOK/materials/common/patches.xml (original)
+++ trunk/BOOK/materials/common/patches.xml Fri Jan  9 00:23:23 2009
@@ -19,6 +19,15 @@
   <variablelist role="materials">
 
     <varlistentry>
+      <term>Bash Branch Update Patch - <token>&bash-branch_update-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink
+        url="&patches-root;&bash-branch_update-patch;"/></para>
+        <para>MD5 sum: <literal>&bash-branch_update-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Bash Fixes - <token>&bash-fixes-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink

Modified: trunk/BOOK/patches.ent
==============================================================================
--- trunk/BOOK/patches.ent (original)
+++ trunk/BOOK/patches.ent Fri Jan  9 00:23:23 2009
@@ -4,9 +4,13 @@
 
 <!-- Start of Common Patches -->
 
-<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-9.patch">
-<!ENTITY bash-fixes-patch-md5 "f95ef1f0cce20d865f05a48f31b152ad">
-<!ENTITY bash-fixes-patch-size "424 KB">
+<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-1.patch">
+<!ENTITY bash-branch_update-patch-md5 "612195c7fbb6e3d227890ef74243fd1c">
+<!ENTITY bash-branch_update-patch-size "80 KB">
+
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-10.patch">
+<!ENTITY bash-fixes-patch-md5 "2474b9db2f148994d373239f9ad46f63">
+<!ENTITY bash-fixes-patch-size "8 KB">
 
 <!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-2.patch">
 <!ENTITY binutils-branch_update-patch-md5 "4fb60fffba2f3a89971aac68a210b49c">