Hello community,
here is the log from the commit of package expect
checked in at Fri Mar 21 01:34:18 CET 2008.
--------
--- expect/expect.changes 2006-01-25 21:30:11.000000000 +0100
+++ expect/expect.changes 2008-03-20 19:14:02.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Mar 20 19:13:00 CET 2008 - max@suse.de
+
+- Update to version 5.44.1.5 from CVS:
+ * Improved internal buffer management
+ * Ported script-level commands to the newer Tcl object API
+ * Optimized regular expression matching
+- Split off a -devel subpackage
+- Don't package the example subdir anymore.
+- Fix all critical and part of the non-critical warnings that
+ show up with gcc 4.3. To be continued...
+
+-------------------------------------------------------------------
Old:
----
expect-5.38.0-spawn-43310.patch
expect-5.43.0.tar.bz2
expect-CVS.patch.bz2
New:
----
expect-5.44.1.5.tar.bz2
expect-fixes.patch
expect-rpmlintrc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ expect.spec ++++++
--- /var/tmp/diff_new_pack.x17639/_old 2008-03-21 01:31:03.000000000 +0100
+++ /var/tmp/diff_new_pack.x17639/_new 2008-03-21 01:31:03.000000000 +0100
@@ -1,36 +1,56 @@
#
-# spec file for package expect (Version 5.43.0)
+# spec file for package expect (Version 5.44.1.5)
#
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
-# Please submit bugfixes or comments via http://bugs.opensuse.org
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+Url: http://expect.nist.gov
+
Name: expect
BuildRequires: tcl-devel
-Version: 5.43.0
-Release: 5
+Version: 5.44.1.5
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Group: Development/Tools/Building
-License: distributable, Other License(s), see package
+Group: Development/Languages/Tcl
+License: Public Domain, Freeware
Summary: A Tool for Automating Interactive Programs
-Autoreqprov: on
+AutoReqProv: on
Source: %{name}-%{version}.tar.bz2
-Patch0: expect-CVS.patch.bz2
+Source1: expect-rpmlintrc
Patch1: expect.patch
-Patch2: expect-5.38.0-spawn-43310.patch
+Patch2: expect-fixes.patch
Patch3: expect-warnings.patch
%description
-Expect is a tool primarily for automating interactive applications such
-as telnet, ftp, passwd, fsck, rlogin, tip, and more. Expect really
-makes this stuff trivial. Expect is also useful for testing these
-applications. It is described in many books, articles, papers, and
-FAQs. There is an entire book on it available from O'Reilly.
+Expect is a tool primarily for automating interactive applications,
+such as telnet, ftp, passwd, fsck, rlogin, tip, and more. Expect
+really makes this stuff trivial. Expect is also useful for testing
+these applications. It is described in many books, articles, papers,
+and FAQs. There is an entire book on it available from O'Reilly.
+
+
+
+Authors:
+--------
+ libes@nist.gov
+
+%package devel
+Group: Development/Libraries/Tcl
+Summary: Header Files and C API Documentation for expect
+
+%description devel
+This package contains header files and documentation needed for linking
+to expect from programs written in compiled languages like C, C++, etc.
+
+This package is not needed for developing scripts that run under the
+/usr/bin/expect interpreter, or any other Tcl interpreter with the
+expect package loaded.
@@ -39,28 +59,28 @@
libes@nist.gov
%prep
-%setup -q -n %name-5.43
-%patch0 -p1
+%setup -q
%patch1
-%patch2 -p2
+%patch2
%patch3
%build
-%{?suse_update_config:%suse_update_config -f tclconfig}
-autoreconf --force --include=tclconfig
+autoreconf
CFLAGS="%optflags" \
./configure \
--prefix=%_prefix \
--libdir=%_libdir \
- --with-tclconfig=%_libdir \
+ --with-tcl=%_libdir \
+ --with-tk=no_tk \
--mandir=%_mandir \
--enable-shared
make all
+
+%check
make test
%install
# set the right path to the expect binary...
-rm -rf %buildroot
cd example
for f in *; do
sed -e '1s,^#![^ ]*expectk,#!/usr/bin/wish\npackage require Expect,' \
@@ -69,7 +89,7 @@
chmod a+x $f
done
cd ..
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT pkglibdir=%tclscriptdir/%name%version install
# Remove some executables and manpages we don't want to ship
rm $RPM_BUILD_ROOT%_prefix/bin/*passwd
rm $RPM_BUILD_ROOT%_mandir/*/*passwd*
@@ -80,68 +100,80 @@
%files
%defattr(-,root,root)
%{_prefix}/bin/*
-%{_includedir}/*
%{_libdir}/libexpect*
%{_datadir}/tcl/expect*
-%doc %{_mandir}/man?/*
+%doc %{_mandir}/man1/*
%doc ChangeLog HISTORY INSTALL FAQ NEWS README
-%doc example
-%changelog -n expect
-* Wed Jan 25 2006 - mls@suse.de
+%files devel
+%defattr(-,root,root)
+%{_includedir}/*
+%doc %{_mandir}/man3/*
+
+%changelog
+* Thu Mar 20 2008 max@suse.de
+- Update to version 5.44.1.5 from CVS:
+ * Improved internal buffer management
+ * Ported script-level commands to the newer Tcl object API
+ * Optimized regular expression matching
+- Split off a -devel subpackage
+- Don't package the example subdir anymore.
+- Fix all critical and part of the non-critical warnings that
+ show up with gcc 4.3. To be continued...
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Tue Dec 13 2005 - max@suse.de
+* Tue Dec 13 2005 max@suse.de
- Fixed a typo in tcl.m4 that broke configure with bash 3.1.
- Updated expect-CVS.patch.bz2 .
-* Fri Sep 23 2005 - ro@suse.de
+* Fri Sep 23 2005 ro@suse.de
- fix some missing declarations
-* Tue Jun 14 2005 - max@suse.de
+* Tue Jun 14 2005 max@suse.de
- New version: 5.43 plus patch to current CVS head.
- Disabled building of the static library.
- Moved script library to /usr/share/tcl .
-* Tue Jul 13 2004 - max@suse.de
+* Tue Jul 13 2004 max@suse.de
- New version: 5.41.
-* Mon Mar 01 2004 - max@suse.de
+* Mon Mar 01 2004 max@suse.de
- Re-enabled the test suite and added expect-send_tty.patch to
prevent it from crashing.
-* Fri Feb 27 2004 - max@suse.de
+* Fri Feb 27 2004 max@suse.de
- New version: 5.40
- Fixed warnings that broke build (expect-warnings.patch).
- Temporarily disabled "make test" to prevent crashes in autobuild
on some architectures (ppc, s390).
-* Fri Oct 31 2003 - max@suse.de
+* Fri Oct 31 2003 max@suse.de
- New version: 5.39
- Buliding as non-root user
-* Wed May 28 2003 - ro@suse.de
+* Wed May 28 2003 ro@suse.de
- package include files and static lib as well
-* Tue Jan 28 2003 - max@suse.de
+* Tue Jan 28 2003 max@suse.de
- Fixed path to /usr/bin/write in kibitz.
-* Fri Jan 10 2003 - max@suse.de
+* Fri Jan 10 2003 max@suse.de
- Fixed a segfault case during application shutdown, and sent
the patch to the author.
-* Tue Nov 26 2002 - max@suse.de
+* Tue Nov 26 2002 max@suse.de
- New version: 5.38
- Don't build the expectk binary anymore to remove the buildtime
dependency on Tk and X. Scripts that needed to run in expectk
before can be fixed by running them in expect and adding a line
that says "package require Tk" before the first tk command
is executed.
-* Mon Aug 19 2002 - aj@suse.de
+* Mon Aug 19 2002 aj@suse.de
- Read all input from invoked program.
-* Wed Apr 03 2002 - max@suse.de
+* Wed Apr 03 2002 max@suse.de
- Replaced autoreconf by autoconf because it breaks on
autoconf-2.53 and was overkill anyways.
-* Wed Feb 20 2002 - max@suse.de
+* Wed Feb 20 2002 max@suse.de
- Fixed for lib64-s390x.
-* Thu Jan 24 2002 - max@suse.de
+* Thu Jan 24 2002 max@suse.de
- Removed the mkpasswd manpage due to a file name conflict and
because the respective program is also not included.
-* Fri Jan 18 2002 - max@suse.de
+* Fri Jan 18 2002 max@suse.de
- added tk to neededforbuild to prevent linking to static libtk
which is included in tcl-devel
-* Fri Jan 18 2002 - ro@suse.de
+* Fri Jan 18 2002 ro@suse.de
- fixed neededforbuild
-* Thu Jan 17 2002 - max@suse.de
+* Thu Jan 17 2002 max@suse.de
- New version 5.34.
- Separated this package from the tcl source RPM, because it
doesn not any longer need the Tcl and Tk sources at hand.
++++++ expect-5.43.0.tar.bz2 -> expect-5.44.1.5.tar.bz2 ++++++
++++ 47075 lines of diff (skipped)
++++++ expect-fixes.patch ++++++
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_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
AC_PROG_CC
++++++ expect.patch ++++++
--- /var/tmp/diff_new_pack.x17639/_old 2008-03-21 01:31:07.000000000 +0100
+++ /var/tmp/diff_new_pack.x17639/_new 2008-03-21 01:31:07.000000000 +0100
@@ -1,15 +1,8 @@
+Index: Makefile.in
+================================================================================
--- 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
-@@ -101,7 +101,7 @@
+@@ -103,7 +103,7 @@
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
lib_BINARIES = $(PKG_LIB_FILE)
@@ -18,48 +11,16 @@
BINARIES = $(lib_BINARIES) $(bin_BINARIES)
SHELL = @SHELL@
-@@ -120,7 +120,7 @@
+@@ -175,7 +175,7 @@
+ TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)
+ SHARED_BUILD = @SHARED_BUILD@
- PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
- pkgdatadir = $(datadir)/$(PKG_DIR)
--pkglibdir = $(libdir)/$(PKG_DIR)
-+pkglibdir = $(datadir)/tcl/$(PKG_DIR)
- pkgincludedir = $(includedir)/$(PKG_DIR)
-
- top_builddir = .
-@@ -236,10 +236,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
-@@ -254,14 +254,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
+-INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@
++INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
+
+ PKG_CFLAGS = @PKG_CFLAGS@
-@@ -329,7 +329,7 @@
+@@ -331,7 +331,7 @@
pkgIndex.tcl-hand:
(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
@@ -68,7 +29,7 @@
) > pkgIndex.tcl
#========================================================================
-@@ -460,29 +460,30 @@
+@@ -552,29 +552,30 @@
#========================================================================
install-lib-binaries:
@@ -108,7 +69,7 @@
@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
if test -f $(srcdir)/$$p; then \
destp=`basename $$p`; \
-@@ -521,7 +522,7 @@
+@@ -613,7 +614,7 @@
uninstall-binaries:
list='$(lib_BINARIES)'; for p in $$list; do \
@@ -119,144 +80,21 @@
p=`basename $$p`; \
--- configure.in
+++ configure.in
-@@ -49,8 +49,8 @@
+@@ -49,9 +49,6 @@
TEA_PATH_TCLCONFIG
TEA_LOAD_TCLCONFIG
-TEA_PATH_TKCONFIG
-TEA_LOAD_TKCONFIG
-+# TEA_PATH_TKCONFIG
-+# TEA_LOAD_TKCONFIG
-
+-
#-----------------------------------------------------------------------
# Handle the --prefix=... option by defaulting to what Tcl gave.
-@@ -79,7 +79,8 @@
+ # Must be called after TEA_LOAD_TCLCONFIG and before TEA_SETUP_COMPILER.
+@@ -79,7 +76,6 @@
#TEA_PUBLIC_TCL_HEADERS
TEA_PRIVATE_TCL_HEADERS
-TEA_PUBLIC_TK_HEADERS
-+#TEA_PUBLIC_TK_HEADERS
-+AC_SUBST(TK_INCLUDES)
#--------------------------------------------------------------------
# A few miscellaneous platform-specific items:
---- exp_main_tk.c
-+++ exp_main_tk.c
-@@ -36,6 +36,7 @@
- #undef USE_TCL_STUBS
-
- #include
participants (1)
-
root@Hilbert.suse.de