--- a/components/openssh/Makefile	Fri Aug 07 07:58:06 2015 -0700
+++ b/components/openssh/Makefile	Mon Aug 03 15:31:47 2015 -0700
@@ -76,6 +76,7 @@
 CONFIGURE_OPTIONS += --with-solaris-projects
 CONFIGURE_OPTIONS += --with-tcp-wrappers
 CONFIGURE_OPTIONS += --with-4in6
+CONFIGURE_OPTIONS += --with-xauth=/usr/bin/xauth
 CONFIGURE_OPTIONS += --enable-strip=no
 CONFIGURE_OPTIONS += --without-rpath
 CONFIGURE_OPTIONS += --libexecdir=/usr/lib/ssh

--- a/components/openssh/openssh.p5m	Fri Aug 07 07:58:06 2015 -0700
+++ b/components/openssh/openssh.p5m	Mon Aug 03 15:31:47 2015 -0700
@@ -129,4 +129,6 @@
 user username=sshd ftpuser=false gcos-field="sshd privsep" group=sshd \
     home-dir=/var/empty login-shell=/bin/false uid=22
 license openssh.license license="BSD, BSD-like"
+depend type=conditional fmri=pkg:/x11/session/xauth \
+    predicate=pkg:/x11/library/libxau
 depend type=require fmri=service/network/ssh-common

--- a/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Fri Aug 07 07:58:06 2015 -0700
+++ b/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Mon Aug 03 15:31:47 2015 -0700
@@ -20,7 +20,7 @@
  /* $OpenBSD: servconf.c,v 1.248 2013/12/06 13:39:49 markus Exp $ */
  /*
   * Copyright (c) 1995 Tatu Ylonen <[email protected]>, Espoo, Finland
[email protected]@ -528,6 +527,29 @@
[email protected]@ -528,6 +527,30 @@
          { "pamserviceprefix", sPAMServicePrefix, SSHCFG_GLOBAL },
          { "pamservicename", sPAMServiceName, SSHCFG_GLOBAL },
  #endif
@@ -45,6 +45,7 @@
 +	{ "trustedanchorkeystore", sDeprecated, SSHCFG_GLOBAL },
 +	{ "useunsupportedsshv1", sDeprecated, SSHCFG_GLOBAL },
 +	{ "usefips140", sDeprecated, SSHCFG_ALL},
++	{ "gssapistoredelegatedcredentials", sDeprecated, SSHCFG_ALL },
 +	{ "gssapikeyexchange", sDeprecated, SSHCFG_ALL},
 +#endif
  	{ NULL, sBadOption, 0 }