diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | contrib/caldera/openssh.spec | 6 | ||||
-rw-r--r-- | contrib/redhat/openssh.spec | 2 | ||||
-rw-r--r-- | contrib/suse/openssh.spec | 2 | ||||
-rw-r--r-- | packet.c | 9 |
6 files changed, 20 insertions, 10 deletions
@@ -1,3 +1,10 @@ | |||
1 | 20090926 | ||
2 | - (djm) [contrib/caldera/openssh.spec contrib/redhat/openssh.spec] | ||
3 | [contrib/suse/openssh.spec] Update for release | ||
4 | - (djm) [README] update relnotes URL | ||
5 | - (djm) [packet.c] Restore EWOULDBLOCK handling that got lost somewhere | ||
6 | - (djm) Release 5.3p1 | ||
7 | |||
1 | 20090911 | 8 | 20090911 |
2 | - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X | 9 | - (dtucker) [configure.ac] Change the -lresolv check so it works on Mac OS X |
3 | 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch | 10 | 10.6 (which doesn't have BIND8_COMPAT and thus uses res_9_query). Patch |
@@ -1,4 +1,4 @@ | |||
1 | See http://www.openssh.com/txt/release-5.2 for the release notes. | 1 | See http://www.openssh.com/txt/release-5.3 for the release notes. |
2 | 2 | ||
3 | - A Japanese translation of this document and of the OpenSSH FAQ is | 3 | - A Japanese translation of this document and of the OpenSSH FAQ is |
4 | - available at http://www.unixuser.org/~haruyama/security/openssh/index.html | 4 | - available at http://www.unixuser.org/~haruyama/security/openssh/index.html |
@@ -62,4 +62,4 @@ References - | |||
62 | [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 | 62 | [6] http://www.openbsd.org/cgi-bin/man.cgi?query=style&sektion=9 |
63 | [7] http://www.openssh.com/faq.html | 63 | [7] http://www.openssh.com/faq.html |
64 | 64 | ||
65 | $Id: README,v 1.70 2009/02/23 00:11:57 djm Exp $ | 65 | $Id: README,v 1.71 2009/10/02 01:49:03 djm Exp $ |
diff --git a/contrib/caldera/openssh.spec b/contrib/caldera/openssh.spec index 42dbcfeeb..9ced32faf 100644 --- a/contrib/caldera/openssh.spec +++ b/contrib/caldera/openssh.spec | |||
@@ -17,11 +17,11 @@ | |||
17 | #old cvs stuff. please update before use. may be deprecated. | 17 | #old cvs stuff. please update before use. may be deprecated. |
18 | %define use_stable 1 | 18 | %define use_stable 1 |
19 | %if %{use_stable} | 19 | %if %{use_stable} |
20 | %define version 5.2p1 | 20 | %define version 5.3p1 |
21 | %define cvs %{nil} | 21 | %define cvs %{nil} |
22 | %define release 1 | 22 | %define release 1 |
23 | %else | 23 | %else |
24 | %define version 5.2p1 | 24 | %define version 5.3p1 |
25 | %define cvs cvs20050315 | 25 | %define cvs cvs20050315 |
26 | %define release 0r1 | 26 | %define release 0r1 |
27 | %endif | 27 | %endif |
@@ -358,4 +358,4 @@ fi | |||
358 | * Mon Jan 01 1998 ... | 358 | * Mon Jan 01 1998 ... |
359 | Template Version: 1.31 | 359 | Template Version: 1.31 |
360 | 360 | ||
361 | $Id: openssh.spec,v 1.66 2009/02/21 07:03:05 djm Exp $ | 361 | $Id: openssh.spec,v 1.67 2009/10/02 01:49:05 djm Exp $ |
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec index 10bdc1989..680906cf3 100644 --- a/contrib/redhat/openssh.spec +++ b/contrib/redhat/openssh.spec | |||
@@ -1,4 +1,4 @@ | |||
1 | %define ver 5.2p1 | 1 | %define ver 5.3p1 |
2 | %define rel 1 | 2 | %define rel 1 |
3 | 3 | ||
4 | # OpenSSH privilege separation requires a user & group ID | 4 | # OpenSSH privilege separation requires a user & group ID |
diff --git a/contrib/suse/openssh.spec b/contrib/suse/openssh.spec index 62f43e137..12661eeae 100644 --- a/contrib/suse/openssh.spec +++ b/contrib/suse/openssh.spec | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation | 14 | Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation |
15 | Name: openssh | 15 | Name: openssh |
16 | Version: 5.2p1 | 16 | Version: 5.3p1 |
17 | URL: http://www.openssh.com/ | 17 | URL: http://www.openssh.com/ |
18 | Release: 1 | 18 | Release: 1 |
19 | Source0: openssh-%{version}.tar.gz | 19 | Source0: openssh-%{version}.tar.gz |
@@ -1070,7 +1070,8 @@ packet_read_seqnr(u_int32_t *seqnr_p) | |||
1070 | if ((ret = select(active_state->connection_in + 1, setp, | 1070 | if ((ret = select(active_state->connection_in + 1, setp, |
1071 | NULL, NULL, timeoutp)) >= 0) | 1071 | NULL, NULL, timeoutp)) >= 0) |
1072 | break; | 1072 | break; |
1073 | if (errno != EAGAIN && errno != EINTR) | 1073 | if (errno != EAGAIN && errno != EINTR && |
1074 | errno != EWOULDBLOCK) | ||
1074 | break; | 1075 | break; |
1075 | if (active_state->packet_timeout_ms == -1) | 1076 | if (active_state->packet_timeout_ms == -1) |
1076 | continue; | 1077 | continue; |
@@ -1643,7 +1644,8 @@ packet_write_poll(void) | |||
1643 | len = roaming_write(active_state->connection_out, | 1644 | len = roaming_write(active_state->connection_out, |
1644 | buffer_ptr(&active_state->output), len, &cont); | 1645 | buffer_ptr(&active_state->output), len, &cont); |
1645 | if (len == -1) { | 1646 | if (len == -1) { |
1646 | if (errno == EINTR || errno == EAGAIN) | 1647 | if (errno == EINTR || errno == EAGAIN || |
1648 | errno == EWOULDBLOCK) | ||
1647 | return; | 1649 | return; |
1648 | fatal("Write failed: %.100s", strerror(errno)); | 1650 | fatal("Write failed: %.100s", strerror(errno)); |
1649 | } | 1651 | } |
@@ -1685,7 +1687,8 @@ packet_write_wait(void) | |||
1685 | if ((ret = select(active_state->connection_out + 1, | 1687 | if ((ret = select(active_state->connection_out + 1, |
1686 | NULL, setp, NULL, timeoutp)) >= 0) | 1688 | NULL, setp, NULL, timeoutp)) >= 0) |
1687 | break; | 1689 | break; |
1688 | if (errno != EAGAIN && errno != EINTR) | 1690 | if (errno != EAGAIN && errno != EINTR && |
1691 | errno != EWOULDBLOCK) | ||
1689 | break; | 1692 | break; |
1690 | if (active_state->packet_timeout_ms == -1) | 1693 | if (active_state->packet_timeout_ms == -1) |
1691 | continue; | 1694 | continue; |