Commit c415d388 authored by Sergei Golovan's avatar Sergei Golovan Committed by Sergei Golovan

* New upstream release.

  * Removed unnecessary patches.
  * Removed the expectk package because expectk was dropped from the upstream
    distribution. See NEWS.Debian for possible workarounds.
  * Updated package to standards version 3.9.2 (no changes needed).
parent 3db502be
As of Expect 5.45 expectk was removed from the upstream distribution
and from the Debian package as well. If you're using expectk replace it
either by 'expect' and 'package require Tk' or by 'wish' and
'package require Expect'.
-- Sergei Golovan <sgolovan@debian.org> Sat, 13 Aug 2011 18:29:42 +0400
expect (5.44.1.15-5) UNRELEASED; urgency=low
expect (5.45-1) unstable; urgency=low
* NOT RELEASED YET
* New upstream release.
* Removed unnecessary patches.
* Removed the expectk package because expectk was dropped from the upstream
distribution. See NEWS.Debian for possible workarounds.
* Updated package to standards version 3.9.2 (no changes needed).
-- Sergei Golovan <sgolovan@debian.org> Thu, 28 Oct 2010 09:17:46 +0400
-- Sergei Golovan <sgolovan@debian.org> Wed, 17 Aug 2011 21:50:29 +0400
expect (5.44.1.15-4) unstable; urgency=low
......
......@@ -3,15 +3,14 @@ Section: interpreters
Priority: optional
Maintainer: Sergei Golovan <sgolovan@debian.org>
Build-Depends: debhelper (>= 7.0.50~), quilt (>=0.46-7), autotools-dev, autoconf,
tcl8.5-dev, tk8.5-dev (>= 8.5.7-2)
tcl8.5-dev
Build-Conflicts: autoconf2.13
Standards-Version: 3.9.1
Standards-Version: 3.9.2
Homepage: http://sourceforge.net/projects/expect/
Package: expect
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: expectk
Description: A program that can automate interactive applications
Expect is a tool for automating interactive applications according to a script.
Following the script, Expect knows what can be expected from a program and what
......@@ -21,26 +20,12 @@ Description: A program that can automate interactive applications
structures to direct the dialogue. In addition, the user can take control and
interact directly when desired, afterward returning control to the script.
Package: expectk
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
Description: A program that can automate interactive applications (Tk hooks)
Expect is a tool for automating interactive applications according to a script.
Following the script, Expect knows what can be expected from a program and what
the correct response should be. Expect is also useful for testing these same
applications. And by adding Tk, you can also wrap interactive applications in
X11 GUIs. An interpreted language provides branching and high-level control
structures to direct the dialogue. In addition, the user can take control and
interact directly when desired, afterward returning control to the script.
.
This package contains the Tk hooks.
Package: expect-dev
Section: devel
Architecture: any
Depends: ${misc:Depends}, expect (= ${binary:Version}), tcl8.5-dev
Replaces: expect (<< 5.44.1.14)
Recommends: expectk (= ${binary:Version}), tk8.5-dev
Recommends: tk8.5-dev
Description: A program that can automate interactive applications (development)
Expect is a tool for automating interactive applications according to a script.
Following the script, Expect knows what can be expected from a program and what
......
ChangeLog
FAQ
NEWS
README
debian/NEWS.Debian
......@@ -19,7 +19,7 @@
#/usr/bin/expect_weather /usr/bin/weather
/usr/bin/expect_xkibitz /usr/bin/xkibitz
/usr/bin/expect_xpstat /usr/bin/xpstat
/usr/lib/libexpect.so.5.44.1.15 /usr/lib/libexpect.so
/usr/lib/libexpect.so.5.45 /usr/lib/libexpect.so
/usr/share/man/man1/expect_autoexpect.1.gz /usr/share/man/man1/autoexpect.1.gz
/usr/share/man/man1/expect_cryptdir.1.gz /usr/share/man/man1/cryptdir.1.gz
/usr/share/man/man1/expect_decryptdir.1.gz /usr/share/man/man1/decryptdir.1.gz
......
......@@ -2,3 +2,4 @@ ChangeLog
FAQ
NEWS
README
debian/NEWS.Debian
/usr/lib/libexpect.so.5.44.1.15 /usr/lib/libexpect.so.5
/usr/lib/libexpect.so.5.44.1.15 /usr/lib/libexpect.so.5.44
/usr/lib/libexpect.so.5.45 /usr/lib/libexpect.so.5
/usr/bin/expectk
/usr/share/man/man1/expectk.*
This diff is collapsed.
Author: Mike Markley <mike@markley.org>
Description: Checks for /usr/bin/crypt in cryptdir example (Closes: #67197).
--- expect-5.44.1.15.orig/example/cryptdir
+++ expect-5.44.1.15/example/cryptdir
@@ -8,6 +8,11 @@
--- expect-5.45.orig/example/cryptdir
+++ expect-5.45/example/cryptdir
@@ -15,6 +15,11 @@
#
# Encrypt or decrypts the current directory or named directory if given.
......@@ -15,9 +15,9 @@ Description: Checks for /usr/bin/crypt in cryptdir example (Closes: #67197).
if {[llength $argv] > 0} {
cd $argv
}
--- expect-5.44.1.15.orig/example/decryptdir
+++ expect-5.44.1.15/example/decryptdir
@@ -8,6 +8,11 @@
--- expect-5.45.orig/example/decryptdir
+++ expect-5.45/example/decryptdir
@@ -15,6 +15,11 @@
#
# Encrypt or decrypts the current directory or named directory if given.
......
Author: HJ Lu <hjl@lucon.org>
Description: Fixes problems when running GCCs testsuite (Closes: #156854).
diff -Naurp expect.orig/exp_chan.c expect/exp_chan.c
--- expect.orig/exp_chan.c 2009-08-03 06:58:30.000000000 +0000
+++ expect/exp_chan.c 2009-08-03 08:33:41.000000000 +0000
@@ -622,6 +622,7 @@ expCreateChannel(interp,fdin,fdout,pid)
esPtr->buffer = Tcl_NewStringObj("",0);
Tcl_IncrRefCount(esPtr->buffer);
esPtr->umsize = exp_default_match_max;
+ esPtr->umsize_changed = exp_default_match_max_changed;
/* this will reallocate object with an appropriate sized buffer */
expAdjust(esPtr);
diff -Naurp expect.orig/exp_command.h expect/exp_command.h
--- expect.orig/exp_command.h 2009-08-03 06:58:30.000000000 +0000
+++ expect/exp_command.h 2009-08-03 08:33:41.000000000 +0000
@@ -30,6 +30,7 @@ would appreciate credit if this program
EXTERN char * exp_get_var _ANSI_ARGS_((Tcl_Interp *,char *));
EXTERN int exp_default_match_max;
+EXTERN int exp_default_match_max_changed;
EXTERN int exp_default_parity;
EXTERN int exp_default_rm_nulls;
EXTERN int exp_default_close_on_eof;
@@ -103,6 +104,7 @@ typedef struct ExpState {
int msize; /* # of bytes that buffer can hold (max) */
int umsize; /* # of bytes (min) that is guaranteed to match */
/* this comes from match_max command */
+ int umsize_changed; /* is umsize changed by user? */
int printed; /* # of bytes written to stdout (if logging on) */
/* but not actually returned via a match yet */
int echoed; /* additional # of bytes (beyond "printed" above) */
diff -Naurp expect.orig/expect.c expect/expect.c
--- expect.orig/expect.c 2009-08-03 06:58:30.000000000 +0000
+++ expect/expect.c 2009-08-03 08:33:41.000000000 +0000
@@ -41,8 +41,17 @@ would appreciate credit if this program
#include "tcldbg.h"
#endif
+/* The initial length is 2000. We increment it by 2000. The maximum
+ is 8MB (0x800000). */
+#define EXP_MATCH_MAX 2000
+#define EXP_MATCH_INC 2000
+#define EXP_MATCH_STEP_LIMIT 0x700000
+#define EXP_MATCH_LIMIT 0x800000
+#define EXP_MATCH_LIMIT_QUOTE "0x800000"
+
/* initial length of strings that we can guarantee patterns can match */
-int exp_default_match_max = 2000;
+int exp_default_match_max = EXP_MATCH_MAX;
+int exp_default_match_max_changed = 0;
#define INIT_EXPECT_TIMEOUT_LIT "10" /* seconds */
#define INIT_EXPECT_TIMEOUT 10 /* seconds */
int exp_default_parity = TRUE;
@@ -1619,6 +1628,76 @@ expNullStrip(obj,offsetBytes)
return newsize;
}
+/* returns # of bytes until we see a newline at the end or EOF. */
+/*ARGSUSED*/
+static int
+expReadNewLine(interp,esPtr,save_flags) /* INTL */
+Tcl_Interp *interp;
+ExpState *esPtr;
+int save_flags;
+{
+ int size;
+ int exp_size;
+ int full_size;
+ int count;
+ char *str;
+
+ count = 0;
+ for (;;) {
+ exp_size = expSizeGet(esPtr);
+
+ /* When we reach the limit, we will only read one char at a
+ time. */
+ if (esPtr->umsize >= EXP_MATCH_STEP_LIMIT)
+ size = TCL_UTF_MAX;
+ else
+ size = exp_size;
+
+ if (exp_size + TCL_UTF_MAX >= esPtr->msize) {
+ if (esPtr->umsize >= EXP_MATCH_LIMIT) {
+ expDiagLogU("WARNING: interact buffer is full. probably your program\r\n");
+ expDiagLogU("is not interactive or has a very long output line. The\r\n");
+ expDiagLogU("current limit is " EXP_MATCH_LIMIT_QUOTE ".\r\n");
+ expDiagLogU("Dumping first half of buffer in order to continue\r\n");
+ expDiagLogU("Recommend you enlarge the buffer.\r\n");
+ exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
+ return count;
+ }
+ else {
+ esPtr->umsize += EXP_MATCH_INC;
+ expAdjust(esPtr);
+ }
+ }
+
+ full_size = esPtr->msize - (size / TCL_UTF_MAX);
+ size = Tcl_ReadChars(esPtr->channel,
+ esPtr->buffer,
+ full_size,
+ 1 /* append */);
+ if (size > 0) {
+ count += size;
+ /* We try again if there are more to read and we haven't
+ seen a newline at the end. */
+ if (size == full_size) {
+ str = Tcl_GetStringFromObj(esPtr->buffer, &size);
+ if (str[size - 1] != '\n')
+ continue;
+ }
+ }
+ else {
+ /* It is even trickier. We got an error from read. We have
+ to recover from it. Let's make sure the size of
+ buffer is correct. It can be corrupted. */
+ str = Tcl_GetString(esPtr->buffer);
+ Tcl_SetObjLength(esPtr->buffer, strlen(str));
+ }
+
+ break;
+ }
+
+ return count;
+}
+
/* returns # of bytes read or (non-positive) error of form EXP_XXX */
/* returns 0 for end of file */
/* If timeout is non-zero, set an alarm before doing the read, else assume */
@@ -1633,6 +1712,8 @@ int save_flags;
{
int cc = EXP_TIMEOUT;
int size = expSizeGet(esPtr);
+ int full_size;
+ int count;
if (size + TCL_UTF_MAX >= esPtr->msize)
exp_buffer_shuffle(interp,esPtr,save_flags,EXPECT_OUT,"expect");
@@ -1649,11 +1730,43 @@ int save_flags;
}
#endif
-
+ /* FIXME: If we ask less than what is available in the tcl buffer
+ when tcl has seen EOF, we will throw away the remaining data
+ since the next read will get EOF. Since expect is line-oriented,
+ we exand our buffer to get EOF or the next newline at the end of
+ the input buffer. I don't know if it is the right fix. H.J. */
+ count = 0;
+ full_size = esPtr->msize - (size / TCL_UTF_MAX);
cc = Tcl_ReadChars(esPtr->channel,
- esPtr->buffer,
- esPtr->msize - (size / TCL_UTF_MAX),
- 1 /* append */);
+ esPtr->buffer,
+ full_size,
+ 1 /* append */);
+ if (cc > 0) {
+ count += cc;
+ /* It gets very tricky. There are more to read. We will expand
+ our buffer and get EOF or a newline at the end unless the
+ buffer length has been changed. */
+ if (cc == full_size) {
+ char *str;
+ str = Tcl_GetStringFromObj(esPtr->buffer, &size);
+ if (str[size - 1] != '\n') {
+ if (esPtr->umsize_changed) {
+ char buf[20]; /* big enough for 64bit int in hex. */
+ snprintf(buf,sizeof(buf),"0x%x", esPtr->umsize);
+ expDiagLogU("WARNING: interact buffer is not large enough to hold\r\n");
+ expDiagLogU("all output. probably your program is not interactive or\r\n");
+ expDiagLogU("has a very long output line. The current limit is ");
+ expDiagLogU(buf);
+ expDiagLogU(".\r\n");
+ }
+ else {
+ cc = expReadNewLine(interp,esPtr,save_flags);
+ if (cc > 0)
+ count += cc;
+ }
+ }
+ }
+ }
i_read_errno = errno;
#ifdef SIMPLE_EVENT
@@ -1674,7 +1787,7 @@ int save_flags;
}
}
#endif
- return cc;
+ return count > 0 ? count : cc;
}
/*
@@ -2751,8 +2864,14 @@ char **argv;
return(TCL_ERROR);
}
- if (Default) exp_default_match_max = size;
- else esPtr->umsize = size;
+ if (Default) {
+ exp_default_match_max = size;
+ exp_default_match_max_changed = 1;
+ }
+ else {
+ esPtr->umsize = size;
+ esPtr->umsize_changed = 1;
+ }
return(TCL_OK);
}
Author: Sergei Golovan <sgolovan@debian.org>
Description: Adds '-soname' to the Makefile.
--- expect-5.44.1.15.orig/Makefile.in
+++ expect-5.44.1.15/Makefile.in
@@ -290,7 +290,7 @@
--- expect-5.45.orig/Makefile.in
+++ expect-5.45/Makefile.in
@@ -289,7 +289,7 @@
$(PKG_LIB_FILE): $(PKG_OBJECTS)
-rm -f $(PKG_LIB_FILE)
......
Author: Michael A. Cleverly <michael@cleverly.com>, Sergei Golovan <sgolovan@debian.org>
Description:
Fixes stupid typo in pkgIndex.in (Closes: #186179).
Adjusted for new soname (Closes: #381052).
Replaced [package require Expect] by direct loading libexpect library in all tests
because package management can't load the library from its build location.
Last-Modified: 2009-11-18
--- expect-5.44.1.15.orig/Makefile.in
+++ expect-5.44.1.15/Makefile.in
@@ -330,8 +330,10 @@
( echo pkg_mkIndex . $(PKG_LIB_FILE) \; exit; ) | $(TCLSH)
--- expect-5.45.orig/Makefile.in
+++ expect-5.45/Makefile.in
@@ -331,7 +331,7 @@
pkgIndex.tcl-hand:
- (echo 'package ifneeded Expect $(PACKAGE_VERSION) \
(echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \
echo 'package ifneeded Expect $(PACKAGE_VERSION) \
- [list load [file join $$dir $(PKG_LIB_FILE)]]'\
+ (echo 'if {[package vcompare [info tclversion] @TCL_VERSION@] < 0} return' ; \
+ echo '' ; \
+ echo 'package ifneeded Expect $(PACKAGE_VERSION) \
+ [list load [file join @prefix@ lib libexpect.so.@PACKAGE_VERSION@]]'\
) > pkgIndex.tcl
#========================================================================
--- expect-5.44.1.15.orig/pkgIndex.in
+++ expect-5.44.1.15/pkgIndex.in
@@ -7,4 +7,6 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.
--- expect-5.45.orig/tests/all.tcl
+++ expect-5.45/tests/all.tcl
@@ -7,7 +7,7 @@
package require tcltest
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
-package require Expect
+load [lindex [glob libexpect*.so] 0]
+if {[package vcompare [info tclversion] @TCL_VERSION@] < 0} return
+
-package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join @prefix@ lib libexpect.so.@PACKAGE_VERSION@]]
--- expect-5.44.1.15.orig/tests/cat.test
+++ expect-5.44.1.15/tests/cat.test
set ::tcltest::testSingleFile false
set ::tcltest::testsDirectory [file dirname [info script]]
--- expect-5.45.orig/tests/cat.test
+++ expect-5.45/tests/cat.test
@@ -9,7 +9,7 @@
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
......@@ -42,8 +38,8 @@ Last-Modified: 2009-11-18
#exp_internal -f /dev/ttyp5 0
--- expect-5.44.1.15.orig/tests/expect.test
+++ expect-5.44.1.15/tests/expect.test
--- expect-5.45.orig/tests/expect.test
+++ expect-5.45/tests/expect.test
@@ -9,7 +9,7 @@
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
......@@ -53,8 +49,8 @@ Last-Modified: 2009-11-18
catch {unset x}
--- expect-5.44.1.15.orig/tests/logfile.test
+++ expect-5.44.1.15/tests/logfile.test
--- expect-5.45.orig/tests/logfile.test
+++ expect-5.45/tests/logfile.test
@@ -9,7 +9,7 @@
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
......@@ -64,8 +60,8 @@ Last-Modified: 2009-11-18
test logfile-1.1 {basic logfile} {
set filename /tmp/logfile.[pid]
--- expect-5.44.1.15.orig/tests/pid.test
+++ expect-5.44.1.15/tests/pid.test
--- expect-5.45.orig/tests/pid.test
+++ expect-5.45/tests/pid.test
@@ -9,7 +9,7 @@
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
......@@ -75,8 +71,8 @@ Last-Modified: 2009-11-18
catch {unset x}
--- expect-5.44.1.15.orig/tests/send.test
+++ expect-5.44.1.15/tests/send.test
--- expect-5.45.orig/tests/send.test
+++ expect-5.45/tests/send.test
@@ -9,7 +9,7 @@
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
......@@ -86,8 +82,8 @@ Last-Modified: 2009-11-18
log_user 0
--- expect-5.44.1.15.orig/tests/spawn.test
+++ expect-5.44.1.15/tests/spawn.test
--- expect-5.45.orig/tests/spawn.test
+++ expect-5.45/tests/spawn.test
@@ -9,7 +9,7 @@
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
......@@ -97,8 +93,8 @@ Last-Modified: 2009-11-18
log_user 0
--- expect-5.44.1.15.orig/tests/stty.test
+++ expect-5.44.1.15/tests/stty.test
--- expect-5.45.orig/tests/stty.test
+++ expect-5.45/tests/stty.test
@@ -9,7 +9,7 @@
# do this in a way that is backward compatible for Tcl 8.3
namespace import ::tcltest::test ::tcltest::cleanupTests
......
......@@ -2,9 +2,9 @@ Author: Russell Coker <russell@coker.com.au>
Description:
Fixes file handle 3 to be left open when running programs (Closes: #166677).
--- expect-5.44.1.15.orig/exp_clib.c
+++ expect-5.44.1.15/exp_clib.c
@@ -2502,6 +2502,7 @@
--- expect-5.45.orig/exp_clib.c
+++ expect-5.45/exp_clib.c
@@ -2040,6 +2040,7 @@
/* save error fd while we're setting up new one */
errorfd = fcntl(2,F_DUPFD,3);
......@@ -12,8 +12,8 @@ Description:
/* and here is the macro to restore it */
#define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
--- expect-5.44.1.15.orig/exp_command.c
+++ expect-5.44.1.15/exp_command.c
--- expect-5.45.orig/exp_command.c
+++ expect-5.45/exp_command.c
@@ -1162,6 +1162,7 @@
/* save error fd while we're setting up new one */
......
Author: n/a
Description: Fixes some unsafe traps.
--- expect-5.44.1.15.orig/exp_trap.c
+++ expect-5.44.1.15/exp_trap.c
@@ -261,6 +261,18 @@
--- expect-5.45.orig/exp_trap.c
+++ expect-5.45/exp_trap.c
@@ -264,6 +264,18 @@
#if defined(SIGSTOP)
traps[SIGSTOP].reserved = TRUE;
#endif
......
Author: n/a
Description: Fixes sample expect shebang and excapes dashes.
--- expect-5.44.1.15.orig/expect.man
+++ expect-5.44.1.15/expect.man
--- expect-5.45.orig/expect.man
+++ expect-5.45/expect.man
@@ -108,11 +108,11 @@
may also be invoked implicitly on systems which support the #! notation
by marking the script executable, and making the first line in your script:
......
......@@ -3,9 +3,9 @@ Description:
Check before call ttyname, so don't coredump in chroots without /proc
(Closes: #440804).
--- expect-5.44.1.15.orig/pty_termios.c
+++ expect-5.44.1.15/pty_termios.c
@@ -366,6 +366,17 @@
--- expect-5.45.orig/pty_termios.c
+++ expect-5.45/pty_termios.c
@@ -369,6 +369,17 @@
#define W_OK 02
#endif
......@@ -23,7 +23,7 @@ Description:
int
exp_getptymaster()
{
@@ -451,7 +462,7 @@
@@ -454,7 +465,7 @@
master = open("/dev/ptc",O_RDWR);
if (master >= 0) {
/* never fails */
......@@ -32,7 +32,7 @@ Description:
}
exp_pty_slave_name = slave_name;
return(master);
@@ -472,7 +483,7 @@
@@ -475,7 +486,7 @@
close(slave);
return -1;
}
......
Author: Ian Jackson <iwj@ubuntu.com>
Description: expBusy forgets to open fdout (Closes: #440818).
--- expect-5.44.1.15.orig/exp_command.c
+++ expect-5.44.1.15/exp_command.c
--- expect-5.45.orig/exp_command.c
+++ expect-5.45/exp_command.c
@@ -315,7 +315,15 @@
fcntl(x,F_DUPFD,esPtr->fdin);
close(x);
......
Author: LaMont Jones <lamont@debian.org>
Description: Fix implicit definitions throughout (Closes: #441115).
--- expect-5.44.1.15.orig/Dbg.c
+++ expect-5.44.1.15/Dbg.c
@@ -8,6 +8,7 @@
*/
+#include <unistd.h>
#include <stdio.h>
#include "tcldbgcf.h"
--- expect-5.44.1.15.orig/exp_chan.c
+++ expect-5.44.1.15/exp_chan.c
@@ -31,9 +31,11 @@
#include "string.h"
+#include "expect.h"
--- expect-5.45.orig/exp_chan.c
+++ expect-5.45/exp_chan.c
@@ -34,6 +34,7 @@
#include "exp_rename.h"
#include "exp_prog.h"
#include "exp_command.h"
......@@ -25,19 +11,20 @@ Description: Fix implicit definitions throughout (Closes: #441115).
#include "exp_log.h"
#include "tcldbg.h" /* Dbg_StdinMode */
--- expect-5.44.1.15.orig/exp_clib.c
+++ expect-5.44.1.15/exp_clib.c
@@ -7,6 +7,8 @@
--- expect-5.45.orig/exp_clib.c
+++ expect-5.45/exp_clib.c
@@ -7,6 +7,9 @@
would appreciate credit if this program or parts of it are used.
*/
+#include <unistd.h>
+#include <sys/wait.h>
+
#include "expect_cf.h"
#include <stdio.h>
#include <setjmp.h>
--- expect-5.44.1.15.orig/exp_command.h
+++ expect-5.44.1.15/exp_command.h
--- expect-5.45.orig/exp_command.h
+++ expect-5.45/exp_command.h
@@ -7,6 +7,9 @@
would appreciate credit if this program or parts of it are used.
*/
......@@ -89,19 +76,8 @@ Description: Fix implicit definitions throughout (Closes: #441115).
/*
* Local Variables:
--- expect-5.44.1.15.orig/exp_glob.c
+++ expect-5.44.1.15/exp_glob.c
@@ -11,6 +11,8 @@
*/
+#include <string.h>
+
#include "expect_cf.h"
#include "tcl.h"
#include "exp_int.h"
--- expect-5.44.1.15.orig/exp_main_sub.c
+++ expect-5.44.1.15/exp_main_sub.c
--- expect-5.45.orig/exp_main_sub.c
+++ expect-5.45/exp_main_sub.c
@@ -2,6 +2,7 @@
#include "expect_cf.h"
......@@ -110,60 +86,8 @@ Description: Fix implicit definitions throughout (Closes: #441115).
#include <errno.h>
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
--- expect-5.44.1.15.orig/exp_main_tk.c
+++ expect-5.44.1.15/exp_main_tk.c
@@ -36,12 +36,21 @@
#undef USE_TCL_STUBS
#include <ctype.h>
+#include <string.h> /* strrchr(3) */
-#include "tk.h"
+#include <tclInt.h> /* Internal definitions for Tcl. */
+#include <tcl.h>
+
+#include <tk.h>
+#include <tkInt.h>
#include "expect_tcl.h"
#include "tcldbg.h"
+#include "expect.h"
+#include "exp_command.h"
+#include "exp_log.h"
+
#if (TCL_MAJOR_VERSION < 8) || ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION < 4))
/*
* The following variable is a special hack that is needed in order for
@@ -55,6 +64,8 @@
#ifdef TK_TEST
EXTERN int Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
#endif /* TK_TEST */
+int Tk_Init2(Tcl_Interp *interp);
+
/*
*----------------------------------------------------------------------
--- expect-5.44.1.15.orig/exp_trap.c
+++ expect-5.44.1.15/exp_trap.c
@@ -11,6 +11,7 @@
#include "expect_cf.h"
#include <stdio.h>
+#include <string.h>
#include <signal.h>
#include <sys/types.h>
@@ -28,6 +29,7 @@
#include "exp_prog.h"
#include "exp_command.h"
#include "exp_log.h"
+#include "exp_event.h"
#ifdef TCL_DEBUGGER
#include "tcldbg.h"
--- expect-5.44.1.15.orig/exp_tty.h
+++ expect-5.44.1.15/exp_tty.h
--- expect-5.45.orig/exp_tty.h
+++ expect-5.45/exp_tty.h
@@ -21,6 +21,7 @@
int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
int exp_israw(void);
......@@ -172,8 +96,8 @@ Description: Fix implicit definitions throughout (Closes: #441115).
void exp_tty_set(Tcl_Interp *interp, exp_tty *tty, int raw, int echo);
int exp_tty_set_simple(exp_tty *tty);
--- expect-5.44.1.15.orig/exp_tty_in.h
+++ expect-5.44.1.15/exp_tty_in.h
--- expect-5.45.orig/exp_tty_in.h
+++ expect-5.45/exp_tty_in.h
@@ -11,6 +11,8 @@
#define __EXP_TTY_IN_H__
......@@ -183,8 +107,8 @@ Description: Fix implicit definitions throughout (Closes: #441115).
#ifdef __MACHTEN__
#include "sys/types.h"
--- expect-5.44.1.15.orig/exp_win.c
+++ expect-5.44.1.15/exp_win.c
--- expect-5.45.orig/exp_win.c
+++ expect-5.45/exp_win.c
@@ -51,6 +51,7 @@
# include <sys/ptem.h>
#endif /* HAVE_SYS_PTEM_H */
......@@ -193,8 +117,8 @@ Description: Fix implicit definitions throughout (Closes: #441115).
#include "exp_tty_in.h"
#include "exp_win.h"
--- expect-5.44.1.15.orig/exp_win.h
+++ expect-5.44.1.15/exp_win.h
--- expect-5.45.orig/exp_win.h
+++ expect-5.45/exp_win.h
@@ -1,3 +1,5 @@
+#ifndef __EXP_WIN_H
+#define __EXP_WIN_H
......@@ -218,27 +142,8 @@ Description: Fix implicit definitions throughout (Closes: #441115).
char* exp_win2_columns_get _ANSI_ARGS_ ((int fd));
+
+#endif /* __EXP_WIN_H */
--- expect-5.44.1.15.orig/expect.c
+++ expect-5.44.1.15/expect.c
@@ -10,6 +10,8 @@
#include <sys/types.h>
#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
#include <signal.h>
#include <errno.h>
#include <ctype.h> /* for isspace */
@@ -29,6 +31,7 @@
#include "string.h"
+#include "expect.h"
#include "exp_rename.h"
#include "exp_prog.h"
#include "exp_command.h"
--- expect-5.44.1.15.orig/pty_termios.c
+++ expect-5.44.1.15/pty_termios.c
--- expect-5.45.orig/pty_termios.c
+++ expect-5.45/pty_termios.c
@@ -9,12 +9,19 @@
#include <stdio.h>
......@@ -259,7 +164,7 @@ Description: Fix implicit definitions throughout (Closes: #441115).
/*