[Clfs-commits] commit: r4820 - in /branches/clfs-sysroot: BOOK/ BOOK/final-system/common/ BOOK/introduction/common/ BOOK/materials/common/ patches/

[svn at cross-lfs.org]

Author: jciccone
Date: Sun Mar 15 16:10:35 2009
New Revision: 4820

Log:
Updated Bash to 4.0.

Added:
    branches/clfs-sysroot/patches/bash-4.0-branch_update-3.patch
      - copied unchanged from r4818, trunk/patches/bash-4.0-branch_update-3.patch
Removed:
    branches/clfs-sysroot/patches/bash-3.2-fixes-9.patch
Modified:
    branches/clfs-sysroot/BOOK/final-system/common/bash.xml
    branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
    branches/clfs-sysroot/BOOK/materials/common/packages.xml
    branches/clfs-sysroot/BOOK/materials/common/patches.xml
    branches/clfs-sysroot/BOOK/packages.ent
    branches/clfs-sysroot/BOOK/patches.ent

Modified: branches/clfs-sysroot/BOOK/final-system/common/bash.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/final-system/common/bash.xml (original)
+++ branches/clfs-sysroot/BOOK/final-system/common/bash.xml Sun Mar 15 16:10:35 2009
@@ -24,14 +24,10 @@
   <sect2 role="installation">
     <title>Installation of Bash</title>
 
-    <para os="a">If you downloaded the Bash documentation tarball and wish to
-    install HTML documentation, issue the following commands:</para>
+    <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="b"><userinput>tar -xvf ../bash-doc-&bash-doc-version;.tar.gz</userinput></screen>
-
-    <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="c">When bash is cross-compiled, it cannot test for the presence
     of named pipes, amoung other things. If you used <command>su</command> to

Modified: branches/clfs-sysroot/BOOK/introduction/common/changelog.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/introduction/common/changelog.xml (original)
+++ branches/clfs-sysroot/BOOK/introduction/common/changelog.xml Sun Mar 15 16:10:35 2009
@@ -39,6 +39,9 @@
     <listitem>
       <para>March 15, 2009</para>
       <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Bash to 4.0.</para>
+        </listitem>
         <listitem>
           <para>[jciccone] - Updated Tar to 1.22.</para>
         </listitem>

Modified: branches/clfs-sysroot/BOOK/materials/common/packages.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/materials/common/packages.xml (original)
+++ branches/clfs-sysroot/BOOK/materials/common/packages.xml Sun Mar 15 16:10:35 2009
@@ -38,15 +38,6 @@
         <para>Home page: <ulink url="&bash-home;"/></para>
         <para>Download: <ulink url="&bash-url;"/></para>
         <para>MD5 sum: <literal>&bash-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Bash Documentation (&bash-doc-version;) - <token>&bash-doc-size;</token>:</term>
-      <listitem>
-        <para>Home page: <ulink url="&bash-doc-home;"/></para>
-        <para>Download: <ulink url="&bash-doc-url;"/></para>
-        <para>MD5 sum: <literal>&bash-doc-md5;</literal></para>
       </listitem>
     </varlistentry>
 

Modified: branches/clfs-sysroot/BOOK/materials/common/patches.xml
==============================================================================
--- branches/clfs-sysroot/BOOK/materials/common/patches.xml (original)
+++ branches/clfs-sysroot/BOOK/materials/common/patches.xml Sun Mar 15 16:10:35 2009
@@ -19,11 +19,11 @@
   <variablelist role="materials">
 
     <varlistentry>
-      <term>Bash Fixes - <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>
+      <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>
 

Modified: branches/clfs-sysroot/BOOK/packages.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/packages.ent (original)
+++ branches/clfs-sysroot/BOOK/packages.ent Sun Mar 15 16:10:35 2009
@@ -17,17 +17,11 @@
 <!ENTITY automake-md5 "1498208ab1c8393dcbd9afb7d06df6d5">
 <!ENTITY automake-home "&gnu-software;automake">
 
-<!ENTITY bash-version "3.2">
-<!ENTITY bash-size "2,476 KB">
+<!ENTITY bash-version "4.0">
+<!ENTITY bash-size "6,038 KB">
 <!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "00bfa16d58e034e3c2aa27f390390d30">
+<!ENTITY bash-md5 "a90a1b5a6db4838483f05438e05e8eb9">
 <!ENTITY bash-home "&gnu-software;bash">
-
-<!ENTITY bash-doc-version "3.2">
-<!ENTITY bash-doc-size "2,148 KB">
-<!ENTITY bash-doc-url "&gnu;bash/bash-doc-&bash-doc-version;.tar.gz">
-<!ENTITY bash-doc-md5 "0e904cb46ca873fcfa65df19b024bec9">
-<!ENTITY bash-doc-home " ">
 
 <!ENTITY binutils-version "2.19">
 <!ENTITY binutils-size "15,860 KB">

Modified: branches/clfs-sysroot/BOOK/patches.ent
==============================================================================
--- branches/clfs-sysroot/BOOK/patches.ent (original)
+++ branches/clfs-sysroot/BOOK/patches.ent Sun Mar 15 16:10:35 2009
@@ -4,9 +4,9 @@
 
 <!-- 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 "420 KB">
+<!ENTITY bash-branch_update-patch "bash-&bash-version;-branch_update-3.patch">
+<!ENTITY bash-branch_update-patch-md5 "1121b5d966599721aaf6dffb03f13d8c">
+<!ENTITY bash-branch_update-patch-size "14 KB">
 
 <!ENTITY binutils-branch_update-patch "binutils-&binutils-version;-branch_update-4.patch">
 <!ENTITY binutils-branch_update-patch-md5 "4f587bb8161b08e60b7e7bc98c56ff7d">