mirrors/openssh
0
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-11-24 02:02:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

pull in 5.3 release changes from branch:

Browse Source 
20090926
 - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
         [contrib/suse/openssh.spec] Update for release
 - (djm) [README] update relnotes URL
 - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
 - (djm) Release 5.3p1
This commit is contained in:
Damien Miller 2009-10-02 11:49:03 +10:00
parent e02b49a806
commit ea43742e77
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
20090926
- (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Update for release
- (djm) [README] update relnotes URL
- (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere
- (djm) Release 5.3p1
20090911
- (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X
10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch

4
README
View File

@ -1,4 +1,4 @@
See http://www.openssh.com/txt/release-5.2 for the release notes.
See http://www.openssh.com/txt/release-5.3 for the release notes.
- A Japanese translation of this document and of the OpenSSH FAQ is
- available at http://www.unixuser.org/~haruyama/security/openssh/index.html
@ -62,4 +62,4 @@ References -
[6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9
[7] http://www.openssh.com/faq.html
$Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $
$Id: README,v 1.71 2009/10/02 01:49:03 djm Exp $

6
contrib/caldera/openssh.spec
View File

@ -17,11 +17,11 @@
#old cvs stuff. please update before use. may be deprecated.
%define use_stable 1
%if %{use_stable}
%define version 5.2p1
%define version 5.3p1
%define cvs %{nil}
%define release 1
%else
%define version 5.2p1
%define version 5.3p1
%define cvs cvs20050315
%define release 0r1
%endif
@ -358,4 +358,4 @@ fi
* Mon Jan 01 1998 ...
Template Version: 1.31
$Id: openssh.spec,v 1.66 2009/02/21 07:03:05 djm Exp $
$Id: openssh.spec,v 1.67 2009/10/02 01:49:05 djm Exp $

2
contrib/redhat/openssh.spec
View File

@ -1,4 +1,4 @@
%define ver 5.2p1
%define ver 5.3p1
%define rel 1
# OpenSSH privilege separation requires a user & group ID

2
contrib/suse/openssh.spec
View File

@ -13,7 +13,7 @@
Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
Name: openssh
Version: 5.2p1
Version: 5.3p1
URL: http://www.openssh.com/
Release: 1
Source0: openssh-%{version}.tar.gz

9
packet.c
View File

@ -1070,7 +1070,8 @@ packet_read_seqnr(u_int32_t *seqnr_p)
if ((ret = select(active_state->connection_in + 1, setp,
NULL, NULL, timeoutp)) >= 0)
break;
if (errno != EAGAIN && errno != EINTR)
if (errno != EAGAIN && errno != EINTR &&
errno != EWOULDBLOCK)
break;
if (active_state->packet_timeout_ms == -1)
continue;
@ -1643,7 +1644,8 @@ packet_write_poll(void)
len = roaming_write(active_state->connection_out,
buffer_ptr(&active_state->output), len, &cont);
if (len == -1) {
if (errno == EINTR || errno == EAGAIN)
if (errno == EINTR || errno == EAGAIN ||
errno == EWOULDBLOCK)
return;
fatal("Write failed: %.100s", strerror(errno));
}
@ -1685,7 +1687,8 @@ packet_write_wait(void)
if ((ret = select(active_state->connection_out + 1,
NULL, setp, NULL, timeoutp)) >= 0)
break;
if (errno != EAGAIN && errno != EINTR)
if (errno != EAGAIN && errno != EINTR &&
errno != EWOULDBLOCK)
break;
if (active_state->packet_timeout_ms == -1)
continue;