Upgrade to Expect-5.44.1.15. Fixes #2689.

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

chapter01/changelog.xml

@@ -36,6 +36,16 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2010-06-21</para>
+      <itemizedlist>
+         <listitem>
+           <para>[matthew] - Upgrade to Expect-5.44.1.15.  Fixes
+           <ulink url="&lfs-ticket-root;2689">#2689</ulink>.</para>
+         </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-06-19</para>
       <itemizedlist>

chapter01/whatsnew.xml

@@ -55,9 +55,9 @@
     <listitem>
       <para>E2fsprogs &e2fsprogs-version;</para>
     </listitem>
-    <!--<listitem>
+    <listitem>
       <para>Expect &expect-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>File &file-version;</para>
     </listitem>-->
@@ -224,6 +224,10 @@
       <para>bzip2-1.0.5-version_fixes-1.patch</para>
     </listitem>
 
+    <listitem>
+      <para>expect-&expect-version;-no_tk-1.patch</para>
+    </listitem>
+
     <listitem>
       <para>gettext-0.18-skip_test-1.patch</para>
     </listitem>
@@ -237,6 +241,12 @@
   <itemizedlist>
     <title>Removed:</title>
 
+    <listitem>
+      <para>expect-5.43.0-spawn-1.patch</para>
+    </listitem>
+    <listitem>
+      <para>expect-5.43.0-tcl_8.5.5_fix-1.patch</para>
+    </listitem>
     <listitem>
       <para>gettext-0.17-upstream_fixes-2.patch</para>
     </listitem>

chapter03/patches.xml

@@ -75,18 +75,10 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Expect Spawn Patch - <token>&expect-spawn-patch-size;</token>:</term>
+      <term>Expect Tk Configure Patch - <token>&expect-tk-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&expect-spawn-patch;"/></para>
-        <para>MD5 sum: <literal>&expect-spawn-patch-md5;</literal></para>
-      </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>
+        <para>Download: <ulink url="&patches-root;&expect-tk-patch;"/></para>
+        <para>MD5 sum: <literal>&expect-tk-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 

chapter05/expect.xml

@@ -41,14 +41,11 @@
   <sect2 role="installation">
     <title>Installation of Expect</title>
 
-    <para>First, fix a bug that can result in false failures during the GCC test
-    suite run:</para>
+    <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-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>
+<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>
     instead of a <filename>/usr/local/bin/stty</filename> it may find on the host system.
@@ -61,7 +58,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-x=no</userinput></screen>
+  --with-tclinclude=/tools/include --with-tk=no</userinput></screen>
 
     <variablelist>
       <title>The meaning of the configure options:</title>
@@ -86,7 +83,7 @@ sed 's:/usr/local/bin:/bin:' configure.orig &gt; configure</userinput></screen>
       </varlistentry>
 
       <varlistentry>
-        <term><parameter>--with-x=no</parameter></term>
+        <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

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100618">
-<!ENTITY releasedate "June 18, 2010">
+<!ENTITY version "SVN-20100621">
+<!ENTITY releasedate "June 21, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

packages.ent

@@ -109,12 +109,12 @@
 <!ENTITY e2fsprogs-ch6-du "45 MB testsuite included">
 <!ENTITY e2fsprogs-ch6-sbu "0.5 SBU testsuite included">
 
-<!ENTITY expect-version "5.43.0">
-<!ENTITY expect-lib-version "5.43">
-<!ENTITY expect-size "513 KB">
-<!ENTITY expect-url "http://expect.nist.gov/src/expect-&expect-version;.tar.gz">
-<!ENTITY expect-md5 "43e1dc0e0bc9492cf2e1a6f59f276bc3">
-<!ENTITY expect-home "http://expect.nist.gov/">
+<!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-home "http://expect.sourceforge.net/">
 <!ENTITY expect-ch5-du "4.1 MB">
 <!ENTITY expect-ch5-sbu "0.1 SBU">
 

patches.ent

@@ -39,14 +39,9 @@
 <!ENTITY diffutils-i18n-patch-size "18 KB">
 
 
-<!ENTITY expect-spawn-patch "expect-&expect-version;-spawn-1.patch">
-<!ENTITY expect-spawn-patch-md5 "ef6d0d0221c571fb420afb7033b3bbba">
-<!ENTITY expect-spawn-patch-size "6.8 KB">
-
-
-<!ENTITY expect-tcl-patch "expect-&expect-version;-tcl_8.5.5_fix-1.patch">
-<!ENTITY expect-tcl-patch-md5 "6904a384960ce0e8f0d0b32f7903d7a1">
-<!ENTITY expect-tcl-patch-size "4.1 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">