Upgrade to Expect-5.45. Fixes #2791.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9417 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

7 files changed, 25 insertions, 40 deletions

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 98bc0f17f..993d85b81 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
 
 -->
     <listitem>
+      <para>2010-11-18</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] Upgrade to Expect-5.45. Fixes
+          <ulink url="&lfs-ticket-root;2791">#2791</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>2010-11-10</para>
       <itemizedlist>
         <listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 7cc50d262..536f62b0c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -58,9 +58,9 @@
     <!--<listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Expect &expect-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>File &file-version;</para>
     </listitem>-->
@@ -277,6 +277,10 @@
     </listitem>
 
     <listitem>
+      <para>expect-5.44.1.15-no_tk-1.patch</para>
+    </listitem>
+
+    <listitem>
       <para>perl-5.12.1-libc-1.patch</para>
     </listitem>
 
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 34c33d492..cb883502d 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -59,14 +59,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Expect Tk Configure Patch - <token>&expect-tk-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&expect-tk-patch;"/></para>
-        <para>MD5 sum: <literal>&expect-tk-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>Flex GCC-4.4.x Patch - <token>&flex-gcc-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&flex-gcc-patch;"/></para>
diff --git a/chapter05/expect.xml b/chapter05/expect.xml
index 108edacdf..e1a9d9dbc 100644
--- a/chapter05/expect.xml
+++ b/chapter05/expect.xml
@@ -41,13 +41,7 @@
   <sect2 role="installation">
     <title>Installation of Expect</title>
 
-    <para>First, apply a patch to remove the dependency on Tk, that may be
-    present on the host but will not be available once we enter the
-    <command>chroot</command> environment:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&expect-tk-patch;</userinput></screen>
-
-    <para>Next, force Expect's configure script to use <filename>/bin/stty</filename>
+    <para>First, 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 test suite tools remain sane for the final builds of our
     toolchain:</para>
@@ -58,7 +52,7 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
     <para>Now prepare Expect for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools --with-tcl=/tools/lib \
-  --with-tclinclude=/tools/include --with-tk=no</userinput></screen>
+  --with-tclinclude=/tools/include</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -82,16 +76,6 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
         </listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><parameter>--with-tk=no</parameter></term>
-        <listitem>
-          <para>This tells the configure script not to search for Tk (the
-          Tcl GUI component) or the X Window System libraries, both of which
-          may reside on the host system but will not exist in the temporary
-          environment.</para>
-        </listitem>
-      </varlistentry>
-
     </variablelist>
 
     <para>Build the package:</para>
diff --git a/general.ent b/general.ent
index 352f1cfd1..1e072150c 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20101110">
-<!ENTITY releasedate "November 10, 2010">
+<!ENTITY version "SVN-20101118">
+<!ENTITY releasedate "November 18, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.8">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 018f1f572..d03eee9f0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -110,11 +110,11 @@
 <!ENTITY e2fsprogs-ch6-du "45 MB">
 <!ENTITY e2fsprogs-ch6-sbu "0.5 SBU">
 
-<!ENTITY expect-version "5.44.1.15">
-<!ENTITY expect-lib-version "5.44">
-<!ENTITY expect-size "534 KB">
-<!ENTITY expect-url "&sourceforge;expect/expect-&expect-version;.tar.bz2">
-<!ENTITY expect-md5 "9307bbf67e19125036ce34544a78dadf">
+<!ENTITY expect-version "5.45">
+<!ENTITY expect-lib-version "5.45">
+<!ENTITY expect-size "614 KB">
+<!ENTITY expect-url "&sourceforge;expect/expect&expect-version;.tar.gz">
+<!ENTITY expect-md5 "44e1a4f4c877e9ddc5a542dfa7ecc92b">
 <!ENTITY expect-home "http://expect.sourceforge.net/">
 <!ENTITY expect-ch5-du "4.1 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
diff --git a/patches.ent b/patches.ent
index c676987a7..cf7c46326 100644
--- a/patches.ent
+++ b/patches.ent
@@ -30,11 +30,6 @@
 <!ENTITY diffutils-i18n-patch-size "18 KB">
 
 
-<!ENTITY expect-tk-patch "expect-&expect-version;-no_tk-1.patch">
-<!ENTITY expect-tk-patch-md5 "ba1b2c5841eea6c62b7522dfde412e65">
-<!ENTITY expect-tk-patch-size "4.4 KB">
-
-
 <!ENTITY flex-gcc-patch "flex-&flex-version;-gcc44-1.patch">
 <!ENTITY flex-gcc-patch-md5 "ad9109820534278c6dd0898178c0788f">
 <!ENTITY flex-gcc-patch-size "1 KB">