forked from pool/expect
Accepting request 87061 from devel:languages:tcl
version 5.45 OBS-URL: https://build.opensuse.org/request/show/87061 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/expect?expand=0&rev=14
This commit is contained in:
Lars Vogdt
Git OBS Bridge
parent
6689d152e3
commit
b070fc40dc
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4f83dd5b6ba956cf11d1c966987393bd96e7eb2d1c3178c99ed1ac60c9018165
|
||||
size 551362
|
||||
@ -1,6 +1,8 @@
|
||||
--- exp_clib.c
|
||||
Index: exp_clib.c
|
||||
===================================================================
|
||||
--- exp_clib.c.orig
|
||||
+++ exp_clib.c
|
||||
@@ -9,6 +9,7 @@
|
||||
@@ -9,6 +9,7 @@ would appreciate credit if this program
|
||||
|
||||
#include "expect_cf.h"
|
||||
#include <stdio.h>
|
||||
@ -8,19 +10,11 @@
|
||||
#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);
|
||||
}
|
||||
/*NOTREACHED*/
|
||||
+ return(TCL_ERROR);
|
||||
}
|
||||
|
||||
static char init_auto_path[] = "\
|
||||
--- exp_trap.c
|
||||
Index: exp_trap.c
|
||||
===================================================================
|
||||
--- exp_trap.c.orig
|
||||
+++ exp_trap.c
|
||||
@@ -13,6 +13,7 @@
|
||||
@@ -13,6 +13,7 @@ would appreciate credit if this program
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <sys/types.h>
|
||||
@ -28,9 +22,11 @@
|
||||
|
||||
#ifdef HAVE_SYS_WAIT_H
|
||||
#include <sys/wait.h>
|
||||
--- exp_win.c
|
||||
Index: exp_win.c
|
||||
===================================================================
|
||||
--- exp_win.c.orig
|
||||
+++ exp_win.c
|
||||
@@ -78,7 +78,7 @@
|
||||
@@ -78,7 +78,7 @@ typedef struct {
|
||||
static exp_winsize winsize = {0, 0};
|
||||
static exp_winsize win2size = {0, 0};
|
||||
|
||||
@ -39,7 +35,7 @@
|
||||
int fd;
|
||||
{
|
||||
#ifdef TIOCSWINSZ
|
||||
@@ -89,7 +89,7 @@
|
||||
@@ -89,7 +89,7 @@ int fd;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -48,7 +44,7 @@
|
||||
int fd;
|
||||
{
|
||||
#ifdef TIOCGWINSZ
|
||||
@@ -142,7 +142,7 @@
|
||||
@@ -142,7 +142,7 @@ exp_win_columns_get()
|
||||
* separate copy of everything above - used for handling user stty requests
|
||||
*/
|
||||
|
||||
@ -57,7 +53,7 @@
|
||||
int fd;
|
||||
{
|
||||
#ifdef TIOCSWINSZ
|
||||
@@ -153,7 +153,7 @@
|
||||
@@ -153,7 +153,7 @@ int fd;
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -66,9 +62,11 @@
|
||||
int fd;
|
||||
{
|
||||
#ifdef TIOCGWINSZ
|
||||
--- exp_win.h
|
||||
Index: exp_win.h
|
||||
===================================================================
|
||||
--- exp_win.h.orig
|
||||
+++ exp_win.h
|
||||
@@ -8,8 +8,8 @@
|
||||
@@ -8,8 +8,8 @@ would appreciate credit if you use this
|
||||
|
||||
#include <tcl.h> /* For _ANSI_ARGS_ */
|
||||
|
||||
@ -79,9 +77,11 @@
|
||||
|
||||
void exp_win_rows_set _ANSI_ARGS_ ((char* rows));
|
||||
char* exp_win_rows_get _ANSI_ARGS_ ((void));
|
||||
--- pty_termios.c
|
||||
Index: pty_termios.c
|
||||
===================================================================
|
||||
--- pty_termios.c.orig
|
||||
+++ pty_termios.c
|
||||
@@ -9,6 +9,7 @@
|
||||
@@ -9,6 +9,7 @@ would appreciate credit if you use this
|
||||
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
--- exp_tty.c
|
||||
+++ exp_tty.c
|
||||
@@ -497,7 +497,7 @@
|
||||
|
||||
/* if no result, make a crude one */
|
||||
if (0 == strcmp(Tcl_GetString(Tcl_GetObjResult(interp)),"")) {
|
||||
- char buf [10];
|
||||
+ char buf [11];
|
||||
sprintf(buf,"%sraw %secho",
|
||||
(was_raw?"":"-"),
|
||||
(was_echo?"":"-"));
|
||||
@@ -635,7 +635,7 @@
|
||||
return(TCL_ERROR);
|
||||
}
|
||||
if (cmd_is_stty) {
|
||||
- char buf [10];
|
||||
+ char buf [11];
|
||||
sprintf(buf,"%sraw %secho",
|
||||
(was_raw?"":"-"),
|
||||
(was_echo?"":"-"));
|
||||
@@ -699,7 +699,7 @@
|
||||
}
|
||||
|
||||
if (cmd_is_stty) {
|
||||
- char buf [10];
|
||||
+ char buf [11];
|
||||
sprintf(buf,"%sraw %secho",
|
||||
(was_raw?"":"-"),
|
||||
(was_echo?"":"-"));
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 7 13:15:19 UTC 2011 - max@suse.com
|
||||
|
||||
- New version 5.45:
|
||||
* Examples now use the expect package instead of /usr/bin/expect.
|
||||
* Countless other bug fixes. For details, see
|
||||
/usr/share/doc/packages/expect/ChangeLog
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
|
||||
|
||||
- Remove redundant/obsolete tags/sections from specfile
|
||||
(cf. packaging guidelines)
|
||||
- Use %_smp_mflags for parallel build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon May 25 16:30:18 CEST 2009 - max@suse.de
|
||||
|
||||
|
||||
54
expect.patch
54
expect.patch
@ -1,35 +1,17 @@
|
||||
Index: Makefile.in
|
||||
================================================================================
|
||||
--- Makefile.in
|
||||
===================================================================
|
||||
--- Makefile.in.orig
|
||||
+++ Makefile.in
|
||||
@@ -103,7 +103,7 @@
|
||||
PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
|
||||
|
||||
lib_BINARIES = $(PKG_LIB_FILE)
|
||||
-bin_BINARIES = expect expectk
|
||||
+bin_BINARIES = expect
|
||||
BINARIES = $(lib_BINARIES) $(bin_BINARIES)
|
||||
|
||||
SHELL = @SHELL@
|
||||
@@ -175,7 +175,7 @@
|
||||
TCLSH = $(TCLSH_ENV) $(TCLSH_PROG)
|
||||
SHARED_BUILD = @SHARED_BUILD@
|
||||
|
||||
-INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@ @TK_INCLUDES@
|
||||
+INCLUDES = @PKG_INCLUDES@ @TCL_INCLUDES@
|
||||
|
||||
PKG_CFLAGS = @PKG_CFLAGS@
|
||||
|
||||
@@ -331,7 +331,7 @@
|
||||
|
||||
@@ -331,7 +331,7 @@ pkgIndex.tcl:
|
||||
pkgIndex.tcl-hand:
|
||||
(echo 'package ifneeded Expect $(PACKAGE_VERSION) \
|
||||
(echo 'if {![package vsatisfies [package provide Tcl] @TCL_VERSION@]} {return}' ; \
|
||||
echo 'package ifneeded Expect $(PACKAGE_VERSION) \
|
||||
- [list load [file join $$dir $(PKG_LIB_FILE)]]'\
|
||||
+ [list load [file join $$dir .. .. $(PKG_LIB_FILE)]]'\
|
||||
+ [list load $(PKG_LIB_FILE)]'\
|
||||
) > pkgIndex.tcl
|
||||
|
||||
#========================================================================
|
||||
@@ -552,29 +552,30 @@
|
||||
@@ -524,29 +524,30 @@ distclean: clean
|
||||
#========================================================================
|
||||
|
||||
install-lib-binaries:
|
||||
@ -69,7 +51,7 @@ Index: Makefile.in
|
||||
@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
|
||||
if test -f $(srcdir)/$$p; then \
|
||||
destp=`basename $$p`; \
|
||||
@@ -613,7 +614,7 @@
|
||||
@@ -585,7 +586,7 @@ Makefile: $(srcdir)/Makefile.in $(top_b
|
||||
|
||||
uninstall-binaries:
|
||||
list='$(lib_BINARIES)'; for p in $$list; do \
|
||||
@ -78,23 +60,3 @@ Index: Makefile.in
|
||||
done
|
||||
list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
|
||||
p=`basename $$p`; \
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -49,9 +49,6 @@
|
||||
TEA_PATH_TCLCONFIG
|
||||
TEA_LOAD_TCLCONFIG
|
||||
|
||||
-TEA_PATH_TKCONFIG
|
||||
-TEA_LOAD_TKCONFIG
|
||||
-
|
||||
#-----------------------------------------------------------------------
|
||||
# Handle the --prefix=... option by defaulting to what Tcl gave.
|
||||
# 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
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# A few miscellaneous platform-specific items:
|
||||
|
||||
41
expect.spec
41
expect.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package expect (Version 5.44.1.11)
|
||||
# spec file for package expect
|
||||
#
|
||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -15,24 +15,21 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
# norootforbuild
|
||||
|
||||
Url: http://expect.nist.gov
|
||||
|
||||
Name: expect
|
||||
BuildRequires: tcl-devel
|
||||
Version: 5.44.1.11
|
||||
Version: 5.45
|
||||
Release: 2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Group: Development/Languages/Tcl
|
||||
License: Public Domain, Freeware
|
||||
Summary: A Tool for Automating Interactive Programs
|
||||
AutoReqProv: on
|
||||
Source: %{name}-%{version}.tar.bz2
|
||||
Source: %{name}%{version}.tar.gz
|
||||
Source1: expect-rpmlintrc
|
||||
Patch1: expect.patch
|
||||
Patch2: expect-fixes.patch
|
||||
Patch3: expect-stty.patch
|
||||
|
||||
%description
|
||||
Expect is a tool primarily for automating interactive applications,
|
||||
@ -41,12 +38,6 @@ 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
|
||||
License: Public Domain, Freeware
|
||||
Group: Development/Libraries/Tcl
|
||||
@ -60,30 +51,19 @@ 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.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
libes@nist.gov
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%setup -q -n %name%version
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
|
||||
%build
|
||||
autoreconf
|
||||
CFLAGS="%optflags" \
|
||||
./configure \
|
||||
--prefix=%_prefix \
|
||||
--libdir=%_libdir \
|
||||
%configure \
|
||||
--with-tcl=%_libdir \
|
||||
--with-tk=no_tk \
|
||||
--mandir=%_mandir \
|
||||
--with-tclinclude=/usr/include \
|
||||
--with-tclinclude=%_includedir \
|
||||
--enable-shared
|
||||
make all pkglibdir=%_libdir/tcl/%name%version
|
||||
make %{?_smp_mflags} all pkglibdir=%_libdir/tcl/%name%version
|
||||
|
||||
%check
|
||||
make test
|
||||
@ -99,14 +79,11 @@ make install DESTDIR=$RPM_BUILD_ROOT pkglibdir=%_libdir/tcl/%name%version
|
||||
rm $RPM_BUILD_ROOT%_prefix/bin/*passwd
|
||||
rm $RPM_BUILD_ROOT%_mandir/*/*passwd*
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_prefix/bin/*
|
||||
%_libdir/tcl/*
|
||||
%_libdir/lib*so
|
||||
%_libdir/lib*.so
|
||||
%doc %_mandir/man1/*
|
||||
%doc ChangeLog HISTORY INSTALL FAQ NEWS README
|
||||
|
||||
|
||||
3
expect5.45.tar.gz
Normal file
3
expect5.45.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040
|
||||
size 628808
|
||||
Loading…
Reference in New Issue
Block a user