From 7bbe6560d593dc9dff79f74258955d0ed22a11a297f1bd367f6cc32756247ab8 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 9 Nov 2017 14:56:10 +0000 Subject: [PATCH] Accepting request 540240 from home:avindra - New version 5.45.3: * expect.c: On finding a full buffer during matching the sliding window mechanism slides too far, truncating the whole buffer and preventing matches across the boundary. Fix is shortening the slide distance (slide only one 1/3). * expect.c: Replaced a cc==0 check with proper Tcl_Eof() check. - Includes changes from 5.45.2: * configure: Extended Tcl header detection for OS X Mountain Lion. * expect.c: Replaced memcpy with memmove to properly handle overlapping memory. - Includes changes from 5.45.1: * exp_chan.c: Fix a problem when talking a tty where the writer dies. Some operating systems report the condition as EIO with nothing read, while this actually an EOF. Previously, returned data was incomplete due to the error causing data in buffers to be dropped. * exp_chan.c: Fix a problem with the iteration over the expect channel list where the loop code may modify the list, breaking the iterator. * Fixes for exp_chan.c and exp_command.h * expect.c: Convert #bytes information to #chars to prevent later code to fail when copying strings around and miscalculating how much to copy, for strings containing non-ASCII utf chars. * exp_inter.c: Hack access to TCL_REG_BOSONLY when not present, became private with Tcl 8.5 and higher. * expect.h: Remove the local fiddling with the memory allocation and panic macros. * example/unbuffer: Prevent unbuffer from swallowing exit code of the command it ran (regular mode only, not -p) * Various deduplications and cleanups - cleanup with spec-cleaner - use %make_install macro OBS-URL: https://build.opensuse.org/request/show/540240 OBS-URL: https://build.opensuse.org/package/show/devel:languages:tcl/expect?expand=0&rev=19 --- expect-5.45.3.tar.gz | 3 +++ expect.changes | 38 +++++++++++++++++++++++++++++++++++++- expect.spec | 36 ++++++++++++++++-------------------- expect5.45.tar.gz | 3 --- 4 files changed, 56 insertions(+), 24 deletions(-) create mode 100644 expect-5.45.3.tar.gz delete mode 100644 expect5.45.tar.gz diff --git a/expect-5.45.3.tar.gz b/expect-5.45.3.tar.gz new file mode 100644 index 0000000..3cd8e7b --- /dev/null +++ b/expect-5.45.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c520717b7195944a69ce1492ec82ca0ac3f3baf060804e6c5ee6d505ea512be9 +size 624919 diff --git a/expect.changes b/expect.changes index eb295b1..e5d1e90 100644 --- a/expect.changes +++ b/expect.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed Nov 8 20:29:35 UTC 2017 - aavindraa@gmail.com + +- New version 5.45.3: + * expect.c: On finding a full buffer during matching the sliding + window mechanism slides too far, truncating the whole buffer and + preventing matches across the boundary. Fix is shortening the + slide distance (slide only one 1/3). + * expect.c: Replaced a cc==0 check with proper Tcl_Eof() check. +- Includes changes from 5.45.2: + * configure: Extended Tcl header detection for OS X Mountain Lion. + * expect.c: Replaced memcpy with memmove to properly handle + overlapping memory. +- Includes changes from 5.45.1: + * exp_chan.c: Fix a problem when talking a tty where the writer + dies. Some operating systems report the condition as EIO with + nothing read, while this actually an EOF. Previously, returned + data was incomplete due to the error causing data in buffers to + be dropped. + * exp_chan.c: Fix a problem with the iteration over the expect + channel list where the loop code may modify the list, breaking + the iterator. + * Fixes for exp_chan.c and exp_command.h + * expect.c: Convert #bytes information to #chars to prevent later + code to fail when copying strings around and miscalculating how + much to copy, for strings containing non-ASCII utf chars. + * exp_inter.c: Hack access to TCL_REG_BOSONLY when not present, + became private with Tcl 8.5 and higher. + * expect.h: Remove the local fiddling with the memory allocation + and panic macros. + * example/unbuffer: Prevent unbuffer from swallowing exit code of + the command it ran (regular mode only, not -p) + * Various deduplications and cleanups +- cleanup with spec-cleaner +- use %make_install macro + ------------------------------------------------------------------- Fri Jul 17 09:01:09 UTC 2015 - max@suse.com @@ -48,7 +84,7 @@ Mon May 25 16:30:18 CEST 2009 - max@suse.de ------------------------------------------------------------------- Tue Oct 14 18:31:49 CEST 2008 - max@suse.de -- Updagte to version 5.44.1.11 from CVS. The changes mainly consist +- Update 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 . diff --git a/expect.spec b/expect.spec index fe4d4c5..0275015 100644 --- a/expect.spec +++ b/expect.spec @@ -1,7 +1,7 @@ # # spec file for package expect # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,21 @@ # -Url: http://expect.nist.gov - Name: expect -BuildRequires: autoconf -BuildRequires: tcl-devel -Version: 5.45 +Version: 5.45.3 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: A Tool for Automating Interactive Programs License: SUSE-Public-Domain Group: Development/Languages/Tcl -Source: http://downloads.sourceforge.net/project/%{name}/Expect/%{version}/%{name}%{version}.tar.gz +Url: http://expect.nist.gov +Source: http://downloads.sourceforge.net/project/%{name}/Expect/%{version}/%{name}%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: expect-rpmlintrc Patch1: expect.patch Patch2: expect-fixes.patch Patch3: expect-log.patch Patch4: config-guess-sub-update.patch +BuildRequires: autoconf +BuildRequires: tcl-devel %description Expect is a tool primarily for automating interactive applications, @@ -70,31 +68,29 @@ autoreconf make %{?_smp_mflags} all pkglibdir=%_libdir/tcl/%name%version %check -make test +make %{?_smp_mflags} test %install # set the right path to the expect binary... sed -i \ - -e '1s,^#![^ ]*expectk,#!/usr/bin/wish\npackage require Expect,' \ - -e '1s,^#![^ ]*expect,#!/usr/bin/expect,' \ + -e '1s,^#![^ ]*expectk,#!%_bindir/wish\npackage require Expect,' \ + -e '1s,^#![^ ]*expect,#!%_bindir/expect,' \ example/* -make install DESTDIR=$RPM_BUILD_ROOT pkglibdir=%_libdir/tcl/%name%version +%make_install pkglibdir=%_libdir/tcl/%name%version # Remove some executables and manpages we don't want to ship -rm $RPM_BUILD_ROOT%_prefix/bin/*passwd -rm $RPM_BUILD_ROOT%_prefix/bin/weather -rm $RPM_BUILD_ROOT%_mandir/*/*passwd* +rm %buildroot%_bindir/*passwd +rm %buildroot%_bindir/weather +rm %buildroot%_mandir/*/*passwd* %files -%defattr(-,root,root) -%_prefix/bin/* +%_bindir/* %_libdir/tcl/* %_libdir/lib*.so -%doc %_mandir/man1/* +%_mandir/man1/* %doc ChangeLog HISTORY INSTALL FAQ NEWS README %files devel -%defattr(-,root,root) %_includedir/* -%doc %_mandir/man3/* +%_mandir/man3/* %changelog diff --git a/expect5.45.tar.gz b/expect5.45.tar.gz deleted file mode 100644 index bc273f9..0000000 --- a/expect5.45.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040 -size 628808