--- a/components/openssh/patches/008-deprecate_sunssh_opt.patch Thu Jan 14 09:14:14 2016 +0100
+++ b/components/openssh/patches/008-deprecate_sunssh_opt.patch Mon Jan 25 10:57:40 2016 -0800
@@ -6,10 +6,26 @@
# changed from deprecated to supported. Since this is for Solaris only, we will
# not contribute back this change to the upstream community.
#
---- orig/readconf.c Fri May 23 09:56:00 2014
-+++ new/readconf.c Fri May 23 09:59:57 2014
-@@ -268,6 +268,25 @@
- { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
+diff -pur old/readconf.c new/readconf.c
+--- old/readconf.c
++++ new/readconf.c
+@@ -192,10 +192,14 @@ static struct {
+ { "afstokenpassing", oUnsupported },
+ #if defined(GSSAPI)
+ { "gssapiauthentication", oGssAuthentication },
++ { "gssauthentication", oGssAuthentication }, /* alias */
+ { "gssapidelegatecredentials", oGssDelegateCreds },
++ { "gssdelegatecreds", oGssDelegateCreds }, /* alias */
+ #else
+ { "gssapiauthentication", oUnsupported },
++ { "gssauthentication", oUnsupported },
+ { "gssapidelegatecredentials", oUnsupported },
++ { "gssdelegatecreds", oUnsupported },
+ #endif
+ { "fallbacktorsh", oDeprecated },
+ { "usersh", oDeprecated },
+@@ -279,6 +283,24 @@ static struct {
+ { "pubkeyacceptedkeytypes", oPubkeyAcceptedKeyTypes },
{ "ignoreunknown", oIgnoreUnknown },
+#ifdef DEPRECATE_SUNSSH_OPT
@@ -23,7 +39,6 @@
+ * smoother. If a deprecated SunSSH-only option is migrated to OpenSSH
+ * later, then it will be changed from deprecated to supported.
+ */
-+ { "gssapikeyexchange", oDeprecated },
+ { "kmfpolicydatabase", oDeprecated },
+ { "kmfpolicyname", oDeprecated },
+ { "trustedanchorkeystore", oDeprecated },