<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/dbf07b3da095588d8578fa663a51807a4e91be89">https://github.com/macports/macports-ports/commit/dbf07b3da095588d8578fa663a51807a4e91be89</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new dbf07b3da09 openssh: fix implicit declaration in gsskex variant
</span>dbf07b3da09 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit dbf07b3da095588d8578fa663a51807a4e91be89
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Fri Feb 19 15:45:36 2021 -0600

<span style='display:block; white-space:pre;color:#404040;'>    openssh: fix implicit declaration in gsskex variant
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/62320
</span>---
 ...ssh-8.1p1-gsskex-all-20141021-mp-20201216.patch | 32 ++++++++++++++--------
 1 file changed, 20 insertions(+), 12 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20201216.patch b/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20201216.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 1fd4d51fa72..cc3a0393709 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20201216.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20201216.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3055,11 +3055,19 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>  .It Cm HashKnownHosts
  Indicates that
  .Xr ssh 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshconnect2.c     2019-11-08 15:37:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshconnect2.c        2019-11-08 15:37:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -166,6 +165,11 @@ ssh_kex2(struct ssh *ssh, char *host, st
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshconnect2.c.orig   2020-09-27 02:25:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshconnect2.c        2021-02-19 13:12:38.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,6 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "myproposal.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "sshconnect.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "authfile.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "auth-compat.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "dh.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "authfd.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "log.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -210,6 +211,11 @@
</span>   char *s, *all_key;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        int r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   int r, use_known_hosts_order = 0;
</span>  
 +#ifdef GSSAPI
 +      char *orig = NULL, *gss = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3069,8 +3077,8 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>   xxx_host = host;
        xxx_hostaddr = hostaddr;
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -198,6 +202,35 @@ ssh_kex2(struct ssh *ssh, char *host, st
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-               order_hostkeyalgs(host, hostaddr, port));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,6 +259,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+               compat_pkalg_proposal(options.hostkeyalgorithms);
</span>   }
  
 +#if defined(GSSAPI) && defined(WITH_OPENSSL)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3105,7 +3113,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>   if (options.rekey_limit || options.rekey_interval)
                ssh_packet_set_rekey_limits(ssh, options.rekey_limit,
                    options.rekey_interval);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -216,16 +249,46 @@ ssh_kex2(struct ssh *ssh, char *host, st
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -271,16 +306,46 @@
</span>  # ifdef OPENSSL_HAS_ECC
        ssh->kex->kex[KEX_ECDH_SHA2] = kex_gen_client;
  # endif
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3153,7 +3161,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>   if ((r = kex_prop2buf(ssh->kex->my, myproposal)) != 0)
                fatal("kex_prop2buf: %s", ssh_err(r));
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -322,6 +385,7 @@ static int input_gssapi_response(int typ
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -377,6 +442,7 @@
</span>  static int input_gssapi_token(int type, u_int32_t, struct ssh *);
  static int input_gssapi_error(int, u_int32_t, struct ssh *);
  static int input_gssapi_errtok(int, u_int32_t, struct ssh *);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3161,7 +3169,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>  #endif
  
  void  userauth(struct ssh *, char *);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -338,6 +402,11 @@ static char *authmethods_get(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,6 +459,11 @@
</span>  
  Authmethod authmethods[] = {
  #ifdef GSSAPI
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3173,7 +3181,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>   {"gssapi-with-mic",
                userauth_gssapi,
                userauth_gssapi_cleanup,
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,12 +771,24 @@ userauth_gssapi(struct ssh *ssh)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -763,12 +834,24 @@
</span>   OM_uint32 min;
        int r, ok = 0;
        gss_OID mech = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3199,7 +3207,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>  
        /* Check to see whether the mechanism is usable before we offer it */
        while (authctxt->mech_tried < authctxt->gss_supported_mechs->count &&
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -716,13 +797,15 @@ userauth_gssapi(struct ssh *ssh)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -777,13 +860,15 @@
</span>               elements[authctxt->mech_tried];
                /* My DER encoding requires length<128 */
                if (mech->length < 128 && ssh_gssapi_check_mechanism(&gssctxt,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3216,7 +3224,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span>   if (!ok || mech == NULL)
                return 0;
  
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -962,6 +1045,55 @@ input_gssapi_error(int type, u_int32_t p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1023,6 +1108,55 @@
</span>   free(lang);
        return r;
  }
</pre><pre style='margin:0'>

</pre>