--- a/components/openssh/patches/008-deprecate_sunssh_opt.patch Thu Mar 27 12:02:39 2014 -0700
+++ b/components/openssh/patches/008-deprecate_sunssh_opt.patch Thu Mar 27 19:40:44 2014 -0700
@@ -6,32 +6,31 @@
# 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 Thu Nov 15 13:32:50 2012
-+++ new/readconf.c Wed Mar 27 14:51:55 2013
-@@ -246,7 +246,26 @@
- { "kexalgorithms", oKexAlgorithms },
- { "ipqos", oIPQoS },
- { "requesttty", oRequestTTY },
+--- orig/readconf.c Wed Feb 5 17:16:20 2014
++++ new/readconf.c Fri Mar 14 09:52:42 2014
+@@ -267,7 +267,25 @@
+ { "canonicalizemaxdots", oCanonicalizeMaxDots },
+ { "canonicalizepermittedcnames", oCanonicalizePermittedCNAMEs },
+ { "ignoreunknown", oIgnoreUnknown },
-
+#ifdef DEPRECATE_SUNSSH_OPT
-+ /*
-+ * On Solaris, to make the transition from SunSSH to OpenSSH as smooth
-+ * as possible, we will deprecate SunSSH-only options in OpenSSH.
-+ * Therefore, on a system that is running OpenSSH with a deprecated
-+ * option from the user's config file (~/.ssh/config), the ssh
-+ * connection will proceed without the deprecated option. Note that
-+ * this is an interim enhancement to OpenSSH to make the transition
-+ * smoother. If a deprecated SunSSH-only option is migrated to OpenSSH
-+ * later, then it will be changed from deprecated to supported.
-+ */
-+ { "disablebanner", oDeprecated },
-+ { "gssapikeyexchange", oDeprecated },
-+ { "ignoreifunknown", oDeprecated },
-+ { "kmfpolicydatabase", oDeprecated },
-+ { "kmfpolicyname", oDeprecated },
-+ { "trustedanchorkeystore", oDeprecated },
-+ { "usefips140", oDeprecated },
-+ { "useopensslengine", oDeprecated },
++ /*
++ * On Solaris, to make the transition from SunSSH to OpenSSH as smooth
++ * as possible, we will deprecate SunSSH-only options in OpenSSH.
++ * Therefore, on a system that is running OpenSSH with a deprecated
++ * option from the user's config file (~/.ssh/config), the ssh
++ * connection will proceed without the deprecated option. Note that
++ * this is an interim enhancement to OpenSSH to make the transition
++ * smoother. If a deprecated SunSSH-only option is migrated to OpenSSH
++ * later, then it will be changed from deprecated to supported.
++ */
++ { "disablebanner", oDeprecated },
++ { "gssapikeyexchange", oDeprecated },
++ { "kmfpolicydatabase", oDeprecated },
++ { "kmfpolicyname", oDeprecated },
++ { "trustedanchorkeystore", oDeprecated },
++ { "usefips140", oDeprecated },
++ { "useopensslengine", oDeprecated },
+#endif
{ NULL, oBadOption }
};