Changeset 62b7b47 in clfs-sysroot

Timestamp:

Nov 5, 2006, 3:16:34 PM (18 years ago)

Author:

Joe Ciccone <jciccone@…>

Branches:

master

Children:

f386fcc

Parents:

bcc3c76

Message:

Removed the bash ncurses patch and added the bash fixes-1.patch

Location:

BOOK

Files:

• bootscripts/common/console.xml (modified) (1 diff)
• final-system/common/ncurses.xml (modified) (1 diff)
• general.ent (modified) (1 diff)
• introduction/common/changelog.xml (modified) (1 diff)
• materials/common/patches.xml (modified) (2 diffs)
• patches.ent (modified) (2 diffs)

BOOK/bootscripts/common/console.xml

@@ -29 +29 @@
   several countries was installed with the CLFS-Bootscripts package, so the
   relevant section can be uncommented if the country is supported. If still
-  in doubt, look in the <filename class="directory">/usr/share/kbd</filename>
+  in doubt, look in the <filename class="directory">/lib/kbd</filename>
   directory for valid keymaps and screen fonts. Read
   <filename>loadkeys(1)</filename> and <filename>setfont(8)</filename> to

BOOK/final-system/common/ncurses.xml

@@ -25 +25 @@
   <sect2 role="installation">
     <title>Installation of Ncurses</title>
-
-    <para os="p1">This patch addresses build issues with Bash &bash-version;:
-    </para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&ncurses-bash-patch;</userinput></screen>
 
     <para os="a">Prepare Ncurses for compilation:</para>

BOOK/general.ent

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 
-<!ENTITY month "10"> <!-- Use two digits -->
-<!ENTITY month_name "October">
-<!ENTITY day "15"> <!-- Use two digits -->
+<!ENTITY month "11"> <!-- Use two digits -->
+<!ENTITY month_name "November">
+<!ENTITY day "5"> <!-- Use two digits -->
 <!ENTITY year "2006"> <!-- Use four digits -->
 

BOOK/introduction/common/changelog.xml

@@ -38 +38 @@
 
     <listitem>
+      <para>November 5, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[jciccone] - Updated Bash 3.2 with some unofficial upstream fixes. Thank you Chet Ramey.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 14, 2006</para>
       <itemizedlist>

BOOK/materials/common/patches.xml

@@ -20 +20 @@
 
     <varlistentry>
+      <term>Bash 3.2 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>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Binutils Posix Patch - <token>&binutils-posix-patch-size;</token>:</term>
       <listitem>
@@ -196 +205 @@
         url="&patches-root;&mktemp-tempfile-patch;"/></para>
         <para>MD5 sum: <literal>&mktemp-tempfile-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Ncurses Bash Fixes Patch - <token>&ncurses-bash-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&ncurses-bash-patch;"/></para>
-        <para>MD5 sum: <literal>&ncurses-bash-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/patches.ent

@@ -5 +5 @@
 
 <!-- Start of Common Patches -->
+
+<!ENTITY bash-fixes-patch "bash-&bash-version;-fixes-1.patch">
+<!ENTITY bash-fixes-patch-md5 "51dcdc97fa978199329f12d382056d91">
+<!ENTITY bash-fixes-patch-size "4 KB">
 
 <!ENTITY binutils-posix-patch "binutils-&binutils-version;-posix-1.patch">
@@ -86 +90 @@
 <!ENTITY mktemp-tempfile-patch-size "3.6 KB">
 
-<!ENTITY ncurses-bash-patch "ncurses-&ncurses-version;-bash32_update-1.patch">
-<!ENTITY ncurses-bash-patch-md5 "fca13124063dc74925bbdaec364f14dd">
-<!ENTITY ncurses-bash-patch-size "4 KB">
-
 <!ENTITY perl-cross_compile-patch "perl-&perl-version;-cross_compile-2.patch">
 <!ENTITY perl-cross_compile-patch-md5 "bd9f94c8629e674f4472604b77cea42d">