<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch openssh
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b0c9b1fc19d6103a6f0e58648dfb9686f6a2fbaf">https://github.com/macports/macports-ports/commit/b0c9b1fc19d6103a6f0e58648dfb9686f6a2fbaf</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/openssh by this push:
<span style='display:block; white-space:pre;color:#404040;'> new b0c9b1fc19d openssh: update to 8.4p1, drop keychain patch and hpn variant
</span>b0c9b1fc19d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b0c9b1fc19d6103a6f0e58648dfb9686f6a2fbaf
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Wed Dec 16 20:12:34 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> openssh: update to 8.4p1, drop keychain patch and hpn variant
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> update gsskex and macports-config patches
</span>---
net/openssh/Portfile | 32 ++------
net/openssh/files/macports-config.patch | 8 +-
...sh-8.1p1-gsskex-all-20141021-mp-20201216.patch} | 90 +++++++++-------------
.../files/patch-openbsd_compat-memmem-bug.diff | 11 ---
4 files changed, 49 insertions(+), 92 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/Portfile b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a6a0734d3c..9922d5436cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,8 @@ PortSystem 1.0
</span> PortGroup compiler_blacklist_versions 1.0
name openssh
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 8.1p1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 8.4p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,9 +29,9 @@ long_description OpenSSH is a FREE version of the SSH protocol suite of \
</span>
homepage https://www.openbsd.org/openssh/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 0d9bcaa22b77a8e26fbe4804ea4ae017e45b1568 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 02f5dbef3835d0753556f973cd57b4c19b6b1f6cd24c03445e23ac77ca1b93ff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1625894
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2d3eec0b56f7edef5d50b8defa2f143ffee5c65a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5a01d22e407eb1c05ba8a8f7c654d388a13e9f226e4ed33bd38748dafa1d2b24 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1742201
</span>
master_sites openbsd:OpenSSH/portable \
ftp://ftp.cise.ufl.edu/pub/mirrors/openssh/portable/ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,9 +50,7 @@ if {${name} eq ${subport}} {
</span> pam.patch \
patch-sandbox-darwin.c-apple-sandbox-named-external.diff \
patch-sshd.c-apple-sandbox-named-external.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 0002-Apple-keychain-integration-other-changes.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macports-config.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-openbsd_compat-memmem-bug.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macports-config.patch
</span>
# We need a couple of patches
# - pam.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,22 +160,8 @@ if {${name} eq ${subport}} {
</span> depends_run-append port:xauth
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant hpn conflicts gsskex description {Apply high performance patch} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Current location(s):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/rapier1/openssh-portable/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://www.freshports.org/security/openssh-portable/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (is usually quick in updating the HPN patch for new versions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # take a look there, too.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Formerly taken directly from FreeBSD as a distfile, now copied over
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from either upstream at or FreeBSD's ports directory and rebased.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set hpn_patchfile ${name}-${version}-hpnssh14v18
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append ${hpn_patchfile}.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${hpn_patchfile}-openssl-1.1.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant gsskex conflicts hpn requires kerberos5 description "Add OpenSSH GSSAPI key exchange patch" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant gsskex requires kerberos5 description "Add OpenSSH GSSAPI key exchange patch" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append openssh-8.1p1-gsskex-all-20141021-mp-20201216.patch
</span> configure.ldflags-append \
-Wl,-pie
configure.cflags-append -fPIE
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/macports-config.patch b/net/openssh/files/macports-config.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index d98c39b02f8..5838506644c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/macports-config.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/openssh/files/macports-config.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh_config 2019-10-17 01:02:18.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh_config 2019-10-17 01:07:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh_config 2020-09-27 02:25:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh_config 2020-12-12 19:19:55.000000000 -0600
</span> @@ -17,7 +17,7 @@
# list of available options, their meanings and defaults, please see the
# ssh_config(5) man page.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,10 +9,10 @@
</span> # ForwardAgent no
# ForwardX11 no
# PasswordAuthentication yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,3 +43,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # VisualHostKey no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,3 +44,4 @@
</span> # ProxyCommand ssh -q -W %h:%p gateway.example.com
# RekeyLimit 1G 1h
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # UserKnownHostsFile ~/.ssh/known_hosts.d/%k
</span> + SendEnv LANG LC_*
--- a/ssh_config.5 2019-10-17 01:02:18.000000000 +0200
+++ b/ssh_config.5 2019-10-17 01:11:33.000000000 +0200
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch b/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20201216.patch
</span>similarity index 98%
rename from net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20191015.patch
rename to net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20201216.patch
<span style='display:block; white-space:pre;color:#808080;'>index 4a5502a3083..1fd4d51fa72 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/openssh-8.1p1-gsskex-all-20141021-mp-20191015.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;'>@@ -204,9 +204,9 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> + add support for GssapiTrustDns option for gssapi-with-mic
+ (from jbasney AT ncsa.uiuc.edu)
+ <gssapi-with-mic support is Bugzilla #1008>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.in 2019-11-08 15:37:14.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.in 2019-11-08 15:37:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -87,6 +87,7 @@ LIBOPENSSH_OBJS=\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.in.orig 2020-09-27 02:25:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.in 2020-12-16 18:31:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -91,6 +91,7 @@
</span>
LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
authfd.o authfile.o \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -214,22 +214,22 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> canohost.o channels.o cipher.o cipher-aes.o cipher-aesctr.o \
cipher-ctr.o cleanup.o \
compat.o fatal.o hostfile.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -102,6 +103,7 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,6 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hmac.o sc25519.o ge25519.o fe25519.o ed25519.o verify.o hash.o \
</span> kex.o kexdh.o kexgex.o kexecdh.o kexc25519.o \
kexgexc.o kexgexs.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \
</span> + kexgssc.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- platform-pledge.o platform-tracing.o platform-misc.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -116,7 +118,7 @@ SSHDOBJS=sshd.o auth-rhosts.o auth-passw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sntrup4591761.o kexsntrup4591761x25519.o kexgen.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sftp-realpath.o platform-pledge.o platform-tracing.o platform-misc.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sshbuf-io.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,7 +125,7 @@
</span> auth-bsdauth.o auth2-hostbased.o auth2-kbdint.o \
auth2-none.o auth2-passwd.o auth2-pubkey.o \
monitor.o monitor_wrap.o auth-krb5.o \
- auth2-gss.o gss-serv.o gss-serv-krb5.o \
+ auth2-gss.o gss-serv.o gss-serv-krb5.o kexgsss.o \
loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sftp-server.o sftp-common.o sftp-realpath.o \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sftp-server.o sftp-common.o \
</span> sandbox-null.o sandbox-rlimit.o sandbox-systrace.o sandbox-darwin.o \
--- a/auth-krb5.c 2019-10-09 02:31:03.000000000 +0200
+++ b/auth-krb5.c 2019-11-08 15:37:23.000000000 +0100
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3057,22 +3057,6 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> .Xr ssh 1
--- a/sshconnect2.c 2019-11-08 15:37:14.000000000 +0100
+++ b/sshconnect2.c 2019-11-08 15:37:23.000000000 +0100
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -77,14 +77,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "keychain.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int found_in_keychain = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "auth-compat.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef GSSAPI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "ssh-gss.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* import */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *client_version_string;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern char *server_version_string;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern Options options;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span> @@ -166,6 +165,11 @@ ssh_kex2(struct ssh *ssh, char *host, st
char *s, *all_key;
int r;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3527,19 +3511,19 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> continue;
if (!include_sigonly && kt->sigonly)
continue;
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/sshkey.h 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/sshkey.h 2019-11-08 15:37:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -65,6 +65,7 @@ enum sshkey_types {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/sshkey.h.orig 2020-09-27 02:25:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/sshkey.h 2020-12-16 18:42:50.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -65,6 +65,7 @@
</span> KEY_ED25519_CERT,
KEY_XMSS,
KEY_XMSS_CERT,
+ KEY_NULL,
<span style='display:block; white-space:pre;background:#ffe0e0;'>- KEY_UNSPEC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/auth.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/auth.c 2019-11-08 15:37:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -399,7 +399,8 @@ auth_root_allowed(struct ssh *ssh, const
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KEY_ECDSA_SK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KEY_ECDSA_SK_CERT,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ KEY_ED25519_SK,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/auth.c.orig 2020-09-27 02:25:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/auth.c 2020-12-16 18:45:58.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -400,7 +400,8 @@
</span> case PERMIT_NO_PASSWD:
if (strcmp(method, "publickey") == 0 ||
strcmp(method, "hostbased") == 0 ||
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3549,7 +3533,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> return 1;
break;
case PERMIT_FORCED_ONLY:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -724,120 +725,6 @@ fakepw(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -725,120 +726,6 @@
</span> }
/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3577,7 +3561,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> - if (getpeername(ssh_packet_get_connection_in(ssh),
- (struct sockaddr *)&from, &fromlen) == -1) {
- debug("getpeername failed: %.100s", strerror(errno));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return strdup(ntop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return xstrdup(ntop);
</span> - }
-
- ipv64_normalise_mapped(&from, &fromlen);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3589,7 +3573,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> - if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
- NULL, 0, NI_NAMEREQD) != 0) {
- /* Host name not found. Use ip address. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return strdup(ntop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return xstrdup(ntop);
</span> - }
-
- /*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3604,7 +3588,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> - logit("Nasty PTR record \"%s\" is set up for %s, ignoring",
- name, ntop);
- freeaddrinfo(ai);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return strdup(ntop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return xstrdup(ntop);
</span> - }
-
- /* Names are stored in lowercase. */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3625,7 +3609,7 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> - if (getaddrinfo(name, NULL, &hints, &aitop) != 0) {
- logit("reverse mapping checking getaddrinfo for %.700s "
- "[%s] failed.", name, ntop);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return strdup(ntop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return xstrdup(ntop);
</span> - }
- /* Look for the address from the list of addresses. */
- for (ai = aitop; ai; ai = ai->ai_next) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3640,9 +3624,9 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> - /* Address not found for the host name. */
- logit("Address %.100s maps to %.600s, but this does not "
- "map back to the address.", ntop, name);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return strdup(ntop);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return xstrdup(ntop);
</span> - }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return strdup(name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return xstrdup(name);
</span> -}
-
-/*
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3990,23 +3974,23 @@ X-Ref: https://salsa.debian.org/ssh-team/openssh/blob/767ee84d3465b6d244a9108de5
</span> .Ar key
(key types),
.Ar key-cert
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/ssh.c 2019-10-09 02:31:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/ssh.c 2019-11-08 15:37:23.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -736,6 +736,8 @@ main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp = mac_alg_list('\n');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (strcmp(optarg, "kex") == 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/ssh.c.orig 2020-09-27 02:25:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/ssh.c 2020-12-16 18:50:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -801,6 +801,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (strcmp(optarg, "kex") == 0 ||
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strcasecmp(optarg, "KexAlgorithms") == 0)
</span> cp = kex_alg_list('\n');
+ else if (strcmp(optarg, "kex-gss") == 0)
+ cp = kex_gss_alg_list('\n');
else if (strcmp(optarg, "key") == 0)
cp = sshkey_alg_list(0, 0, 0, '\n');
else if (strcmp(optarg, "key-cert") == 0)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -748,7 +750,7 @@ main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp = xstrdup("2");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (strcmp(optarg, "help") == 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -825,7 +827,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp[n] = '\n';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (strcmp(optarg, "help") == 0) {
</span> cp = xstrdup(
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "cipher\ncipher-auth\nkex\nkey\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "cipher\ncipher-auth\nkex\nkex-gss\nkey\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "key-cert\nkey-plain\nmac\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "cipher\ncipher-auth\ncompression\nkex\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "cipher\ncipher-auth\ncompression\nkex-gss\nkex\n"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "key\nkey-cert\nkey-plain\nkey-sig\nmac\n"
</span> "protocol-version\nsig");
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/openssh/files/patch-openbsd_compat-memmem-bug.diff b/net/openssh/files/patch-openbsd_compat-memmem-bug.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c1cd189cbf8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/openssh/files/patch-openbsd_compat-memmem-bug.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/openbsd-compat/openbsd-compat.h 2019-10-22 16:54:47.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/openbsd-compat/openbsd-compat.h 2019-10-22 16:56:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@ int getpagesize(void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *getcwd(char *pt, size_t size);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_MEMMEM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef HAVE_MEMMEM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *memmem(const void *, size_t, const void *, size_t);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>