plomby

Changed files:
    expect-mkpasswd.patch -> 1.1
    expect-pty.patch -> 1.1
    expect-strf.patch -> 1.1
    expect.patch -> 1.1

diff --git a/expect-mkpasswd.patch b/expect-mkpasswd.patch
new file mode 100644 (file)
index 0000000..f93fd1c
--- /dev/null
+++ b/expect-mkpasswd.patch
@@ -0,0 +1,10 @@
+--- tcltk-8.0.2/expect-5.26/example/mkpasswd.jbj       Mon Jun 29 09:51:28 1998
++++ tcltk-8.0.2/expect-5.26/example/mkpasswd   Mon Jun 29 09:53:25 1998
+@@ -183,6 +183,7 @@
+       expect {
+               "assword*:" {
+                       # some systems say "Password (again):"
++                      sleep .5s
+                       send "$password\r"
+                       exp_continue
+               }

diff --git a/expect-pty.patch b/expect-pty.patch
new file mode 100644 (file)
index 0000000..495015b
--- /dev/null
+++ b/expect-pty.patch
@@ -0,0 +1,23 @@
+--- expect-5.26/pty_termios.c  Mon Mar 16 19:53:41 1998
++++ expect-5.26.orig/pty_termios.c     Thu Oct  8 09:51:36 1998
+@@ -131,7 +131,11 @@
+ #endif
+ 
+ #if defined(HAVE__GETPTY) || defined(HAVE_PTC_PTS) || defined(HAVE_PTMX)
++# if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
++#include <expect.h>
++#else
+ static char *slave_name;
++# endif /* GNU libc-2.1 */
+ #endif
+ 
+ #if defined(HAVE_GETPTY)
+@@ -369,7 +373,7 @@
+ #else
+       if ((master = open("/dev/ptmx", O_RDWR)) == -1) return(-1);
+ #endif
+-      if ((slave_name = (char *)ptsname(master)) == NULL || unlockpt(master)) {
++      if (slave_name ==  NULL || unlockpt(master)) {
+               close(master);
+               return(-1);
+       } else if (grantpt(master)) {

diff --git a/expect-strf.patch b/expect-strf.patch
new file mode 100644 (file)
index 0000000..5ada8b3
--- /dev/null
+++ b/expect-strf.patch
@@ -0,0 +1,13 @@
+--- expect-5.28/exp_strf.c     Fri May  3 22:01:25 1996
++++ expect-5.28.pld/exp_strf.c Sun Jan 31 20:18:39 1999
+@@ -97,8 +97,9 @@
+ static int weeknumber();
+ adddecl(static int iso8601wknum();)
+ #else
+-
++#if !((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1))
+ extern char *strchr(const char *str, int ch);
++#endif /* GNU libc-2.1 */
+ extern char *getenv(const char *v);
+ static int weeknumber(const struct tm *timeptr, int firstweekday);
+ adddecl(static int iso8601wknum(const struct tm *timeptr);)

diff --git a/expect.patch b/expect.patch
new file mode 100644 (file)
index 0000000..c9ae292
--- /dev/null
+++ b/expect.patch
@@ -0,0 +1,12 @@
+diff -Nru expect-5.26/Makefile.in expect-5.26.new/Makefile.in
+--- expect-5.26/Makefile.in    Tue Jun 16 15:53:36 1998
++++ expect-5.26.new/Makefile.in        Fri Sep 11 13:17:45 1998
+@@ -410,8 +410,6 @@
+       $(INSTALL_DATA) $(srcdir)/expect_tcl.h $(includedir)
+       $(INSTALL_DATA) $(srcdir)/expect_comm.h $(includedir)
+ # force installation of Tcl's private regexp definition - we simply have to
+-# make it public in order for people to use Expect's C lib.
+-      $(INSTALL_DATA) $(TCLHDIR)/tclRegexp.h $(includedir)
+ # install Debugger's public include file (just in case it's not there)
+       $(INSTALL_DATA) $(srcdir)/Dbg.h $(includedir)
+ # some people don't install Tcl, sigh