--- a/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Wed Jun 17 14:55:22 2015 -0700
+++ b/components/openssh/patches/020-deprecate_sunssh_sshd_config_opts.patch	Thu Jun 18 07:01:42 2015 -0700
@@ -13,10 +13,10 @@
 # This is a Solaris specific change to ease the transition and will not be
 # offered upstream.
 #
-diff -ur old/servconf.c new/servconf.c
---- old/servconf.c	2014-10-29 07:27:34.549410967 -0700
-+++ new/servconf.c	2014-10-29 07:27:58.775996557 -0700
-@@ -516,6 +516,28 @@
+diff -pur old/servconf.c new/servconf.c
+--- old/servconf.c	2015-03-28 22:31:16.652020119 +0100
++++ new/servconf.c	2015-03-28 22:34:36.569887785 +0100
+@@ -557,6 +557,28 @@ static struct {
          { "pamserviceprefix", sPAMServicePrefix, SSHCFG_GLOBAL },
          { "pamservicename", sPAMServiceName, SSHCFG_GLOBAL },
  #endif
@@ -42,6 +42,6 @@
 +	{ "useunsupportedsshv1", sDeprecated, SSHCFG_GLOBAL },
 +	{ "usefips140", sDeprecated, SSHCFG_ALL},
 +#endif
- 	{ NULL, sBadOption, 0 }
- };
- 
+ 	{ "revokedkeys", sRevokedKeys, SSHCFG_ALL },
+ 	{ "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL },
+ 	{ "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL },