Mailinglist Archive: opensuse-commit (1945 mails)
| < Previous | Next > |
commit expect
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Mon, 03 Nov 2008 12:04:53 +0100
- Message-id: <20081103110453.A71026780AA@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package expect
checked in at Mon Nov 3 12:04:53 CET 2008.
--------
--- expect/expect.changes 2008-10-14 17:42:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/expect/expect.changes 2008-10-28
17:58:57.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Oct 14 18:31:49 CEST 2008 - max@xxxxxxx
+
+- Updagte to version 5.44.1.11 from CVS. The changes mainly consist
+ of our former expect-fixes.patch and expect-warnings.patch, plus
+ some more bug fixes, e.g. for the [expect -exact] crash reported
+ at bnc#427270 .
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
expect-5.44.1.5.tar.bz2
expect-warnings.patch
New:
----
expect-5.44.1.11.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ expect.spec ++++++
--- /var/tmp/diff_new_pack.y12794/_old 2008-11-03 12:04:03.000000000 +0100
+++ /var/tmp/diff_new_pack.y12794/_new 2008-11-03 12:04:03.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package expect (Version 5.44.1.5)
+# spec file for package expect (Version 5.44.1.11)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -21,8 +21,8 @@
Name: expect
BuildRequires: tcl-devel
-Version: 5.44.1.5
-Release: 46
+Version: 5.44.1.11
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Languages/Tcl
License: Public Domain, Freeware
@@ -32,7 +32,6 @@
Source1: expect-rpmlintrc
Patch1: expect.patch
Patch2: expect-fixes.patch
-Patch3: expect-warnings.patch
%description
Expect is a tool primarily for automating interactive applications,
@@ -70,7 +69,6 @@
%setup -q
%patch1
%patch2
-%patch3
%build
autoreconf
@@ -116,6 +114,11 @@
%doc %_mandir/man3/*
%changelog
+* Tue Oct 14 2008 max@xxxxxxx
+- Updagte to version 5.44.1.11 from CVS. The changes mainly consist
+ of our former expect-fixes.patch and expect-warnings.patch, plus
+ some more bug fixes, e.g. for the [expect -exact] crash reported
+ at bnc#427270 .
* Tue Oct 14 2008 meissner@xxxxxxx
- fixed fortify implicits.
* Tue May 06 2008 aj@xxxxxxx
++++++ expect-5.44.1.5.tar.bz2 -> expect-5.44.1.11.tar.bz2 ++++++
++++ 9811 lines of diff (skipped)
++++++ expect-fixes.patch ++++++
--- /var/tmp/diff_new_pack.y12794/_old 2008-11-03 12:04:04.000000000 +0100
+++ /var/tmp/diff_new_pack.y12794/_new 2008-11-03 12:04:04.000000000 +0100
@@ -1,182 +1,91 @@
-Index: Makefile.in
-================================================================================
---- Dbg.c
-+++ Dbg.c
-@@ -545,7 +545,7 @@
- ClientData clientData,
- Tcl_Interp *interp,
- int level,
-- char *command,
-+ CONST char *command,
- Tcl_Command commandInfo,
- int objc,
- struct Tcl_Obj * CONST * objv));
-@@ -559,7 +559,7 @@
- int level; /* positive number if called by Tcl, -1 if */
- /* called by Dbg_On in which case we don't */
- /* know the level */
--char *command;
-+CONST char *command;
- Tcl_Command commandInfo; /* Unused */
- int objc;
- struct Tcl_Obj * CONST * objv;
---- Makefile.in
-+++ Makefile.in
-@@ -23,7 +23,7 @@
- SETUID = @SETUID@
- # SETUID = chmod u+s
-
--LIB_RUNTIME_DIR = $(INSTALL_ROOT)@libdir@
-+LIB_RUNTIME_DIR = $(DESTDIR)@libdir@
-
- # The following Expect scripts are not necessary to have installed as
- # commands, but are very useful. Edit out what you don't want
-@@ -238,10 +238,10 @@
- $(INSTALL_DATA) $(srcdir)/$$i $(DESTDIR)$(includedir) ; \
- done;
- # install standalone scripts and their man pages, if requested
-- @mkdir -p $(INSTALL_ROOT)$(prefix)/bin
-+ @mkdir -p $(DESTDIR)$(prefix)/bin
- -for i in $(SCRIPT_LIST) ; do \
- if [ -f $$i ] ; then \
-- $(INSTALL_PROGRAM) $$i $(INSTALL_ROOT)$(prefix)/bin/$$i ; \
-+ $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
- rm -f $$i ; \
- else true; fi ; \
- done
-@@ -256,14 +256,14 @@
- @mkdir -p $(DESTDIR)$(mandir)/man3
- @echo "Installing documentation in $(DESTDIR)$(mandir)"
- # install Expectk man page if present
-- $(INSTALL_DATA) $(srcdir)/expectk.man $(mandir)/man1/expectk.1 ; \
-+ $(INSTALL_DATA) $(srcdir)/expectk.man
$(DESTDIR)$(mandir)/man1/expectk.1 ; \
- # install Expect man page
-- $(INSTALL_DATA) $(srcdir)/expect.man $(mandir)/man1/expect.1
-+ $(INSTALL_DATA) $(srcdir)/expect.man $(DESTDIR)$(mandir)/man1/expect.1
- # install man page for Expect and Expectk libraries
-- $(INSTALL_DATA) $(srcdir)/libexpect.man $(mandir)/man3/libexpect.3
-+ $(INSTALL_DATA) $(srcdir)/libexpect.man
$(DESTDIR)$(mandir)/man3/libexpect.3
- -for i in $(SCRIPT_MANPAGE_LIST) ; do \
- if [ -f $(srcdir)/example/$$i.man ] ; then \
-- $(INSTALL_DATA) $(srcdir)/example/$$i.man $(mandir)/man1/$$i.1 ; \
-+ $(INSTALL_DATA) $(srcdir)/example/$$i.man
$(DESTDIR)$(mandir)/man1/$$i.1 ; \
- else true; fi ; \
- done
-
---- configure.in
-+++ configure.in
-@@ -448,7 +448,7 @@
- *-*-irix*) stty_reads_stdout=0 ;;
- *-*-sco3.2v[[45]]*) stty_reads_stdout=1 ;;
- i[[3456]]86-*-sysv4.2MP) stty_reads_stdout=0 ;;
-- i[[3456]]86-*-linux*) stty_reads_stdout=0 ;;
-+ *-*-linux*) stty_reads_stdout=0 ;;
- # Not sure about old convex but 5.2 definitely reads from stdout
- c[[12]]-*-*) stty_reads_stdout=1 ;;
- *-*-aix[[34]]*) stty_reads_stdout=0 ;;
-@@ -471,8 +471,9 @@
-
- # if we still don't know, test
- if test x"${stty_reads_stdout}" = x"" ; then
-- $STTY_BIN > /dev/null 2> /dev/null
-- if test $? -ne 0 ; then
-+ $STTY_BIN > /dev/null 2> /dev/null; a=$?
-+ $STTY_BIN < /dev/tty > /dev/null 2> /dev/null; b=$?
-+ if test $a -ne 0 -a $b -ne 0; then
- stty_reads_stdout=1
- else
- stty_reads_stdout=0
---- exp_command.c
-+++ exp_command.c
-@@ -2940,12 +2940,13 @@
- /* are marked sys_waited already */
- if (!esPtr->sys_waited) {
- if (nowait) {
-+ Tcl_Pid pid = (Tcl_Pid)esPtr->pid;
- /* should probably generate an error */
- /* if SIGCHLD is trapped. */
-
- /* pass to Tcl, so it can do wait */
- /* in background */
-- Tcl_DetachPids(1,(Tcl_Pid *)&esPtr->pid);
-+ Tcl_DetachPids(1, &pid);
- exp_wait_zero(&esPtr->wait);
- } else {
- while (1) {
-@@ -3296,6 +3297,7 @@
- } else {
- strcpy (argv[0],Tcl_GetString (objv[0]));
- }
-+ command = Tcl_GetString (objv[0]);
-
- signal(SIGINT, SIG_DFL);
- signal(SIGQUIT, SIG_DFL);
-@@ -3467,7 +3469,8 @@
- if (!leaveopen) {
- /* remove from Expect's memory in anticipation of passing to Tcl */
- if (esPtr->pid != EXP_NOPID) {
-- Tcl_DetachPids(1,(Tcl_Pid *)&esPtr->pid);
-+ Tcl_Pid pid = (Tcl_Pid)esPtr->pid;
-+ Tcl_DetachPids(1,&pid);
- esPtr->pid = EXP_NOPID;
- esPtr->sys_waited = esPtr->user_waited = TRUE;
+--- exp_clib.c
++++ exp_clib.c
+@@ -9,6 +9,7 @@
+
+ #include "expect_cf.h"
+ #include <stdio.h>
++#include <unistd.h>
+ #include <setjmp.h>
+ #ifdef HAVE_INTTYPES_H
+ # include <inttypes.h>
+--- exp_main_sub.c
++++ exp_main_sub.c
+@@ -482,6 +482,7 @@
+ Tcl_Eval(interp, buffer);
}
---- exp_inter.c
-+++ exp_inter.c
-@@ -250,13 +250,13 @@
- return(EXP_MATCH);
- }
- } else if (!km->re) {
-- int slen, kslen;
-+ int kslen;
- Tcl_UniChar sch, ksch;
-
- /* fixed string */
-
- ks = Tcl_GetString(km->keys);
-- for (s = start_search;; s += slen, ks += kslen) {
-+ for (s = start_search;; s++, ks += kslen) {
- /* if we hit the end of this map, must've matched! */
- if (*ks == 0) {
- *skip = start_search-string;
---- expect.c
-+++ expect.c
-@@ -355,6 +355,7 @@
- ec->pat = 0;
- ec->body = 0;
- ec->transfer = TRUE;
-+ ec->simple_start = 0;
- ec->indices = FALSE;
- ec->iread = FALSE;
- ec->timestamp = FALSE;
---- testsuite/aclocal.m4
-+++ testsuite/aclocal.m4
-@@ -0,0 +1,10 @@
-+#
-+# Include the TEA standard macro set
-+#
-+
-+builtin(include,../tclconfig/tcl.m4)
-+builtin(include,../expect.m4)
-+
-+#
-+# Add here whatever m4 macros you want to define for your package
-+#
---- testsuite/configure.in
-+++ testsuite/configure.in
-@@ -1,8 +1,12 @@
- dnl Process this file with autoconf to produce a configure script.
--AC_INIT(exp_test.c)
-+AC_INIT([exp_test],[0.42])
-
--CY_AC_PATH_TCLCONFIG
--CY_AC_LOAD_TCLCONFIG
-+TEA_INIT([3.5])
-+
-+AC_CONFIG_AUX_DIR(../tclconfig)
-+
-+TEA_PATH_TCLCONFIG
-+TEA_LOAD_TCLCONFIG
- CC=$TCL_CC
+ /*NOTREACHED*/
++ return(TCL_ERROR);
+ }
+
+ static char init_auto_path[] = "\
+--- exp_trap.c
++++ exp_trap.c
+@@ -13,6 +13,7 @@
+ #include <stdio.h>
+ #include <signal.h>
+ #include <sys/types.h>
++#include <string.h>
+
+ #ifdef HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+--- exp_win.c
++++ exp_win.c
+@@ -78,7 +78,7 @@
+ static exp_winsize winsize = {0, 0};
+ static exp_winsize win2size = {0, 0};
+
+-int exp_window_size_set(fd)
++void exp_window_size_set(fd)
+ int fd;
+ {
+ #ifdef TIOCSWINSZ
+@@ -89,7 +89,7 @@
+ #endif
+ }
+
+-int exp_window_size_get(fd)
++void exp_window_size_get(fd)
+ int fd;
+ {
+ #ifdef TIOCGWINSZ
+@@ -142,7 +142,7 @@
+ * separate copy of everything above - used for handling user stty requests
+ */
+
+-int exp_win2_size_set(fd)
++void exp_win2_size_set(fd)
+ int fd;
+ {
+ #ifdef TIOCSWINSZ
+@@ -153,7 +153,7 @@
+ #endif
+ }
+
+-int exp_win2_size_get(fd)
++void exp_win2_size_get(fd)
+ int fd;
+ {
+ #ifdef TIOCGWINSZ
+--- exp_win.h
++++ exp_win.h
+@@ -8,8 +8,8 @@
+
+ #include <tcl.h> /* For _ANSI_ARGS_ */
+
+-int exp_window_size_set();
+-int exp_window_size_get();
++void exp_window_size_set();
++void exp_window_size_get();
+
+ void exp_win_rows_set _ANSI_ARGS_ ((char* rows));
+ char* exp_win_rows_get _ANSI_ARGS_ ((void));
+--- pty_termios.c
++++ pty_termios.c
+@@ -9,6 +9,7 @@
+
+ #include <stdio.h>
+ #include <signal.h>
++#include <string.h>
- AC_PROG_CC
+ #if defined(SIGCLD) && !defined(SIGCHLD)
+ #define SIGCHLD SIGCLD
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |