Index: security/openssh-portable/Makefile
===================================================================
--- security/openssh-portable/Makefile
+++ security/openssh-portable/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openssh
 DISTVERSION=	10.2p1
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	security
 MASTER_SITES=	OPENBSD/OpenSSH/portable
Index: security/openssh-portable/files/patch-regress__test-exec.sh
===================================================================
--- security/openssh-portable/files/patch-regress__test-exec.sh
+++ security/openssh-portable/files/patch-regress__test-exec.sh
@@ -1,10 +1,10 @@
 --- regress/test-exec.sh.orig	2015-04-03 18:20:32.256126000 UTC
 +++ regress/test-exec.sh	2015-04-03 18:20:41.599903000 -0500
-@@ -408,6 +408,7 @@ cat << EOF > $OBJ/sshd_config
+@@ -618,6 +618,7 @@ cat << EOF > $OBJ/sshd_config
  	LogLevel		DEBUG3
  	AcceptEnv		_XXX_TEST_*
  	AcceptEnv		_XXX_TEST
 +	PermitRootLogin		yes
  	Subsystem	sftp	$SFTPSERVER
- EOF
- 
+ 	SshdSessionPath		$SSHD_SESSION
+ 	SshdAuthPath		$SSHD_AUTH
Index: security/openssh-portable/files/patch-ssh-agent.c
===================================================================
--- security/openssh-portable/files/patch-ssh-agent.c
+++ security/openssh-portable/files/patch-ssh-agent.c
@@ -85,13 +85,13 @@
  		switch (ch) {
  		case 'E':
  			fingerprint_hash = ssh_digest_alg_by_name(optarg);
-@@ -2286,6 +2310,9 @@ main(int ac, char **av)
+@@ -2285,6 +2309,9 @@ main(int ac, char **av)
+ 				fprintf(stderr, "Invalid lifetime\n");
  				usage();
  			}
- 			break;
++			break;
 +		case 'x':
 +			xcount = 0;
-+			break;
+ 			break;
  		case 'T':
  			T_flag++;
- 			break;
Index: security/openssh-portable/files/patch-ssh.c
===================================================================
--- security/openssh-portable/files/patch-ssh.c
+++ security/openssh-portable/files/patch-ssh.c
@@ -7,9 +7,9 @@
 
 --- ssh.c.orig	2018-04-02 05:38:28 UTC
 +++ ssh.c
-@@ -1281,6 +1281,23 @@ main(int ac, char **av)
- 	ssh_digest_free(md);
- 	conn_hash_hex = tohex(conn_hash, ssh_digest_bytes(SSH_DIGEST_SHA1));
+@@ -1289,6 +1289,23 @@ main(int ac, char **av)
+ 			check_follow_cname(direct, &host, cname);
+ 	}
  
 +	/* Find canonic host name. */
 +	if (strchr(host, '.') == 0) {
@@ -29,5 +29,5 @@
 +	}
 +
  	/*
- 	 * Expand tokens in arguments. NB. LocalCommand is expanded later,
- 	 * after port-forwarding is set up, so it may pick up any local
+ 	 * If canonicalisation is enabled then re-parse the configuration
+ 	 * files as new stanzas may match.
Index: security/openssh-portable/files/patch-sshd.8
===================================================================
--- security/openssh-portable/files/patch-sshd.8
+++ security/openssh-portable/files/patch-sshd.8
@@ -3,7 +3,7 @@
 
 --- sshd.8.orig	2010-08-04 21:03:13.000000000 -0600
 +++ sshd.8	2010-09-14 16:14:14.000000000 -0600
-@@ -70,7 +70,7 @@
+@@ -64,7 +64,7 @@
  .Nm
  listens for connections from clients.
  It is normally started at boot from
@@ -12,7 +12,7 @@
  It forks a new
  daemon for each incoming connection.
  The forked daemons handle
-@@ -384,8 +384,9 @@
+@@ -355,8 +355,9 @@
  If the login is on a tty, records login time.
  .It
  Checks
Index: security/openssh-portable/files/patch-uidswap.c
===================================================================
--- security/openssh-portable/files/patch-uidswap.c
+++ security/openssh-portable/files/patch-uidswap.c
@@ -34,7 +34,7 @@
  #include <errno.h>
  #include <pwd.h>
  #include <string.h>
-@@ -121,8 +124,20 @@ temporarily_use_uid(struct passwd *pw)
+@@ -121,8 +125,20 @@ temporarily_use_uid(struct passwd *pw)
  		fatal("setgroups: %.100s", strerror(errno));
  #ifndef SAVED_IDS_WORK_WITH_SETEUID
  	/* Propagate the privileged gid to all of our gids. */