--- /dev/null
+--- expect5.31/exp_command.c.alpha Tue Aug 17 15:51:00 1999
++++ expect5.31/exp_command.c Fri Mar 17 08:43:39 2000
+@@ -795,14 +795,18 @@
+ return TCL_ERROR;
+ }
+ if (mode & TCL_READABLE) {
+- if (TCL_ERROR == Tcl_GetChannelHandle(channel, TCL_READABLE, (ClientData) &rfd)) {
++ ClientData rfd_data;
++ if (TCL_ERROR == Tcl_GetChannelHandle(channel, TCL_READABLE, &rfd_data)) {
+ return TCL_ERROR;
+ }
++ rfd = (int)rfd_data;
+ }
+ if (mode & TCL_WRITABLE) {
+- if (TCL_ERROR == Tcl_GetChannelHandle(channel, TCL_WRITABLE, (ClientData) &wfd)) {
++ ClientData wfd_data;
++ if (TCL_ERROR == Tcl_GetChannelHandle(channel, TCL_WRITABLE, &wfd_data)) {
+ return TCL_ERROR;
+ }
++ wfd = (int)wfd_data;
+ }
+ master = ((mode & TCL_READABLE)?rfd:wfd);
+
--- /dev/null
+--- expect5.31/example/rftp.bug7869 Sat Mar 18 13:41:50 2000
++++ expect5.31/example/rftp Sat Mar 18 13:42:36 2000
+@@ -113,7 +113,7 @@
+ } timeout {
+ send_user "timed out on make remote directory $name\n"
+ return 0
+- } -re "(257|550.*exists).*ftp>.*"
++ } -re "(257|553|550.*exists).*ftp>.*"
+ # 550 is returned if directory already exists
+
+ send "cd $name\r"
--- /dev/null
+--- expect5.31/fixcat.fixcat Fri Jun 2 13:35:51 2000
++++ expect5.31/fixcat Fri Jun 2 13:36:56 2000
+@@ -8,11 +8,14 @@
+ # If this file is sitting in an architecture-specific library directory,
+ # then it serves as a marker that your /bin/cat buffers by default.
+
++# XXX Red Hat linux has unbuffered cat
++exit 0
++
+ # test for when catting to/from files
+-log_user 0
+-spawn -open [open "|cat" "r+"]
+-send "\r"
+-expect "\r" {exit 1}
++#log_user 0
++#spawn -open [open "|cat" "r+"]
++#send "\r"
++#expect "\r" {exit 1}
+
+ # test for when catting to real tty
+ #log_user 0
--- /dev/null
+--- expect-5.28/example/kibitz.jbj Thu Apr 8 16:25:11 1999
++++ expect-5.28/example/kibitz Thu Apr 8 16:25:32 1999
+@@ -354,7 +354,7 @@
+ # can't use exec since write insists on being run from a tty!
+ set rc [catch {
+ system echo "Can we talk? Run: \"kibitz -$pid\"" | \
+- /bin/write $user $tty
++ /usr/bin/write $user $tty
+ }
+ ]
+ if $rc {rmfifos;abort}