diff options
| author |   Patrick McLean <chutzpah@gentoo.org> | 2016-08-03 14:03:18 -0700 |
|---|---|---|
| committer | Patrick McLean <chutzpah@gentoo.org> | 2016-08-03 14:06:09 -0700 |
| commit | 0b7038ba6edab3a037851c87160c2338314358ca (patch) | |
| tree | 5ded379b717cf9082f1c9cabaa391d425386e8c6 /net-misc/openssh/files | |
| parent | www-client/firefox: version bump to 48.0 with improved gtk+-3.20 support (diff) | |
| download | gentoo-0b7038ba6edab3a037851c87160c2338314358ca.tar.gz gentoo-0b7038ba6edab3a037851c87160c2338314358ca.tar.bz2 gentoo-0b7038ba6edab3a037851c87160c2338314358ca.zip | |
net-misc/openssh: Revision bump, enable the X509 patch
Package-Manager: portage-2.3.0
Diffstat (limited to 'net-misc/openssh/files')
| -rw-r--r-- | net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch b/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch new file mode 100644 index 000000000000..2def6993e6c3 --- /dev/null +++ b/net-misc/openssh/files/openssh-7.3_p1-sctp-x509-glue.patch @@ -0,0 +1,67 @@ +--- a/openssh-7.3_p1-sctp.patch 2016-08-03 13:10:15.733228732 -0700 ++++ b/openssh-7.3_p1-sctp.patch 2016-08-03 13:25:53.274630002 -0700 +@@ -226,14 +226,6 @@ + .Op Fl c Ar cipher + .Op Fl F Ar ssh_config + .Op Fl i Ar identity_file +-@@ -183,6 +183,7 @@ For full details of the options listed below, and their possible values, see +- .It ServerAliveCountMax +- .It StrictHostKeyChecking +- .It TCPKeepAlive +-+.It Transport +- .It UpdateHostKeys +- .It UsePrivilegedPort +- .It User + @@ -224,6 +225,8 @@ and + to print debugging messages about their progress. + This is helpful in +@@ -493,19 +485,11 @@ + .Sh SYNOPSIS + .Nm ssh + .Bk -words +--.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy +-+.Op Fl 1246AaCfGgKkMNnqsTtVvXxYyz ++-.Op Fl 1246AaCdfgKkMNnqsTtVvXxYy +++.Op Fl 1246AaCdfgKkMNnqsTtVvXxYyz + .Op Fl b Ar bind_address + .Op Fl c Ar cipher_spec + .Op Fl D Oo Ar bind_address : Oc Ns Ar port +-@@ -558,6 +558,7 @@ For full details of the options listed below, and their possible values, see +- .It StreamLocalBindUnlink +- .It StrictHostKeyChecking +- .It TCPKeepAlive +-+.It Transport +- .It Tunnel +- .It TunnelDevice +- .It UpdateHostKeys + @@ -795,6 +796,8 @@ controls. + .Pp + .It Fl y +@@ -533,18 +517,18 @@ + usage(void) + { + fprintf(stderr, +--"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" +-+"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n" ++-"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n" +++"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n" + " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n" +- " [-F configfile] [-I pkcs11] [-i identity_file]\n" +- " [-J [user@]host[:port]] [-L address] [-l login_name] [-m mac_spec]\n" ++ " [-F configfile]\n" ++ #ifdef USE_OPENSSL_ENGINE + @@ -608,7 +613,7 @@ main(int ac, char **av) +- argv0 = av[0]; ++ # define ENGCONFIG "" ++ #endif + +- again: +-- while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" +-+ while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" SCTP_OPT +- "ACD:E:F:GI:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) { ++- while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx" +++ while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx" SCTP_OPT ++ "ACD:E:F:" ENGCONFIG "I:J:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) { + switch (opt) { + case '1': + @@ -857,6 +862,11 @@ main(int ac, char **av) |