[Pkg-tcltk-commits] r1642 - in expect/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sun Jul 13 17:03:29 UTC 2014
Author: sgolovan
Date: 2014-07-13 17:03:29 +0000 (Sun, 13 Jul 2014)
New Revision: 1642
Added:
expect/trunk/debian/patches/24-format.patch
expect/trunk/debian/tcl-expect-dev.docs
expect/trunk/debian/tcl-expect-dev.install
expect/trunk/debian/tcl-expect-dev.links
expect/trunk/debian/tcl-expect.install
expect/trunk/debian/tcl-expect.lintian-overrides
Removed:
expect/trunk/debian/expect-dev.docs
expect/trunk/debian/expect-dev.install
expect/trunk/debian/expect-dev.links
expect/trunk/debian/expect.lintian-overrides
Modified:
expect/trunk/debian/changelog
expect/trunk/debian/compat
expect/trunk/debian/control
expect/trunk/debian/expect.install
expect/trunk/debian/expect.links
expect/trunk/debian/patches/01-example-shebang.patch
expect/trunk/debian/patches/02-example-cryptdir.patch
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/09-unsafe-traps.patch
expect/trunk/debian/patches/10-manpage.patch
expect/trunk/debian/patches/11-ttyname.patch
expect/trunk/debian/patches/12-fdout.patch
expect/trunk/debian/patches/13-implicit-defs.patch
expect/trunk/debian/patches/16-logfile.patch
expect/trunk/debian/patches/18-non-linux.patch
expect/trunk/debian/patches/22-segfault-with-stubs.patch
expect/trunk/debian/patches/series
expect/trunk/debian/rules
Log:
[expect]
* Split the expect package into expect and tcl-expect where the libexpect
library and the Tcl package are moved. Made the tcl-expect package
multiarch same.
* Renamed the expect-dev package into tcl-expect-dev and moved the included
scripts into the main expect package.
* Build expect with Tcl 8.6.
* Use CFLAGS from the dpkg build flags. Fixed potential security bug in
printf format handling.
* Bumped the debhelper compatibility version to 9.
* Bumped standards version to 3.9.5.
Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/changelog 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,17 @@
-expect (5.45-6) UNRELEASED; urgency=low
+expect (5.45-6) unstable; urgency=low
- * NOT RELEASED YET
+ * Split the expect package into expect and tcl-expect where the libexpect
+ library and the Tcl package are moved. Made the tcl-expect package
+ multiarch same.
+ * Renamed the expect-dev package into tcl-expect-dev and moved the included
+ scripts into the main expect package.
+ * Build expect with Tcl 8.6.
+ * Use CFLAGS from the dpkg build flags. Fixed potential security bug in
+ printf format handling.
+ * Bumped the debhelper compatibility version to 9.
+ * Bumped standards version to 3.9.5.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 04 Nov 2013 08:34:38 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sun, 13 Jul 2014 21:02:52 +0400
expect (5.45-5) unstable; urgency=low
Modified: expect/trunk/debian/compat
===================================================================
--- expect/trunk/debian/compat 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/compat 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1 +1 @@
-8
+9
Modified: expect/trunk/debian/control
===================================================================
--- expect/trunk/debian/control 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/control 2014-07-13 17:03:29 UTC (rev 1642)
@@ -2,16 +2,19 @@
Section: interpreters
Priority: optional
Maintainer: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~), autotools-dev,
- autoconf, tcl8.5-dev
+Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), autotools-dev,
+ autoconf, tcl8.6-dev
Build-Conflicts: autoconf2.13
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://sourceforge.net/projects/expect/
Package: expect
Architecture: any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: expectk (<< 5.45)
+Conflicts: expectk (<< 5.45), expect-dev
+Provides: expect-dev
+Replaces: expect-dev
+Multi-Arch: foreign
Description: Automates 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
@@ -20,13 +23,34 @@
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 expect binary and several Expect based scripts.
-Package: expect-dev
+Package: tcl-expect
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Conflicts: expectk (<< 5.45)
+Replaces: expect
+Suggests: expect
+Multi-Arch: same
+Description: Automates interactive applications (Tcl package)
+ 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 library and Tcl package Expect.
+
+Package: tcl-expect-dev
Section: devel
Architecture: any
-Depends: ${misc:Depends}, expect (= ${binary:Version}), tcl8.5-dev
+Depends: ${misc:Depends}, tcl-expect (= ${binary:Version}), tcl8.6-dev
Replaces: expect (<< 5.44.1.14)
Recommends: tk8.5-dev
+Multi-Arch: same
Description: Automates 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
@@ -36,4 +60,4 @@
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 development files and examples.
+ This package contains the development files.
Deleted: expect/trunk/debian/expect-dev.docs
===================================================================
--- expect/trunk/debian/expect-dev.docs 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/expect-dev.docs 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,3 +0,0 @@
-FAQ
-NEWS
-README
Deleted: expect/trunk/debian/expect-dev.install
===================================================================
--- expect/trunk/debian/expect-dev.install 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/expect-dev.install 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,5 +0,0 @@
-/usr/bin/expect_*
-/usr/include/*
-#/usr/lib/*.a
-/usr/share/man/man1/expect_*
-/usr/share/man/man3/libexpect.*
Deleted: expect/trunk/debian/expect-dev.links
===================================================================
--- expect/trunk/debian/expect-dev.links 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/expect-dev.links 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,33 +0,0 @@
-/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.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
-/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 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/expect.install 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,4 +1,4 @@
/usr/bin/expect
-/usr/lib/*.so.*
-/usr/lib/tcltk/*
+/usr/bin/expect_*
/usr/share/man/man1/expect.*
+/usr/share/man/man1/expect_*
Modified: expect/trunk/debian/expect.links
===================================================================
--- expect/trunk/debian/expect.links 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/expect.links 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1 +1,33 @@
+/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.45 /usr/lib/libexpect.so.5
+/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
Deleted: expect/trunk/debian/expect.lintian-overrides
===================================================================
--- expect/trunk/debian/expect.lintian-overrides 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/expect.lintian-overrides 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1 +0,0 @@
-expect: package-name-doesnt-match-sonames
Modified: expect/trunk/debian/patches/01-example-shebang.patch
===================================================================
--- expect/trunk/debian/patches/01-example-shebang.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/01-example-shebang.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -2,8 +2,8 @@
Author: Sergei Golovan <sgolovan at debian.org>
Description: Fixes shebangs in examples (Closes: #152367).
---- expect-5.45.orig/example/beer.exp
-+++ expect-5.45/example/beer.exp
+--- a/example/beer.exp
++++ b/example/beer.exp
@@ -1,4 +1,9 @@
-#!/depot/path/expect -f
+#!/bin/sh
@@ -15,8 +15,8 @@
# 99 bottles of beer on the wall, Expect-style
# Author: Don Libes <libes at nist.gov>
---- expect-5.45.orig/example/expectd.proto
-+++ expect-5.45/example/expectd.proto
+--- a/example/expectd.proto
++++ b/example/expectd.proto
@@ -1,4 +1,10 @@
-#!/depot/tcl/src/expect/e --
+#!/bin/sh
@@ -29,8 +29,8 @@
# Description: Simple fragment to begin a telnet daemon
# For more information, see Chapter 17 of "Exploring Expect"
# Author: Don Libes, NIST
---- expect-5.45.orig/example/irsh
-+++ expect-5.45/example/irsh
+--- a/example/irsh
++++ b/example/irsh
@@ -1,4 +1,9 @@
-#!/depot/path/expect --
+#!/bin/sh
@@ -42,8 +42,8 @@
# Do rsh interactively. For example, consider the following command:
# rsh <remote> ls -l "|" more
---- expect-5.45.orig/example/passwd.cgi
-+++ expect-5.45/example/passwd.cgi
+--- a/example/passwd.cgi
++++ b/example/passwd.cgi
@@ -1,4 +1,9 @@
-#!/depot/path/expect --
+#!/bin/sh
@@ -55,8 +55,8 @@
# This is a CGI script to process requests created by the accompanying
# passwd.html form. This script is pretty basic, although it is
---- expect-5.45.orig/example/passwdprompt
-+++ expect-5.45/example/passwdprompt
+--- a/example/passwdprompt
++++ b/example/passwdprompt
@@ -1,4 +1,9 @@
-#!/depot/path/expect
+#!/bin/sh
@@ -68,8 +68,8 @@
# This script prompts for a passwd from stdin while echoing *'s
---- expect-5.45.orig/example/reprompt
-+++ expect-5.45/example/reprompt
+--- a/example/reprompt
++++ b/example/reprompt
@@ -1,4 +1,9 @@
-#!/depot/path/expect --
+#!/bin/sh
@@ -81,8 +81,8 @@
# Name: reprompt
# Description: reprompt every so often until user enters something
---- expect-5.45.orig/example/term_expect
-+++ expect-5.45/example/term_expect
+--- a/example/term_expect
++++ b/example/term_expect
@@ -1,4 +1,9 @@
-#!/depot/path/expectk
+#!/bin/sh
@@ -94,8 +94,8 @@
# Name: tkterm - terminal emulator using Expect and Tk text widget, v3.0
# Author: Don Libes, July '94
---- expect-5.45.orig/example/vrfy
-+++ expect-5.45/example/vrfy
+--- a/example/vrfy
++++ b/example/vrfy
@@ -1,4 +1,9 @@
-#!/depot/path/expect -f
+#!/bin/sh
@@ -107,8 +107,8 @@
# separate address into user and host
---- expect-5.45.orig/example/xrlogin
-+++ expect-5.45/example/xrlogin
+--- a/example/xrlogin
++++ b/example/xrlogin
@@ -1,4 +1,10 @@
-#!/depot/path/expect --
+#!/bin/sh
Modified: expect/trunk/debian/patches/02-example-cryptdir.patch
===================================================================
--- expect/trunk/debian/patches/02-example-cryptdir.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/02-example-cryptdir.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: Mike Markley <mike at markley.org>
Description: Checks for /usr/bin/crypt in cryptdir example (Closes: #67197).
---- expect-5.45.orig/example/cryptdir
-+++ expect-5.45/example/cryptdir
+--- a/example/cryptdir
++++ b/example/cryptdir
@@ -15,6 +15,11 @@
#
# Encrypt or decrypts the current directory or named directory if given.
@@ -15,8 +15,8 @@
if {[llength $argv] > 0} {
cd $argv
}
---- expect-5.45.orig/example/decryptdir
-+++ expect-5.45/example/decryptdir
+--- a/example/decryptdir
++++ b/example/decryptdir
@@ -15,6 +15,11 @@
#
# Encrypt or decrypts the current directory or named directory if given.
Modified: expect/trunk/debian/patches/05-makefile-soname.patch
===================================================================
--- expect/trunk/debian/patches/05-makefile-soname.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/05-makefile-soname.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: Sergei Golovan <sgolovan at debian.org>
Description: Adds '-soname' to the Makefile.
---- expect-5.45.orig/Makefile.in
-+++ expect-5.45/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -289,7 +289,7 @@
$(PKG_LIB_FILE): $(PKG_OBJECTS)
Modified: expect/trunk/debian/patches/06-pkgindex.patch
===================================================================
--- expect/trunk/debian/patches/06-pkgindex.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/06-pkgindex.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -5,8 +5,8 @@
because package management can't load the library from its build location.
Last-Modified: 2009-11-18
---- expect-5.45.orig/Makefile.in
-+++ expect-5.45/Makefile.in
+--- a/Makefile.in
++++ b/Makefile.in
@@ -331,7 +331,7 @@
pkgIndex.tcl-hand:
(echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \
@@ -16,8 +16,8 @@
) > pkgIndex.tcl
#========================================================================
---- expect-5.45.orig/tests/all.tcl
-+++ expect-5.45/tests/all.tcl
+--- a/tests/all.tcl
++++ b/tests/all.tcl
@@ -7,7 +7,7 @@
package require tcltest
# do this in a way that is backward compatible for Tcl 8.3
@@ -27,8 +27,8 @@
set ::tcltest::testSingleFile false
set ::tcltest::testsDirectory [file dirname [info script]]
---- expect-5.45.orig/tests/cat.test
-+++ expect-5.45/tests/cat.test
+--- a/tests/cat.test
++++ b/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
@@ -38,8 +38,8 @@
#exp_internal -f /dev/ttyp5 0
---- expect-5.45.orig/tests/expect.test
-+++ expect-5.45/tests/expect.test
+--- a/tests/expect.test
++++ b/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
@@ -49,8 +49,8 @@
catch {unset x}
---- expect-5.45.orig/tests/logfile.test
-+++ expect-5.45/tests/logfile.test
+--- a/tests/logfile.test
++++ b/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
@@ -60,8 +60,8 @@
test logfile-1.1 {basic logfile} {
set filename /tmp/logfile.[pid]
---- expect-5.45.orig/tests/pid.test
-+++ expect-5.45/tests/pid.test
+--- a/tests/pid.test
++++ b/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
@@ -71,8 +71,8 @@
catch {unset x}
---- expect-5.45.orig/tests/send.test
-+++ expect-5.45/tests/send.test
+--- a/tests/send.test
++++ b/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
@@ -82,8 +82,8 @@
log_user 0
---- expect-5.45.orig/tests/spawn.test
-+++ expect-5.45/tests/spawn.test
+--- a/tests/spawn.test
++++ b/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
@@ -93,8 +93,8 @@
log_user 0
---- expect-5.45.orig/tests/stty.test
-+++ expect-5.45/tests/stty.test
+--- a/tests/stty.test
++++ b/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
Modified: expect/trunk/debian/patches/07-file-handle.patch
===================================================================
--- expect/trunk/debian/patches/07-file-handle.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/07-file-handle.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -2,8 +2,8 @@
Description:
Fixes file handle 3 to be left open when running programs (Closes: #166677).
---- expect-5.45.orig/exp_clib.c
-+++ expect-5.45/exp_clib.c
+--- a/exp_clib.c
++++ b/exp_clib.c
@@ -2040,6 +2040,7 @@
/* save error fd while we're setting up new one */
@@ -12,8 +12,8 @@
/* and here is the macro to restore it */
#define restore_error_fd {close(2);fcntl(errorfd,F_DUPFD,2);}
---- expect-5.45.orig/exp_command.c
-+++ expect-5.45/exp_command.c
+--- a/exp_command.c
++++ b/exp_command.c
@@ -1162,6 +1162,7 @@
/* save error fd while we're setting up new one */
Modified: expect/trunk/debian/patches/09-unsafe-traps.patch
===================================================================
--- expect/trunk/debian/patches/09-unsafe-traps.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/09-unsafe-traps.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: n/a
Description: Fixes some unsafe traps.
---- expect-5.45.orig/exp_trap.c
-+++ expect-5.45/exp_trap.c
+--- a/exp_trap.c
++++ b/exp_trap.c
@@ -264,6 +264,18 @@
#if defined(SIGSTOP)
traps[SIGSTOP].reserved = TRUE;
Modified: expect/trunk/debian/patches/10-manpage.patch
===================================================================
--- expect/trunk/debian/patches/10-manpage.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/10-manpage.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: n/a
Description: Fixes sample expect shebang and excapes dashes.
---- expect-5.45.orig/expect.man
-+++ expect-5.45/expect.man
+--- a/expect.man
++++ b/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:
Modified: expect/trunk/debian/patches/11-ttyname.patch
===================================================================
--- expect/trunk/debian/patches/11-ttyname.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/11-ttyname.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -3,8 +3,8 @@
Check before call ttyname, so don't coredump in chroots without /proc
(Closes: #440804).
---- expect-5.45.orig/pty_termios.c
-+++ expect-5.45/pty_termios.c
+--- a/pty_termios.c
++++ b/pty_termios.c
@@ -369,6 +369,17 @@
#define W_OK 02
#endif
Modified: expect/trunk/debian/patches/12-fdout.patch
===================================================================
--- expect/trunk/debian/patches/12-fdout.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/12-fdout.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: Ian Jackson <iwj at ubuntu.com>
Description: expBusy forgets to open fdout (Closes: #440818).
---- expect-5.45.orig/exp_command.c
-+++ expect-5.45/exp_command.c
+--- a/exp_command.c
++++ b/exp_command.c
@@ -315,7 +315,15 @@
fcntl(x,F_DUPFD,esPtr->fdin);
close(x);
Modified: expect/trunk/debian/patches/13-implicit-defs.patch
===================================================================
--- expect/trunk/debian/patches/13-implicit-defs.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/13-implicit-defs.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: LaMont Jones <lamont at debian.org>
Description: Fix implicit definitions throughout (Closes: #441115).
---- expect-5.45.orig/exp_chan.c
-+++ expect-5.45/exp_chan.c
+--- a/exp_chan.c
++++ b/exp_chan.c
@@ -34,6 +34,7 @@
#include "exp_rename.h"
#include "exp_prog.h"
@@ -11,8 +11,8 @@
#include "exp_log.h"
#include "tcldbg.h" /* Dbg_StdinMode */
---- expect-5.45.orig/exp_clib.c
-+++ expect-5.45/exp_clib.c
+--- a/exp_clib.c
++++ b/exp_clib.c
@@ -7,6 +7,9 @@
would appreciate credit if this program or parts of it are used.
*/
@@ -23,8 +23,8 @@
#include "expect_cf.h"
#include <stdio.h>
#include <setjmp.h>
---- expect-5.45.orig/exp_command.h
-+++ expect-5.45/exp_command.h
+--- a/exp_command.h
++++ b/exp_command.h
@@ -7,6 +7,9 @@
would appreciate credit if this program or parts of it are used.
*/
@@ -76,8 +76,8 @@
/*
* Local Variables:
---- expect-5.45.orig/exp_main_sub.c
-+++ expect-5.45/exp_main_sub.c
+--- a/exp_main_sub.c
++++ b/exp_main_sub.c
@@ -2,6 +2,7 @@
#include "expect_cf.h"
@@ -86,8 +86,8 @@
#include <errno.h>
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
---- expect-5.45.orig/exp_tty.h
-+++ expect-5.45/exp_tty.h
+--- a/exp_tty.h
++++ b/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);
@@ -96,8 +96,8 @@
void exp_tty_set(Tcl_Interp *interp, exp_tty *tty, int raw, int echo);
int exp_tty_set_simple(exp_tty *tty);
---- expect-5.45.orig/exp_tty_in.h
-+++ expect-5.45/exp_tty_in.h
+--- a/exp_tty_in.h
++++ b/exp_tty_in.h
@@ -11,6 +11,8 @@
#define __EXP_TTY_IN_H__
@@ -107,8 +107,8 @@
#ifdef __MACHTEN__
#include "sys/types.h"
---- expect-5.45.orig/exp_win.c
-+++ expect-5.45/exp_win.c
+--- a/exp_win.c
++++ b/exp_win.c
@@ -51,6 +51,7 @@
# include <sys/ptem.h>
#endif /* HAVE_SYS_PTEM_H */
@@ -117,8 +117,8 @@
#include "exp_tty_in.h"
#include "exp_win.h"
---- expect-5.45.orig/exp_win.h
-+++ expect-5.45/exp_win.h
+--- a/exp_win.h
++++ b/exp_win.h
@@ -1,3 +1,5 @@
+#ifndef __EXP_WIN_H
+#define __EXP_WIN_H
@@ -142,8 +142,8 @@
char* exp_win2_columns_get _ANSI_ARGS_ ((int fd));
+
+#endif /* __EXP_WIN_H */
---- expect-5.45.orig/pty_termios.c
-+++ expect-5.45/pty_termios.c
+--- a/pty_termios.c
++++ b/pty_termios.c
@@ -9,12 +9,19 @@
#include <stdio.h>
Modified: expect/trunk/debian/patches/16-logfile.patch
===================================================================
--- expect/trunk/debian/patches/16-logfile.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/16-logfile.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: n/a
Description: Corrects permissions when accessing logfiles.
---- expect-5.45.orig/exp_log.c
-+++ expect-5.45/exp_log.c
+--- a/exp_log.c
++++ b/exp_log.c
@@ -499,7 +499,7 @@
Tcl_DStringAppend(&tsdPtr->logFilename,filename,-1);
}
Modified: expect/trunk/debian/patches/18-non-linux.patch
===================================================================
--- expect/trunk/debian/patches/18-non-linux.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/18-non-linux.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,8 +1,8 @@
Author: Sergei Golovan <sgolovan at debian.org>
Description: Fixes build for non-linux Debian architectures.
---- expect-5.45.orig/tclconfig/tcl.m4
-+++ expect-5.45/tclconfig/tcl.m4
+--- a/tclconfig/tcl.m4
++++ b/tclconfig/tcl.m4
@@ -1521,7 +1521,7 @@
])
])
Modified: expect/trunk/debian/patches/22-segfault-with-stubs.patch
===================================================================
--- expect/trunk/debian/patches/22-segfault-with-stubs.patch 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/22-segfault-with-stubs.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -36,8 +36,8 @@
return 0;
}
---- expect-5.45.orig/exp_clib.c
-+++ expect-5.45/exp_clib.c
+--- a/exp_clib.c
++++ b/exp_clib.c
@@ -117,7 +117,11 @@
#include <stdlib.h> /* for malloc */
#endif
@@ -51,7 +51,7 @@
#include "expect.h"
#define TclRegError exp_TclRegError
-@@ -389,7 +389,7 @@
+@@ -392,7 +396,7 @@
FAIL("regexp too big");
/* Allocate space. */
@@ -60,7 +60,7 @@
if (r == NULL)
FAIL("out of space");
-@@ -399,7 +399,7 @@
+@@ -402,7 +406,7 @@
rcstate->regcode = r->program;
regc(MAGIC, rcstate);
if (reg(0, &flags, rcstate) == NULL) {
Added: expect/trunk/debian/patches/24-format.patch
===================================================================
--- expect/trunk/debian/patches/24-format.patch (rev 0)
+++ expect/trunk/debian/patches/24-format.patch 2014-07-13 17:03:29 UTC (rev 1642)
@@ -0,0 +1,24 @@
+--- a/exp_clib.c
++++ b/exp_clib.c
+@@ -1483,8 +1483,8 @@
+ char *str;
+ {
+ if (exp_is_debugging) {
+- fprintf(stderr,str);
+- if (exp_logfile) fprintf(exp_logfile,str);
++ fprintf(stderr,"%s",str);
++ if (exp_logfile) fprintf(exp_logfile,"%s",str);
+ }
+ }
+
+--- a/exp_command.c
++++ b/exp_command.c
+@@ -995,7 +995,7 @@
+
+ exp_slave_control(master,1);
+
+- sprintf(value,"%d",esPtr->fd_slave);
++ sprintf(value,"%ld",esPtr->fd_slave);
+ Tcl_SetVar2(interp,SPAWN_OUT,"slave,fd",value,0);
+ }
+ Tcl_SetObjResult (interp, Tcl_NewIntObj (EXP_NOPID));
Modified: expect/trunk/debian/patches/series
===================================================================
--- expect/trunk/debian/patches/series 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/patches/series 2014-07-13 17:03:29 UTC (rev 1642)
@@ -12,3 +12,4 @@
18-non-linux.patch
22-segfault-with-stubs.patch
23-memmove.patch
+24-format.patch
Modified: expect/trunk/debian/rules
===================================================================
--- expect/trunk/debian/rules 2014-07-09 15:31:01 UTC (rev 1641)
+++ expect/trunk/debian/rules 2014-07-13 17:03:29 UTC (rev 1642)
@@ -1,15 +1,15 @@
#!/usr/bin/make -f
v = 5.45
-tclv = 8.5
+tclv = 8.6
DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/default.mk
%:
dh ${@}
-CFLAGS = -Wall -g -D_BSD_SOURCE -ansi -D_SVID_SOURCE -D_POSIX_SOURCE
+CFLAGS += -Wall -g -D_BSD_SOURCE -ansi -D_SVID_SOURCE -D_POSIX_SOURCE
override_dh_auto_clean:
dh_auto_clean
@@ -27,8 +27,8 @@
cp -fb /usr/share/misc/config.sub tclconfig/config.sub
autoconf
dh_auto_configure -- --includedir=/usr/include/tcl$(tclv) \
- --with-tcl=/usr/lib/tcl$(tclv) \
- --with-tk=/usr/lib/tk$(tclv) \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(tclv) \
+ --with-tk=/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(tclv) \
--with-tclinclude=/usr/include/tcl$(tclv) \
--with-tkinclude=/usr/include/tcl$(tclv) \
--enable-shared \
@@ -53,12 +53,14 @@
mv $$MANPAGE `dirname $$MANPAGE`/expect_`basename $$MANPAGE`; \
fi; \
done
+ cp debian/tmp/usr/share/man/man1/expect.1 debian/tmp/usr/share/man/man3/Expect.3tcl
+ sed -i -e's:\.TH EXPECT 1:.TH EXPECT 3tcl:' debian/tmp/usr/share/man/man3/Expect.3tcl
# Fixing library name
- mv debian/tmp/usr/lib/expect$(v)/libexpect$(v).so debian/tmp/usr/lib/libexpect.so.$(v)
- mkdir -p -m 755 debian/tmp/usr/lib/tcltk
- mv debian/tmp/usr/lib/expect$(v) debian/tmp/usr/lib/tcltk
+ mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/expect$(v)/libexpect$(v).so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libexpect.so.$(v)
+ mkdir -p -m 755 debian/tmp/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
+ mv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/expect$(v) debian/tmp/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)
# Fixing permissions
- chmod 0644 debian/tmp/usr/lib/tcltk/expect$(v)/pkgIndex.tcl
+ chmod 0644 debian/tmp/usr/lib/tcltk/$(DEB_HOST_MULTIARCH)/expect$(v)/pkgIndex.tcl
override_dh_install:
dh_install --fail-missing
Copied: expect/trunk/debian/tcl-expect-dev.docs (from rev 1617, expect/trunk/debian/expect-dev.docs)
===================================================================
--- expect/trunk/debian/tcl-expect-dev.docs (rev 0)
+++ expect/trunk/debian/tcl-expect-dev.docs 2014-07-13 17:03:29 UTC (rev 1642)
@@ -0,0 +1,3 @@
+FAQ
+NEWS
+README
Copied: expect/trunk/debian/tcl-expect-dev.install (from rev 1617, expect/trunk/debian/expect-dev.install)
===================================================================
--- expect/trunk/debian/tcl-expect-dev.install (rev 0)
+++ expect/trunk/debian/tcl-expect-dev.install 2014-07-13 17:03:29 UTC (rev 1642)
@@ -0,0 +1,3 @@
+/usr/include/*
+#/usr/lib/*/*.a
+/usr/share/man/man3/libexpect.*
Copied: expect/trunk/debian/tcl-expect-dev.links (from rev 1617, expect/trunk/debian/expect-dev.links)
===================================================================
--- expect/trunk/debian/tcl-expect-dev.links (rev 0)
+++ expect/trunk/debian/tcl-expect-dev.links 2014-07-13 17:03:29 UTC (rev 1642)
@@ -0,0 +1 @@
+/usr/lib/libexpect.so.5.45 /usr/lib/libexpect.so
Copied: expect/trunk/debian/tcl-expect.install (from rev 1617, expect/trunk/debian/expect.install)
===================================================================
--- expect/trunk/debian/tcl-expect.install (rev 0)
+++ expect/trunk/debian/tcl-expect.install 2014-07-13 17:03:29 UTC (rev 1642)
@@ -0,0 +1,3 @@
+/usr/lib/*/*.so.*
+/usr/lib/tcltk/*/*
+/usr/share/man/man3/Expect.*
Copied: expect/trunk/debian/tcl-expect.lintian-overrides (from rev 1617, expect/trunk/debian/expect.lintian-overrides)
===================================================================
--- expect/trunk/debian/tcl-expect.lintian-overrides (rev 0)
+++ expect/trunk/debian/tcl-expect.lintian-overrides 2014-07-13 17:03:29 UTC (rev 1642)
@@ -0,0 +1 @@
+expect: package-name-doesnt-match-sonames
More information about the Pkg-tcltk-commits
mailing list