rpms/telnet/devel telnet-0.17-errno_test_sys_bsd.patch, 1.1, 1.2 telnet.spec, 1.30, 1.31

[Adam Tkac (atkac)]

Author: atkac

Update of /cvs/pkgs/rpms/telnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3553

Modified Files:
	telnet-0.17-errno_test_sys_bsd.patch telnet.spec 
Log Message:
- improved patch to #274991


telnet-0.17-errno_test_sys_bsd.patch:

Index: telnet-0.17-errno_test_sys_bsd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet-0.17-errno_test_sys_bsd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- telnet-0.17-errno_test_sys_bsd.patch	22 Aug 2007 14:46:24 -0000	1.1
+++ telnet-0.17-errno_test_sys_bsd.patch	20 Sep 2007 09:19:07 -0000	1.2
@@ -1,11 +1,21 @@
---- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd	2007-08-01 11:37:27.000000000 +0200
-+++ netkit-telnet-0.17/telnet/sys_bsd.c	2007-08-01 11:39:23.000000000 +0200
-@@ -407,6 +407,11 @@
+diff -up netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd netkit-telnet-0.17/telnet/sys_bsd.c
+--- netkit-telnet-0.17/telnet/sys_bsd.c.errnosysbsd	2007-09-20 10:57:58.000000000 +0200
++++ netkit-telnet-0.17/telnet/sys_bsd.c	2007-09-20 11:10:08.000000000 +0200
+@@ -375,6 +375,7 @@ TerminalNewMode(int f)
+     int onoff;
+     int old;
+     cc_t esc;
++    int err;
+ 
+     globalmode = f&~MODE_FORCE;
+     if (prevmode == f)
+@@ -407,6 +408,12 @@ TerminalNewMode(int f)
  	    tcsetattr(tin, TCSADRAIN, &tmp_tc);
  #endif	/* USE_TERMIO */
  	    old = ttyflush(SYNCHing|flushout);
 +            if (old < 0) {
-+              if (! ((errno == EINTR) || (errno == EAGAIN) || (errno == ENOSPC))) {
++	      err = errno;
++              if (! ((err == EINTR) || (err == EAGAIN) || (err == ENOSPC))) {
 +                break;
 +              }
 +            }


Index: telnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/telnet/devel/telnet.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- telnet.spec	22 Aug 2007 14:37:32 -0000	1.30
+++ telnet.spec	20 Sep 2007 09:19:07 -0000	1.31
@@ -1,7 +1,7 @@
 Summary: The client program for the telnet remote login protocol.
 Name: telnet
 Version: 0.17
-Release: 39%{?dist}
+Release: 40%{?dist}
 Epoch: 1
 License: BSD
 Group: Applications/Internet
@@ -135,6 +135,9 @@
 %{_mandir}/man8/telnetd.8*
 
 %changelog
+* Thu Sep 20 2007 Adam Tkac <atkac redhat com> 1:0.17-40
+- improved patch to #274991
+
 * Wed Aug 22 2007 Harald Hoyer <harald at redhat.com> - 1:0.17-39
 - added patch to prevent a rare loop in the client