[Pkg-tcltk-commits] r1858 - in expect/branches/stretch/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2017-07-23 19:52:13 +0000 (Sun, 23 Jul 2017)
New Revision: 1858

Modified:
   expect/branches/stretch/debian/changelog
   expect/branches/stretch/debian/patches/26-eof-handling.patch
Log:
[expect-stretch]
  * Added a patch by Georg-Johann Lay which now properly checks for EOF
    and doesn't lose input when there are some characters in the input buffer
    and EOF flag happens.


Modified: expect/branches/stretch/debian/changelog
===================================================================
--- expect/branches/stretch/debian/changelog	2017-07-16 09:48:07 UTC (rev 1857)
+++ expect/branches/stretch/debian/changelog	2017-07-23 19:52:13 UTC (rev 1858)
@@ -1,3 +1,11 @@
+expect (5.45-7+deb9u1) stretch; urgency=medium
+
+  * Added a patch by Georg-Johann Lay which now properly checks for EOF
+    and doesn't lose input when there are some characters in the input buffer
+    and EOF flag happens.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 23 Jul 2017 22:51:16 +0300
+
 expect (5.45-7) unstable; urgency=medium
 
   * Applied a few fixes by upstream which were included in Expect 5.45.3

Modified: expect/branches/stretch/debian/patches/26-eof-handling.patch
===================================================================
--- expect/branches/stretch/debian/patches/26-eof-handling.patch	2017-07-16 09:48:07 UTC (rev 1857)
+++ expect/branches/stretch/debian/patches/26-eof-handling.patch	2017-07-23 19:52:13 UTC (rev 1858)
@@ -1,9 +1,10 @@
-Author: Upstream
-Description: Report and fix both by Nils Carlson.
+Author: Georg-Johann Lay
+Description: Enhancement of a bugfix by Nils Carlson.
  Replaced a cc==0 check with proper Tcl_Eof() check.
-Last-Modified: Fri, 23 Oct 2015 11:09:07 +0300
+Last-Modified: Fri, 14 Jul 2017 17:07:47 +0300
 Bug: http://sourceforge.net/p/expect/patches/18/
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799301
+See-Also: https://gcc.gnu.org/ml/gcc/2017-06/msg00000.html
 
 --- a/expect.c
 +++ b/expect.c
@@ -17,7 +18,7 @@
 -	/* but it should be looked at again anyway". */
 -	if (cc == 0) {
 +
-+	if (Tcl_Eof(esPtr->channel)) {
++	if (cc == 0 && Tcl_Eof(esPtr->channel)) {
  	    cc = EXP_EOF;
 -	} else if (cc > 0) {
 -	    /* successfully read data */