Index: security/openssh-portable/files/patch-sshd_config
===================================================================
--- security/openssh-portable/files/patch-sshd_config
+++ security/openssh-portable/files/patch-sshd_config
@@ -21,13 +21,3 @@
 +#AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2
  
  #AuthorizedPrincipalsFile none
- 
-@@ -84,7 +88,7 @@ AuthorizedKeysFile	.ssh/authorized_keys
- #AllowAgentForwarding yes
- #AllowTcpForwarding yes
- #GatewayPorts no
--#X11Forwarding no
-+#X11Forwarding yes
- #X11DisplayOffset 10
- #X11UseLocalhost yes
- #PermitTTY yes
Index: security/openssh-portable/files/patch-sshd_config.5
===================================================================
--- security/openssh-portable/files/patch-sshd_config.5
+++ security/openssh-portable/files/patch-sshd_config.5
@@ -1,6 +1,6 @@
 --- sshd_config.5.orig	2022-02-11 18:50:00.822679000 +0000
 +++ sshd_config.5	2022-02-11 19:09:05.162504000 +0000
-@@ -701,7 +701,9 @@
+@@ -789,7 +789,9 @@
  .Qq ssh -Q HostbasedAcceptedAlgorithms .
  This was formerly named HostbasedAcceptedKeyTypes.
  .It Cm HostbasedAuthentication
@@ -11,7 +11,7 @@
  with successful public key client host authentication is allowed
  (host-based authentication).
  The default is
-@@ -1416,6 +1434,15 @@
+@@ -1535,6 +1537,15 @@
  .Cm ethernet .
  The default is
  .Cm no .
@@ -27,7 +27,7 @@
  .Pp
  Independent of this setting, the permissions of the selected
  .Xr tun 4
-@@ -1774,12 +1801,19 @@
+@@ -2062,12 +2073,19 @@
  .Xr sshd 8
  as a non-root user.
  The default is
@@ -48,12 +48,3 @@
  .It Cm X11DisplayOffset
  Specifies the first display number available for
  .Xr sshd 8 Ns 's
-@@ -1793,7 +1827,7 @@
- or
- .Cm no .
- The default is
--.Cm no .
-+.Cm yes .
- .Pp
- When X11 forwarding is enabled, there may be additional exposure to
- the server and to client displays if the