[Pkg-tcltk-commits] r949 - in expect/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Oct 16 19:44:34 UTC 2009
Author: sgolovan
Date: 2009-10-16 19:44:34 +0000 (Fri, 16 Oct 2009)
New Revision: 949
Added:
expect/trunk/debian/README.source
expect/trunk/debian/patches/18-non-linux.patch
Removed:
expect/trunk/debian/expect-dev.examples
Modified:
expect/trunk/debian/changelog
expect/trunk/debian/control
expect/trunk/debian/copyright
expect/trunk/debian/expect-dev.install
expect/trunk/debian/expect-dev.links
expect/trunk/debian/expect.install
expect/trunk/debian/expect.links
expect/trunk/debian/expect.lintian-overrides
expect/trunk/debian/patches/05-makefile-soname.patch
expect/trunk/debian/patches/06-pkgindex.patch
expect/trunk/debian/patches/07-file-handle.patch
expect/trunk/debian/patches/10-manpage.patch
expect/trunk/debian/patches/12-fdout.patch
expect/trunk/debian/patches/13-implicit-defs.patch
expect/trunk/debian/patches/15-comments.patch
expect/trunk/debian/patches/series
expect/trunk/debian/rules
Log:
[expect]
* New maintainer Sergei Golovan <sgolovan at debian.org> (closes: #543839).
* New upstream CVS snapshot.
* Switched to upstream which maintains CVN at SourceForge.net because
Don Libet doesn't have time to develop Expect anymore. Therefore, changed
upstream homepage.
* Switched to Tcl/Tk 8.5 (closes: #512150).
* Don't call configure and build targets twice anymore (closes: #441114).
* Upstream includes patch which fixes empty writes (closes: #421187).
* The new upstream fixed a regression which didn't allow to read from stdin
(closes: #347259).
* Added README.source with a link to /usr/share/doc/quilt/README.source
where an instruction on how to patch upstream sources is located.
* Removed examples from /usr/share/doc/expect-dev/examples because all of
them are shipped in /usr/bin directory. This makes uncompressing them
unnecessary (closes: #495605).
* Added links all expect_* script to their original names, except mkpasswd,
rftp and weather to avoid conflicts with other packages
(closes: #508320, #532332).
* Upstream removed useless "puts hello" from multixterm script
(closes: #550909).
Added: expect/trunk/debian/README.source
===================================================================
--- expect/trunk/debian/README.source (rev 0)
+++ expect/trunk/debian/README.source 2009-10-16 19:44:34 UTC (rev 949)
@@ -0,0 +1,8 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get detailed instructions on how to apply the series of patches
+and modify them, please read /usr/share/doc/quilt/README.source
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 16 Oct 2009 22:39:58 +0400
Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/changelog 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,3 +1,28 @@
+expect (5.44.1.14-1) unstable; urgency=low
+
+ * New maintainer Sergei Golovan <sgolovan at debian.org> (closes: #543839).
+ * New upstream CVS snapshot.
+ * Switched to upstream which maintains CVN at SourceForge.net because
+ Don Libet doesn't have time to develop Expect anymore. Therefore, changed
+ upstream homepage.
+ * Switched to Tcl/Tk 8.5 (closes: #512150).
+ * Don't call configure and build targets twice anymore (closes: #441114).
+ * Upstream includes patch which fixes empty writes (closes: #421187).
+ * The new upstream fixed a regression which didn't allow to read from stdin
+ (closes: #347259).
+ * Added README.source with a link to /usr/share/doc/quilt/README.source
+ where an instruction on how to patch upstream sources is located.
+ * Removed examples from /usr/share/doc/expect-dev/examples because all of
+ them are shipped in /usr/bin directory. This makes uncompressing them
+ unnecessary (closes: #495605).
+ * Added links all expect_* script to their original names, except mkpasswd,
+ rftp and weather to avoid conflicts with other packages
+ (closes: #508320, #532332).
+ * Upstream removed useless "puts hello" from multixterm script
+ (closes: #550909).
+
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 16 Oct 2009 23:39:56 +0400
+
expect (5.43.0-19) unstable; urgency=low
* Updating package to standards version 3.8.3.
Modified: expect/trunk/debian/control
===================================================================
--- expect/trunk/debian/control 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/control 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,11 +1,12 @@
Source: expect
Section: interpreters
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
+Maintainer: Sergei Golovan <sgolovan at debian.org>
Build-Depends:
- debhelper (>= 7), quilt, autotools-dev, autoconf2.13, tcl8.4-dev, tk8.4-dev
+ debhelper (>= 7.0.50~), quilt (>=0.46-7), autotools-dev, autoconf, tcl8.5-dev, tk8.5-dev,
+ x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev
Standards-Version: 3.8.3
-Homepage: http://expect.nist.gov/
+Homepage: http://sourceforge.net/projects/expect/
Package: expect
Architecture: any
@@ -37,7 +38,8 @@
Package: expect-dev
Section: devel
Architecture: any
-Depends: ${misc:Depends}, expect (= ${binary:Version}), tcl8.4-dev, tk8.4-dev
+Depends: ${misc:Depends}, expect (= ${binary:Version}), tcl8.5-dev
+Recommends: expectk (= ${binary:Version}), 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
Modified: expect/trunk/debian/copyright
===================================================================
--- expect/trunk/debian/copyright 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/copyright 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,5 +1,5 @@
Author: Don Libes <libes at cme.nist.gov>
-Download: http://expect.nist.gov/
+Download: http://sourceforge.net/projects/expect/
Files: *
Copyright: (C) 1987-2002 National Institute of Standards and Technology <http://www.nist.gov/>
Deleted: expect/trunk/debian/expect-dev.examples
===================================================================
--- expect/trunk/debian/expect-dev.examples 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/expect-dev.examples 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/*
-debian/tmp/usr/share/man/man1/*
Modified: expect/trunk/debian/expect-dev.install
===================================================================
--- expect/trunk/debian/expect-dev.install 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/expect-dev.install 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,4 +1,5 @@
/usr/bin/expect_*
/usr/include/*
-/usr/lib/*.a
+#/usr/lib/*.a
/usr/share/man/man1/expect_*
+/usr/share/man/man3/libexpect.*
Modified: expect/trunk/debian/expect-dev.links
===================================================================
--- expect/trunk/debian/expect-dev.links 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/expect-dev.links 2009-10-16 19:44:34 UTC (rev 949)
@@ -1 +1,33 @@
-/usr/lib/libexpect.so.5.43.0 /usr/lib/libexpect.so
+/usr/bin/expect_autoexpect /usr/bin/autoexpect
+/usr/bin/expect_autopasswd /usr/bin/autopasswd
+/usr/bin/expect_cryptdir /usr/bin/cryptdir
+/usr/bin/expect_decryptdir /usr/bin/decryptdir
+/usr/bin/expect_dislocate /usr/bin/dislocate
+/usr/bin/expect_ftp-rfc /usr/bin/ftp-rfc
+/usr/bin/expect_kibitz /usr/bin/kibitz
+/usr/bin/expect_lpunlock /usr/bin/lpunlock
+#/usr/bin/expect_mkpasswd /usr/bin/mkpasswd
+/usr/bin/expect_multixterm /usr/bin/multixterm
+/usr/bin/expect_passmass /usr/bin/passmass
+#/usr/bin/expect_rftp /usr/bin/rftp
+/usr/bin/expect_rlogin-cwd /usr/bin/rlogin-cwd
+/usr/bin/expect_timed-read /usr/bin/timed-read
+/usr/bin/expect_timed-run /usr/bin/timed-run
+/usr/bin/expect_tknewsbiff /usr/bin/tknewsbiff
+/usr/bin/expect_tkpasswd /usr/bin/tkpasswd
+/usr/bin/expect_unbuffer /usr/bin/unbuffer
+#/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.14 /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
+/usr/share/man/man1/expect_dislocate.1.gz /usr/share/man/man1/dislocate.1.gz
+/usr/share/man/man1/expect_kibitz.1.gz /usr/share/man/man1/kibitz.1.gz
+#/usr/share/man/man1/expect_mkpasswd.1.gz /usr/share/man/man1/mkpasswd.1.gz
+/usr/share/man/man1/expect_multixterm.1.gz /usr/share/man/man1/multixterm.1.gz
+/usr/share/man/man1/expect_passmass.1.gz /usr/share/man/man1/passmass.1.gz
+/usr/share/man/man1/expect_tknewsbiff.1.gz /usr/share/man/man1/tknewsbiff.1.gz
+/usr/share/man/man1/expect_unbuffer.1.gz /usr/share/man/man1/unbuffer.1.gz
+/usr/share/man/man1/expect_xkibitz.1.gz /usr/share/man/man1/xkibitz.1.gz
Modified: expect/trunk/debian/expect.install
===================================================================
--- expect/trunk/debian/expect.install 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/expect.install 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,5 +1,4 @@
/usr/bin/expect
/usr/lib/*.so.*
-/usr/lib/expect*
+/usr/lib/tcltk/*
/usr/share/man/man1/expect.*
-/usr/share/man/man3/libexpect.*
Modified: expect/trunk/debian/expect.links
===================================================================
--- expect/trunk/debian/expect.links 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/expect.links 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,2 +1,2 @@
-/usr/lib/libexpect.so.5.43.0 /usr/lib/libexpect.so.5
-/usr/lib/libexpect.so.5.43.0 /usr/lib/libexpect.so.5.43
+/usr/lib/libexpect.so.5.44.1.14 /usr/lib/libexpect.so.5
+/usr/lib/libexpect.so.5.44.1.14 /usr/lib/libexpect.so.5.44
Modified: expect/trunk/debian/expect.lintian-overrides
===================================================================
--- expect/trunk/debian/expect.lintian-overrides 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/expect.lintian-overrides 2009-10-16 19:44:34 UTC (rev 949)
@@ -1 +1 @@
-expect: package-name-doesnt-match-sonames libexpect5.43.0
+expect: package-name-doesnt-match-sonames
Modified: expect/trunk/debian/patches/05-makefile-soname.patch
===================================================================
--- expect/trunk/debian/patches/05-makefile-soname.patch 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/05-makefile-soname.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,15 +1,14 @@
-Author: Mike Markley <mike at markley.org>
+Author: Sergei Golovan <sgolovan at debian.org>
Description: Adds '-soname' to the Makefile.
-diff -Naurp expect.orig/Makefile.in expect/Makefile.in
---- expect.orig/Makefile.in 2009-08-03 06:58:30.000000000 +0000
-+++ expect/Makefile.in 2009-08-03 08:34:51.000000000 +0000
-@@ -413,7 +413,7 @@ $(EXP_UNSHARED_LIB_FILE): $(OFILES)
- expect-shared-lib-file :: $(EXP_SHARED_LIB_FILE)
- $(EXP_SHARED_LIB_FILE): $(OFILES)
- -rm -f $(EXP_SHARED_LIB_FILE)
-- @TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+ @TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@ -Wl,-soname,$(SONAME)
+--- expect.orig/Makefile.in
++++ expect/Makefile.in
+@@ -290,7 +290,7 @@
- .PHONY: install-info install info
- install-info:
+ $(PKG_LIB_FILE): $(PKG_OBJECTS)
+ -rm -f $(PKG_LIB_FILE)
+- ${MAKE_LIB}
++ ${MAKE_LIB} -Wl,-soname,$(SONAME)
+ $(RANLIB) $(PKG_LIB_FILE)
+
+ $(PKG_STUB_LIB_FILE): $(PKG_STUB_OBJECTS)
Modified: expect/trunk/debian/patches/06-pkgindex.patch
===================================================================
--- expect/trunk/debian/patches/06-pkgindex.patch 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/06-pkgindex.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,14 +1,25 @@
Author: Michael A. Cleverly <michael at cleverly.com>
+Modified by Sergei Golovan <sgolovan at debian.org>
Description:
Fixes stupid typo in pkgIndex.in (Closes: #186179).
Adjusted for new soname (Closes: #381052).
-diff -Naurp expect.orig/pkgIndex.in expect/pkgIndex.in
---- expect.orig/pkgIndex.in 2009-08-03 06:58:30.000000000 +0000
-+++ expect/pkgIndex.in 2009-08-03 08:35:18.000000000 +0000
+--- expect.orig/Makefile.in
++++ expect/Makefile.in
+@@ -331,7 +331,7 @@
+
+ pkgIndex.tcl-hand:
+ (echo 'package ifneeded Expect $(PACKAGE_VERSION) \
+- [list load [file join $$dir $(PKG_LIB_FILE)]]'\
++ [list load [file join @prefix@ lib libexpect.so. at PACKAGE_VERSION@]]'\
+ ) > pkgIndex.tcl
+
+ #========================================================================
+--- expect.orig/pkgIndex.in
++++ expect/pkgIndex.in
@@ -7,4 +7,4 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.
-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. at EXP_VERSION_FULL@]]
++package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join @prefix@ lib libexpect.so. at PACKAGE_VERSION@]]
Modified: expect/trunk/debian/patches/07-file-handle.patch
===================================================================
--- expect/trunk/debian/patches/07-file-handle.patch 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/07-file-handle.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -5,7 +5,7 @@
diff -Naurp expect.orig/exp_clib.c expect/exp_clib.c
--- expect.orig/exp_clib.c 2009-08-03 06:58:30.000000000 +0000
+++ expect/exp_clib.c 2009-08-03 08:36:54.000000000 +0000
-@@ -2500,6 +2500,7 @@ when trapping, see below in child half o
+@@ -2502,6 +2502,7 @@ when trapping, see below in child half o
/* save error fd while we're setting up new one */
errorfd = fcntl(2,F_DUPFD,3);
@@ -16,11 +16,11 @@
diff -Naurp expect.orig/exp_command.c expect/exp_command.c
--- expect.orig/exp_command.c 2009-08-03 06:58:30.000000000 +0000
+++ expect/exp_command.c 2009-08-03 08:36:54.000000000 +0000
-@@ -1048,6 +1048,7 @@ when trapping, see below in child half o
+@@ -1162,6 +1162,7 @@ when trapping, see below in child half o
- /* save error fd while we're setting up new one */
- errorfd = fcntl(2,F_DUPFD,3);
-+ fcntl(3, F_SETFD, FD_CLOEXEC);
- /* and here is the macro to restore it */
+ /* save error fd while we're setting up new one */
+ errorfd = fcntl(2,F_DUPFD,3);
++ fcntl(3, F_SETFD, FD_CLOEXEC);
+ /* and here is the macro to restore it */
#define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
Modified: expect/trunk/debian/patches/10-manpage.patch
===================================================================
--- expect/trunk/debian/patches/10-manpage.patch 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/10-manpage.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -225,7 +225,7 @@
proc lognumber {} {
- interact -nobuffer -re "(.*)\\r" return
+ interact \-nobuffer \-re "(.*)\\r" return
- puts $log "[exec date]: dialed $interact_out(1,string)"
+ puts $log "[clock format [clock seconds]]: dialed $interact_out(1,string)"
}
- interact -nobuffer "atd" lognumber
@@ -383,7 +383,7 @@
+The expect_background command ignores \-timeout arguments and has no
concept of timeouts in general.
- .SH EXPECT HINTS
+ .SH "EXPECT HINTS"
@@ -2447,7 +2448,7 @@ can be used. If EXPECT_PROMPT doesn't e
set prompt "(%|#|\\\\$) $" ;# default prompt
catch {set prompt $env(EXPECT_PROMPT)}
Modified: expect/trunk/debian/patches/12-fdout.patch
===================================================================
--- expect/trunk/debian/patches/12-fdout.patch 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/12-fdout.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -4,20 +4,20 @@
diff -Naurp expect.orig/exp_command.c expect/exp_command.c
--- expect.orig/exp_command.c 2009-08-03 06:58:30.000000000 +0000
+++ expect/exp_command.c 2009-08-03 08:37:47.000000000 +0000
-@@ -310,7 +310,15 @@ expBusy(esPtr)
- fcntl(x,F_DUPFD,esPtr->fdin);
- close(x);
- }
-- expCloseOnExec(esPtr->fdin);
-+ if (esPtr->fdout != EXP_NOFD &&
-+ esPtr->fdout != esPtr->fdin) {
-+ fcntl(esPtr->fdin,F_DUPFD,esPtr->fdout);
-+ }
-+ if (esPtr->fdin > 2)
-+ expCloseOnExec(esPtr->fdin);
-+ if (esPtr->fdout != EXP_NOFD &&
-+ esPtr->fdout > 2)
-+ expCloseOnExec(esPtr->fdout);
- esPtr->fdBusy = TRUE;
+@@ -315,7 +315,15 @@ expBusy(esPtr)
+ fcntl(x,F_DUPFD,esPtr->fdin);
+ close(x);
+ }
+- expCloseOnExec(esPtr->fdin);
++ if (esPtr->fdout != EXP_NOFD &&
++ esPtr->fdout != esPtr->fdin) {
++ fcntl(esPtr->fdin,F_DUPFD,esPtr->fdout);
++ }
++ if (esPtr->fdin > 2)
++ expCloseOnExec(esPtr->fdin);
++ if (esPtr->fdout != EXP_NOFD &&
++ esPtr->fdout > 2)
++ expCloseOnExec(esPtr->fdout);
+ esPtr->fdBusy = TRUE;
}
Modified: expect/trunk/debian/patches/13-implicit-defs.patch
===================================================================
--- expect/trunk/debian/patches/13-implicit-defs.patch 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/13-implicit-defs.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -25,8 +25,8 @@
#include "exp_command.h"
+#include "exp_event.h"
#include "exp_log.h"
+ #include "tcldbg.h" /* Dbg_StdinMode */
- static int ExpBlockModeProc _ANSI_ARGS_((ClientData instanceData,
diff -Naurp expect.orig/exp_clib.c expect/exp_clib.c
--- expect.orig/exp_clib.c 2009-08-03 08:39:25.000000000 +0000
+++ expect/exp_clib.c 2009-08-03 08:39:40.000000000 +0000
@@ -49,7 +49,7 @@
#define TclRegError exp_TclRegError
/*
-@@ -1463,6 +1467,7 @@ TclGetRegError()
+@@ -1465,6 +1469,7 @@ TclGetRegError()
* end of regexp definitions and code
*/
@@ -57,7 +57,7 @@
/*
* following stolen from tcl8.0.4/generic/tclPosixStr.c
*/
-@@ -1919,6 +1924,7 @@ Tcl_ErrnoMsg(err)
+@@ -1921,6 +1926,7 @@ Tcl_ErrnoMsg(err)
#endif
}
}
@@ -65,33 +65,6 @@
/*
* end of excerpt from tcl8.0.X/generic/tclPosixStr.c
-diff -Naurp expect.orig/exp_command.c expect/exp_command.c
---- expect.orig/exp_command.c 2009-08-03 08:39:25.000000000 +0000
-+++ expect/exp_command.c 2009-08-03 08:39:40.000000000 +0000
-@@ -29,7 +29,6 @@ would appreciate credit if this program
- # include <fcntl.h>
- #endif
- #include <sys/file.h>
--#include "exp_tty.h"
-
- #include <errno.h>
- #include <signal.h>
-@@ -64,6 +63,7 @@ would appreciate credit if this program
- /* objects to including varargs.h twice, just */
- /* omit this one. */
-
-+#include "expect.h"
- #include "tcl.h"
- #include "string.h"
- #include "expect_tcl.h"
-@@ -72,6 +72,7 @@ would appreciate credit if this program
- #include "exp_command.h"
- #include "exp_log.h"
- #include "exp_event.h"
-+#include "exp_tty_in.h"
- #include "exp_pty.h"
- #ifdef TCL_DEBUGGER
- #include "tcldbg.h"
diff -Naurp expect.orig/exp_command.h expect/exp_command.h
--- expect.orig/exp_command.h 2009-08-03 08:39:25.000000000 +0000
+++ expect/exp_command.h 2009-08-03 08:39:40.000000000 +0000
@@ -114,22 +87,22 @@
#define EXP_CHANNELNAMELEN (16 + TCL_INTEGER_SPACE)
-@@ -89,11 +92,11 @@ typedef struct ExpState {
+@@ -100,11 +103,11 @@ typedef struct ExpState {
char name[EXP_CHANNELNAMELEN+1]; /* expect and interact set variables
to channel name, so for efficiency
cache it here */
- int fdin; /* input fd */
- int fdout; /* output fd - usually the same as fdin, although
+ long fdin; /* input fd - may be used for storing ClientData, a pointer */
-+ long fdout; /* output fd - usually the same as fdin, although
++ long fdout; /* output fd - usually the same as fdin, although
may be different if channel opened by tcl::open */
- Tcl_Channel channel_orig; /* If opened by someone else, i.e. tcl::open */
+ ExpOrigin* chan_orig; /* If opened by someone else, i.e. tcl::open */
- int fd_slave; /* slave fd if "spawn -pty" used */
+ long fd_slave; /* slave fd if "spawn -pty" used */
/* this may go away if we find it is not needed */
/* it might be needed by inherited channels */
-@@ -231,6 +234,7 @@ EXTERN void exp_init_trap _ANSI_ARGS_((
+@@ -242,6 +245,7 @@ EXTERN void exp_init_trap _ANSI_ARGS_((
EXTERN void exp_init_send _ANSI_ARGS_((void));
EXTERN void exp_init_unit_random _ANSI_ARGS_((void));
EXTERN void exp_init_sig _ANSI_ARGS_((void));
@@ -137,24 +110,28 @@
EXTERN void expChannelInit _ANSI_ARGS_((void));
EXTERN int expChannelCountGet _ANSI_ARGS_((void));
-@@ -323,9 +327,13 @@ EXTERN void expExpectVarsInit _ANSI_ARG
- EXTERN int expStateAnyIs _ANSI_ARGS_((ExpState *));
- EXTERN int expDevttyIs _ANSI_ARGS_((ExpState *));
- EXTERN int expStdinOutIs _ANSI_ARGS_((ExpState *));
-+EXTERN int expStdinoutIs _ANSI_ARGS_((ExpState *esPtr));
+@@ -337,6 +341,8 @@ EXTERN void expExpectVarsInit _ANSI_ARG
EXTERN ExpState * expStdinoutGet _ANSI_ARGS_((void));
EXTERN ExpState * expDevttyGet _ANSI_ARGS_((void));
-+EXTERN int Exp_StringCaseMatch _ANSI_ARGS_((char *string, char *pattern, int nocase, int *offset));
++EXTERN int Exp_StringCaseMatch _ANSI_ARGS_((Tcl_UniChar *string, int strlen, Tcl_UniChar *pattern, int plen, int nocase, int *offset));
+
/* generic functions that really should be provided by Tcl */
+ #if 0 /* Redefined as macros. */
EXTERN int expSizeGet _ANSI_ARGS_((ExpState *));
- EXTERN int expSizeZero _ANSI_ARGS_((ExpState *));
+@@ -348,6 +354,8 @@
+
+ #define EXP_CMDINFO_CLOSE "expect/cmdinfo/close"
+ #define EXP_CMDINFO_RETURN "expect/cmdinfo/return"
++
+#endif /* __EXP_COMMAND_H */
+
+ /*
+ * Local Variables:
diff -Naurp expect.orig/exp_glob.c expect/exp_glob.c
--- expect.orig/exp_glob.c 2002-03-23 04:11:54.000000000 +0000
+++ expect/exp_glob.c 2009-08-03 08:39:40.000000000 +0000
-@@ -11,10 +11,17 @@ would appreciate credit if this program
+@@ -11,6 +11,8 @@ would appreciate credit if this program
*/
@@ -163,37 +140,6 @@
#include "expect_cf.h"
#include "tcl.h"
#include "exp_int.h"
-
-+int Exp_StringCaseMatch2(
-+ register CONST char *string,
-+ register CONST char *pattern,
-+ int nocase);
-+
- /* The following functions implement expect's glob-style string matching */
- /* Exp_StringMatch allow's implements the unanchored front (or conversely */
- /* the '^') feature. Exp_StringMatch2 does the rest of the work. */
-diff -Naurp expect.orig/exp_inter.c expect/exp_inter.c
---- expect.orig/exp_inter.c 2004-08-18 02:03:00.000000000 +0000
-+++ expect/exp_inter.c 2009-08-03 08:39:40.000000000 +0000
-@@ -42,6 +42,7 @@ would appreciate credit if this program
- #include "exp_rename.h"
- #include "exp_prog.h"
- #include "exp_command.h"
-+#include "exp_event.h"
- #include "exp_log.h"
-
- typedef struct ThreadSpecificData {
-diff -Naurp expect.orig/exp_main_exp.c expect/exp_main_exp.c
---- expect.orig/exp_main_exp.c 2009-08-03 08:39:25.000000000 +0000
-+++ expect/exp_main_exp.c 2009-08-03 08:39:40.000000000 +0000
-@@ -12,6 +12,7 @@ would appreciate credit if this program
-
- #include "expect_cf.h"
- #include <stdio.h>
-+#include <stdlib.h>
- #include "tcl.h"
- #include "expect_tcl.h"
-
diff -Naurp expect.orig/exp_main_sub.c expect/exp_main_sub.c
--- expect.orig/exp_main_sub.c 2009-08-03 08:39:25.000000000 +0000
+++ expect/exp_main_sub.c 2009-08-03 08:39:40.000000000 +0000
@@ -208,11 +154,13 @@
diff -Naurp expect.orig/exp_main_tk.c expect/exp_main_tk.c
--- expect.orig/exp_main_tk.c 2009-08-03 08:39:25.000000000 +0000
+++ expect/exp_main_tk.c 2009-08-03 08:39:40.000000000 +0000
-@@ -38,11 +38,19 @@ static char sccsid[] = "@(#) tkAppInit.c
+@@ -36,12 +36,21 @@ static char sccsid[] = "@(#) tkAppInit.c
+ #undef USE_TCL_STUBS
+
#include <ctype.h>
- #include <string.h> /* strrchr(3) */
++#include <string.h> /* strrchr(3) */
-+#include "tclInt.h" /* Internal definitions for Tcl. */
++#include "tclInt.h" /* Internal definitions for Tcl. */
+#include "tcl.h"
+
#include "tk.h"
@@ -228,7 +176,7 @@
#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
-@@ -56,6 +64,8 @@ int *tclDummyMathPtr = (int *) matherr;
+@@ -55,6 +63,8 @@ int *tclDummyMathPtr = (int *) matherr;
#ifdef TK_TEST
EXTERN int Tktest_Init _ANSI_ARGS_((Tcl_Interp *interp));
#endif /* TK_TEST */
@@ -237,7 +185,7 @@
/*
*----------------------------------------------------------------------
-@@ -386,7 +396,7 @@ Tk_Init2(interp)
+@@ -387,7 +397,7 @@ Tk_Init2(interp)
* Invoke platform-specific initialization.
*/
@@ -257,28 +205,17 @@
#ifdef TCL_DEBUGGER
#include "tcldbg.h"
-diff -Naurp expect.orig/exp_tty.c expect/exp_tty.c
---- expect.orig/exp_tty.c 2004-05-07 16:23:26.000000000 +0000
-+++ expect/exp_tty.c 2009-08-03 08:39:40.000000000 +0000
-@@ -36,6 +36,7 @@
- #include "exp_tty_in.h"
- #include "exp_command.h"
- #include "exp_log.h"
-+#include "exp_win.h"
-
- static int is_raw = FALSE;
- static int is_noecho = FALSE;
diff -Naurp expect.orig/exp_tty.h expect/exp_tty.h
--- expect.orig/exp_tty.h 2002-02-12 02:00:55.000000000 +0000
+++ expect/exp_tty.h 2009-08-03 08:39:40.000000000 +0000
@@ -21,6 +21,7 @@ void exp_tty_break();
- int exp_tty_raw_noecho();
- int exp_israw();
- int exp_isecho();
+ int exp_tty_raw_noecho(Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo);
+ int exp_israw(void);
+ int exp_isecho(void);
+EXTERN int exp_tty_cooked_echo _ANSI_ARGS_((Tcl_Interp *interp, exp_tty *tty_old, int *was_raw, int *was_echo));
- void exp_tty_set();
- int exp_tty_set_simple();
+ void exp_tty_set(Tcl_Interp *interp, exp_tty *tty, int raw, int echo);
+ int exp_tty_set_simple(exp_tty *tty);
diff -Naurp expect.orig/exp_tty_in.h expect/exp_tty_in.h
--- expect.orig/exp_tty_in.h 2002-02-12 02:00:55.000000000 +0000
+++ expect/exp_tty_in.h 2009-08-03 08:39:40.000000000 +0000
@@ -294,16 +231,14 @@
diff -Naurp expect.orig/exp_win.c expect/exp_win.c
--- expect.orig/exp_win.c 2002-02-12 02:00:55.000000000 +0000
+++ expect/exp_win.c 2009-08-03 08:39:40.000000000 +0000
-@@ -51,7 +51,8 @@ conflicts with sys/ioctl.h
+@@ -51,6 +51,7 @@ conflicts with sys/ioctl.h
# include <sys/ptem.h>
#endif /* HAVE_SYS_PTEM_H */
--#include "exp_tty.h"
+#include "expect.h"
-+#include "exp_tty_in.h"
+ #include "exp_tty_in.h"
#include "exp_win.h"
- #ifdef TIOCGWINSZ
diff -Naurp expect.orig/exp_win.h expect/exp_win.h
--- expect.orig/exp_win.h 2002-02-12 02:00:56.000000000 +0000
+++ expect/exp_win.h 2009-08-03 08:39:40.000000000 +0000
@@ -313,34 +248,22 @@
/* exp_win.h - window support
Written by: Don Libes, NIST, 10/25/93
-@@ -6,15 +8,17 @@ This file is in the public domain. Howe
- would appreciate credit if you use this file or parts of it.
- */
+@@ -8,8 +10,8 @@ This file is in the public domain. Howe
+ #include <tcl.h> /* For _ANSI_ARGS_ */
+
-int exp_window_size_set();
-int exp_window_size_get();
+EXTERN int exp_window_size_set _ANSI_ARGS_((int fd));
+EXTERN int exp_window_size_get _ANSI_ARGS_((int fd));
--void exp_win_rows_set();
--void exp_win_rows_get();
--void exp_win_columns_set();
--void exp_win_columns_get();
--
--void exp_win2_rows_set();
--void exp_win2_rows_get();
--void exp_win2_columns_set();
--void exp_win2_columns_get();
-+EXTERN void exp_win_rows_set _ANSI_ARGS_((char *rows));
-+EXTERN void exp_win_rows_get _ANSI_ARGS_((char *rows));
-+EXTERN void exp_win_columns_set _ANSI_ARGS_((char *columns));
-+EXTERN void exp_win_columns_get _ANSI_ARGS_((char *columns));
+ void exp_win_rows_set _ANSI_ARGS_ ((char* rows));
+ char* exp_win_rows_get _ANSI_ARGS_ ((void));
+@@ -20,3 +20,5 @@
+ char* exp_win2_rows_get _ANSI_ARGS_ ((int fd));
+ void exp_win2_columns_set _ANSI_ARGS_ ((int fd, char* columns));
+ char* exp_win2_columns_get _ANSI_ARGS_ ((int fd));
+
-+EXTERN void exp_win2_rows_set _ANSI_ARGS_((int fd, char *rows));
-+EXTERN void exp_win2_rows_get _ANSI_ARGS_((int fd, char *rows));
-+EXTERN void exp_win2_columns_set _ANSI_ARGS_((int fd, char *columns));
-+EXTERN void exp_win2_columns_get _ANSI_ARGS_((int fd, char *columns));
-+
+#endif /* __EXP_WIN_H */
diff -Naurp expect.orig/expect.c expect/expect.c
--- expect.orig/expect.c 2009-08-03 08:39:25.000000000 +0000
@@ -354,25 +277,18 @@
#include <signal.h>
#include <errno.h>
#include <ctype.h> /* for isspace */
-@@ -29,12 +31,13 @@ would appreciate credit if this program
+@@ -29,6 +31,7 @@ would appreciate credit if this program
#include "string.h"
+#include "expect.h"
-+#include "exp_tty_in.h"
#include "exp_rename.h"
#include "exp_prog.h"
#include "exp_command.h"
- #include "exp_log.h"
- #include "exp_event.h"
--#include "exp_tty.h"
- #include "exp_tstamp.h" /* this should disappear when interact */
- /* loses ref's to it */
- #ifdef TCL_DEBUGGER
diff -Naurp expect.orig/pty_termios.c expect/pty_termios.c
--- expect.orig/pty_termios.c 2009-08-03 08:39:25.000000000 +0000
+++ expect/pty_termios.c 2009-08-03 08:39:40.000000000 +0000
-@@ -9,13 +9,18 @@ would appreciate credit if you use this
+@@ -9,12 +9,19 @@ would appreciate credit if you use this
#include <stdio.h>
#include <signal.h>
@@ -384,15 +300,15 @@
#define SIGCHLD SIGCLD
#endif
--#include "expect.h"
#include "expect_cf.h"
+#include "tcl.h"
+#include "expect.h"
+#include "exp_tty_in.h"
- #include "exp_int.h" /* expErrnoMsg() prototype */
++#include "exp_int.h" /* expErrnoMsg() prototype */
/*
-@@ -98,7 +103,6 @@ with openpty which supports 4000 while p
+ The following functions are linked from the Tcl library. They
+@@ -96,7 +101,6 @@ with openpty which supports 4000 while p
#include "exp_win.h"
@@ -400,7 +316,7 @@
#include "exp_rename.h"
#include "exp_pty.h"
-@@ -368,7 +372,7 @@ exp_init_pty()
+@@ -366,7 +370,7 @@ exp_init_pty()
#define W_OK 02
#endif
Modified: expect/trunk/debian/patches/15-comments.patch
===================================================================
--- expect/trunk/debian/patches/15-comments.patch 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/15-comments.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,67 +1,6 @@
Author: n/a
Description: Fix header comments.
-diff -Naurp expect.orig/expect_cf.h.in expect/expect_cf.h.in
---- expect.orig/expect_cf.h.in 2009-08-03 06:58:30.000000000 +0000
-+++ expect/expect_cf.h.in 2009-08-03 08:58:57.000000000 +0000
-@@ -4,7 +4,8 @@
- #ifndef __EXPECT_CF_H__
- #define __EXPECT_CF_H__
-
--#undef NO_STDLIB_H /* Tcl requires this name */
-+/* Tcl requires this name */
-+#undef NO_STDLIB_H
- #undef NO_UNION_WAIT
- #undef HAVE_STDARG_H
- #undef HAVE_VARARGS_H
-@@ -12,12 +13,18 @@
- #undef HAVE_SYSCONF_H
- #undef HAVE_SYS_FCNTL_H
- #undef HAVE_SYS_WAIT_H
--#undef HAVE_SYS_BSDTYPES_H /* nice ISC special */
--#undef HAVE_SYS_SELECT_H /* nice ISC special */
--#undef HAVE_SYS_TIME_H /* nice ISC special */
--#undef HAVE_SYS_PTEM_H /* SCO needs this for window size */
--#undef HAVE_STRREDIR_H /* Solaris needs this for console redir */
--#undef HAVE_STRPTY_H /* old-style Dynix ptys need this */
-+/* nice ISC special */
-+#undef HAVE_SYS_BSDTYPES_H
-+/* nice ISC special */
-+#undef HAVE_SYS_SELECT_H
-+/* nice ISC special */
-+#undef HAVE_SYS_TIME_H
-+/* SCO needs this for window size */
-+#undef HAVE_SYS_PTEM_H
-+/* Solaris needs this for console redir */
-+#undef HAVE_STRREDIR_H
-+/* old-style Dynix ptys need this */
-+#undef HAVE_STRPTY_H
- #undef HAVE_UNISTD_H
- #undef HAVE_SYSMACROS_H
- #undef HAVE_INTTYPES_H
-@@ -26,8 +33,10 @@
-
- #undef pid_t
- #undef RETSIGTYPE
--#undef TIME_WITH_SYS_TIME /* ok to include both time.h and sys/time.h */
--#undef SETPGRP_VOID /* if setpgrp takes 0 args */
-+/* ok to include both time.h and sys/time.h */
-+#undef TIME_WITH_SYS_TIME
-+/* if setpgrp takes 0 args */
-+#undef SETPGRP_VOID
-
- /*
- * This section is for compile macros needed by
-@@ -42,7 +51,8 @@
- #undef SIMPLE_EVENT
- #undef HAVE_STRFTIME
- #undef HAVE_MEMMOVE
--#undef HAVE_TIMEZONE /* timezone() a la Pyramid */
-+/* timezone() a la Pyramid */
-+#undef HAVE_TIMEZONE
- #undef HAVE_SIGLONGJMP
- #undef HAVE_STRCHR
-
diff -Naurp expect.orig/tcldbgcf.h.in expect/tcldbgcf.h.in
--- expect.orig/tcldbgcf.h.in 2009-08-03 06:58:30.000000000 +0000
+++ expect/tcldbgcf.h.in 2009-08-03 08:58:57.000000000 +0000
Added: expect/trunk/debian/patches/18-non-linux.patch
===================================================================
--- expect/trunk/debian/patches/18-non-linux.patch (rev 0)
+++ expect/trunk/debian/patches/18-non-linux.patch 2009-10-16 19:44:34 UTC (rev 949)
@@ -0,0 +1,25 @@
+Author: Sergei Golovan <sgolovan at debian.org>
+Description: Fixes build for non-linux Debian architectures and removes
+ rpath definition because it's useless as the library is
+ installed into /usr/lib
+
+--- expect.orig/tclconfig/tcl.m4
++++ expect/tclconfig/tcl.m4
+@@ -1436,7 +1436,7 @@
+ fi
+ fi
+ ;;
+- Linux*)
++ Linux*|GNU*)
+ SHLIB_CFLAGS="-fPIC"
+ SHLIB_LD_LIBS='${LIBS}'
+ SHLIB_SUFFIX=".so"
+@@ -1451,7 +1451,7 @@
+ DL_OBJS="tclLoadDl.o"
+ DL_LIBS="-ldl"
+ LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
+- CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
++ CC_SEARCH_FLAGS=''
+ LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
+ if test "`uname -m`" = "alpha" ; then
+ CFLAGS="$CFLAGS -mieee"
Modified: expect/trunk/debian/patches/series
===================================================================
--- expect/trunk/debian/patches/series 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/patches/series 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,11 +1,11 @@
01-example-shebang.patch
02-example-cryptdir.patch
-03-spawn.patch
-04-64bit.patch
+#03-spawn.patch
+#04-64bit.patch
05-makefile-soname.patch
06-pkgindex.patch
07-file-handle.patch
-08-tcl-stubs.patch
+#08-tcl-stubs.patch
09-unsafe-traps.patch
10-manpage.patch
11-ttyname.patch
@@ -13,3 +13,4 @@
13-implicit-defs.patch
15-comments.patch
16-logfile.patch
+18-non-linux.patch
Modified: expect/trunk/debian/rules
===================================================================
--- expect/trunk/debian/rules 2009-10-10 08:02:43 UTC (rev 948)
+++ expect/trunk/debian/rules 2009-10-16 19:44:34 UTC (rev 949)
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+DATE = 2009-08-31
+VERSION = 5.44.1.14
+
SHELL := sh -e
%:
@@ -19,43 +22,57 @@
cp -f /usr/share/misc/config.guess config.guess
cp -f /usr/share/misc/config.sub config.sub
- autoconf2.13
- patch -Np1 -i debian/patches/static-names.diff
+ autoconf
+ #patch -Np1 -i debian/patches/static-names.diff
- dh_auto_configure -- --includedir=/usr/include/tcl8.4 --with-tcl=/usr/lib/tcl8.4 --with-tk=/usr/lib/tk8.4 --with-tclinclude=/usr/include/tcl8.4/tcl-private --with-tkinclude=/usr/include/tcl8.4/tk-private --enable-shared --enable-threads CFLAGS="$(CFLAGS) -D_BSD_SOURCE -ansi -D_SVID_SOURCE -D_POSIX_SOURCE -D_REENTRANT"
+ dh_auto_configure -- --includedir=/usr/include/tcl8.5 \
+ --with-tcl=/usr/lib/tcl8.5 \
+ --with-tk=/usr/lib/tk8.5 \
+ --with-tclinclude=/usr/include/tcl8.5/tcl-private \
+ --with-tkinclude=/usr/include/tcl8.5/tk-private/generic \
+ --enable-shared \
+ --enable-threads \
+ CFLAGS="$(CFLAGS) -D_BSD_SOURCE -ansi -D_SVID_SOURCE -D_POSIX_SOURCE -D_REENTRANT"
override_dh_auto_build:
- $(MAKE) SONAME=libexpect.so.5.43.0
+ $(MAKE) SONAME=libexpect.so.$(VERSION)
override_dh_auto_install:
- $(MAKE) INSTALL_ROOT=$(CURDIR)/debian/tmp install
+ $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Renaming expect scripts
- for SCRIPT in debian/tmp/usr/bin/*; \
- do \
- if [ "`basename $$SCRIPT`" != "expect" ] && [ "`basename $$SCRIPT`" != "expectk" ]; \
- then \
- mv $$SCRIPT `dirname $$SCRIPT`/expect_`basename $$SCRIPT`; \
- fi; \
+ for SCRIPT in debian/tmp/usr/bin/*; do \
+ if [ "`basename $$SCRIPT`" != "expect" ] && [ "`basename $$SCRIPT`" != "expectk" ]; then \
+ mv $$SCRIPT `dirname $$SCRIPT`/expect_`basename $$SCRIPT`; \
+ fi; \
done
- for MANPAGE in debian/tmp/usr/share/man/man1/*; \
- do \
- if [ "`basename $$MANPAGE`" != "expect.1" ] && [ "`basename $$MANPAGE`" != "expectk.1" ]; \
- then \
- mv $$MANPAGE `dirname $$MANPAGE`/expect_`basename $$MANPAGE`; \
- fi; \
+ for MANPAGE in debian/tmp/usr/share/man/man1/*; do \
+ if [ "`basename $$MANPAGE`" != "expect.1" ] && [ "`basename $$MANPAGE`" != "expectk.1" ]; then \
+ mv $$MANPAGE `dirname $$MANPAGE`/expect_`basename $$MANPAGE`; \
+ fi; \
done
# Fixing library name
- mv debian/tmp/usr/lib/libexpect5.43.so debian/tmp/usr/lib/libexpect.so.5.43.0
- mv debian/tmp/usr/lib/libexpect5.43.a debian/tmp/usr/lib/libexpect.a
+ mv debian/tmp/usr/lib/expect$(VERSION)/libexpect$(VERSION).so debian/tmp/usr/lib/libexpect.so.$(VERSION)
+ mkdir -p -m 755 debian/tmp/usr/lib/tcltk
+ mv debian/tmp/usr/lib/expect$(VERSION) debian/tmp/usr/lib/tcltk
# Fixing permissions
- chmod 0644 debian/tmp/usr/lib/expect*/pkgIndex.tcl
+ chmod 0644 debian/tmp/usr/lib/tcltk/expect$(VERSION)/pkgIndex.tcl
override_dh_installchangelogs:
dh_installchangelogs HISTORY
override_dh_install:
dh_install --fail-missing
+
+get-orig-source:
+ CURDIR=$$(pwd) && \
+ TMPDIR=$$(mktemp -d /tmp/expect.XXXXXX) && \
+ cd $$TMPDIR && \
+ cvs -d:pserver:anonymous at expect.cvs.sourceforge.net:/cvsroot/expect export -D $(DATE) expect && \
+ mv expect expect-$(VERSION) && \
+ tar -zcf $$CURDIR/expect_$(VERSION).orig.tar.gz . && \
+ rm -rf $$TMPDIR
+
More information about the Pkg-tcltk-commits
mailing list