diff options
| author | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-14 11:00:30 +0200 |
|---|---|---|
| committer | Bartłomiej Piotrowski <b@bpiotrowski.pl> | 2013-09-14 11:00:30 +0200 |
| commit | 373c1bee7743a7a7d4f2a785ccfb4b9d45b84560 (patch) | |
| tree | 6733aa2084d284996303a6c8fe12b98792805bd5 /main/openssh/openssh6.2-dynwindows.diff | |
| parent | 2672d97850a3eeaee0565720a4dd7426442a4fb7 (diff) | |
| download | aports-373c1bee7743a7a7d4f2a785ccfb4b9d45b84560.tar.bz2 aports-373c1bee7743a7a7d4f2a785ccfb4b9d45b84560.tar.xz | |
main/openssh: upgrade to 6.3_p1
Diffstat (limited to 'main/openssh/openssh6.2-dynwindows.diff')
| -rw-r--r-- | main/openssh/openssh6.2-dynwindows.diff | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/main/openssh/openssh6.2-dynwindows.diff b/main/openssh/openssh6.2-dynwindows.diff index c903d30c1..2e1492792 100644 --- a/main/openssh/openssh6.2-dynwindows.diff +++ b/main/openssh/openssh6.2-dynwindows.diff @@ -420,9 +420,9 @@ diff -rNuwpB canonical/readconf.c dynamic/readconf.c @@ -135,6 +135,7 @@ typedef enum { oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, - oKexAlgorithms, oIPQoS, oRequestTTY, + oKexAlgorithms, oIPQoS, oRequestTTY, oIgnoreUnknown, + oTcpRcvBufPoll, oTcpRcvBuf, oHPNDisabled, oHPNBufferSize, - oDeprecated, oUnsupported + oIgnoredUnknownOption, oDeprecated, oUnsupported } OpCodes; @@ -247,6 +248,11 @@ static struct { @@ -471,6 +471,7 @@ diff -rNuwpB canonical/readconf.c dynamic/readconf.c options->ip_qos_interactive = -1; options->ip_qos_bulk = -1; options->request_tty = -1; + options->ignored_unknown = NULL; + + options->hpn_disabled = -1; + options->hpn_buffer_size = -1; @@ -1003,9 +1004,9 @@ diff -rNuwpB canonical/version.h dynamic/version.h --- canonical/version.h 2013-05-10 02:02:21.000000000 -0400 +++ dynamic/version.h 2013-08-14 15:27:52.736478576 -0400 @@ -3,4 +3,5 @@ - #define SSH_VERSION "OpenSSH_6.2" + #define SSH_VERSION "OpenSSH_6.3" - #define SSH_PORTABLE "p2" + #define SSH_PORTABLE "p1" -#define SSH_RELEASE SSH_VERSION SSH_PORTABLE +#define SSH_HPN "-hpn14v1" +#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN |