rpms/bash/devel bash-sighandler.patch,1.4,1.5 bash.spec,1.92,1.93

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/bash/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27603

Modified Files:
	bash-sighandler.patch bash.spec 
Log Message:
* Thu Dec  8 2005 Tim Waugh <twaugh at redhat.com> 3.0-40
- Missed another loop for improved sighandler patch (bug #169231).


bash-sighandler.patch:
 builtins/read.def |    1 +
 execute_cmd.c     |    1 +
 input.c           |    2 ++
 jobs.c            |    2 ++
 lib/sh/zread.c    |    7 +++++--
 sig.c             |   11 +++++++++--
 sig.h             |   11 +++++++++++
 7 files changed, 31 insertions(+), 4 deletions(-)

Index: bash-sighandler.patch
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash-sighandler.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bash-sighandler.patch	7 Dec 2005 11:30:01 -0000	1.4
+++ bash-sighandler.patch	8 Dec 2005 11:34:51 -0000	1.5
@@ -105,3 +105,43 @@
    return (result);
  }
  
+--- bash-3.0/builtins/read.def.sighandler	2005-12-08 11:28:40.000000000 +0000
++++ bash-3.0/builtins/read.def	2005-12-08 11:31:27.000000000 +0000
+@@ -460,6 +460,7 @@
+ #if 1
+   if (retval < 0)
+     {
++      CATCH_SIGNALS ();
+       builtin_error (_("read error: %d: %s"), fd, strerror (errno));
+       run_unwind_frame ("read_builtin");
+       return (EXECUTION_FAILURE);
+--- bash-3.0/lib/sh/zread.c.sighandler	2005-12-07 13:24:44.000000000 +0000
++++ bash-3.0/lib/sh/zread.c	2005-12-08 11:26:43.000000000 +0000
+@@ -34,6 +34,9 @@
+ #  define SEEK_CUR 1
+ #endif
+ 
++/* From bash */
++extern int need_termination_unwind_protect;
++
+ /* Read LEN bytes from FD into BUF.  Retry the read on EINTR.  Any other
+    error causes the loop to break. */
+ ssize_t
+@@ -45,7 +48,7 @@
+   ssize_t r;
+ 
+   while ((r = read (fd, buf, len)) < 0 && errno == EINTR)
+-    ;
++    if (need_termination_unwind_protect) break;
+   return r;
+ }
+ 
+@@ -73,7 +76,7 @@
+ 	return r;
+       if (r == -1 && errno == EINTR)
+ 	{
+-	  if (++nintr > NUM_INTR)
++	  if (need_termination_unwind_protect || ++nintr > NUM_INTR)
+ 	    return -1;
+ 	  continue;
+ 	}


Index: bash.spec
===================================================================
RCS file: /cvs/dist/rpms/bash/devel/bash.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- bash.spec	7 Dec 2005 11:30:01 -0000	1.92
+++ bash.spec	8 Dec 2005 11:34:51 -0000	1.93
@@ -1,7 +1,7 @@
 Version: 3.0
 Name: bash
 Summary: The GNU Bourne Again shell (bash) version %{version}.
-Release: 39
+Release: 40
 Group: System Environment/Shells
 License: GPL
 Url: http://www.gnu.org/software/bash
@@ -259,13 +259,16 @@
 %doc doc/*.ps doc/*.0 doc/*.html doc/article.txt
 
 %changelog
-* Wed Dec  7 2005 Tim Waugh <twaugh at redhat.com>  3.0-39
+* Thu Dec  8 2005 Tim Waugh <twaugh at redhat.com> 3.0-40
+- Missed another loop for improved sighandler patch (bug #169231).
+
+* Wed Dec  7 2005 Tim Waugh <twaugh at redhat.com> 3.0-39
 - Missed a loop for improved sighandler patch (bug #169231).
 
-* Tue Dec  6 2005 Tim Waugh <twaugh at redhat.com>  3.0-38
+* Tue Dec  6 2005 Tim Waugh <twaugh at redhat.com> 3.0-38
 - Test out improved sighandler patch (bug #169231).
 
-* Tue Nov 22 2005 Tim Waugh <twaugh at redhat.com>  3.0-37
+* Tue Nov 22 2005 Tim Waugh <twaugh at redhat.com> 3.0-37
 - Applied patch from upstream to fix parsing problem (bug #146638).
 
 * Wed Nov  9 2005 Tim Waugh <twaugh at redhat.com> 3.0-36