From 1100dfc670766b99a1c9fdb86817f260e5ffbde7 Mon Sep 17 00:00:00 2001
From: Randy McMurchy <randy@linuxfromscratch.org>
Date: Sun, 5 Oct 2008 18:46:09 +0000
Subject: Added a patch to the Expect instructions to fix an issue with recent
 Tcl versions

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8571 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 4 ++++
 chapter01/whatsnew.xml  | 4 ++++
 chapter03/patches.xml   | 8 ++++++++
 chapter05/expect.xml    | 4 ++++
 patches.ent             | 4 ++++
 5 files changed, 24 insertions(+)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 41c01baca..c6d7ed689 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,10 @@
     <listitem>
       <para>2008-10-05</para>
       <itemizedlist>
+        <listitem>
+          <para>[randy] - Added a patch to the Expect instructions to fix an
+          issue with recent Tcl versions.</para>
+        </listitem>
         <listitem>
           <para>[randy] - Updated Tcl to 8.5.4.</para>
         </listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index a01231ba4..04fda3ec6 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -222,6 +222,10 @@
       <para>&db-fixes-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&expect-tcl-patch;</para>
+    </listitem>
+
     <listitem>
       <para>GMP-&gmp-version;</para>
     </listitem>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index c0d02d7e7..0854cbba8 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -90,6 +90,14 @@
       </listitem>
     </varlistentry>
 
+    <varlistentry>
+      <term>Expect Tcl Patch - <token>&expect-tcl-patch-size;</token>:</term>
+      <listitem>
+        <para>Download: <ulink url="&patches-root;&expect-tcl-patch;"/></para>
+        <para>MD5 sum: <literal>&expect-tcl-patch-md5;</literal></para>
+      </listitem>
+    </varlistentry>
+
     <varlistentry>
       <term>Glibc Iconv Test Fixes Patch - <token>&glibc-iconv-test-fixes-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 6b486f138..0cccaac47 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -46,6 +46,10 @@
 
 <screen><userinput remap="pre">patch -Np1 -i ../&expect-spawn-patch;</userinput></screen>
 
+    <para>Next, fix a bug that is a result of recent Tcl changes:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&expect-tcl-patch;</userinput></screen>
+
     <para>Next, force Expect's configure script to use <filename>/bin/stty</filename>
     instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system.
     This will ensure that our testsuite tools remain sane for the final builds of our
diff --git a/patches.ent b/patches.ent
index 52dff2b5c..9f73fff0f 100644
--- a/patches.ent
+++ b/patches.ent
@@ -42,6 +42,10 @@
 <!ENTITY expect-spawn-patch-md5 "ef6d0d0221c571fb420afb7033b3bbba">
 <!ENTITY expect-spawn-patch-size "6.8 KB">
 
+<!ENTITY expect-tcl-patch "expect-&expect-version;-tcl_8.5.4_fix-1.patch">
+<!ENTITY expect-tcl-patch-md5 "45274d863f7939f485a1971ae173a42b">
+<!ENTITY expect-tcl-patch-size "4.1 KB">
+
 
 <!ENTITY glibc-iconv-test-fixes-patch "glibc-&glibc-version;-iconv_tests-1.patch">
 <!ENTITY glibc-iconv-test-fixes-patch-md5 "cc5e95e418e0b2f8a54b14cf90c7c3b2">
-- 
cgit v1.2.3-54-g00ecf