First stab at the full Joyent wad (still needs work!!!)

@@ -1,9 +1,9 @@
-From f31faf48842765bb3a9a5a9c400bf4613d639e94 Mon Sep 17 00:00:00 2001
+From 8aa9debff40660ed691f984b805e513f3f54334b Mon Sep 17 00:00:00 2001
 From: oracle <solaris@oracle.com>
 Date: Mon, 3 Aug 2015 14:36:19 -0700
-Subject: [PATCH 10/30] PAM enhancements for Solaris
+Subject: [PATCH 12/36] PAM enhancements for Solaris
 
 #
 # This patch contains a couple of PAM enhancements:
 #   1) Each SSHv2 userauth method has its own PAM service name so that PAM can
 #      be used to control what userauth methods are allowed.

@@ -580,11 +580,11 @@
 +        
         int     fingerprint_hash;
  }       ServerOptions;
  
 diff --git a/sshd.1m b/sshd.1m
-index 967a753..d67efd7 100644
+index ada4f25..3753f90 100644
 --- a/sshd.1m
 +++ b/sshd.1m
 @@ -944,6 +944,33 @@ concurrently for different ports, this contains the process ID of the one
  started last).
  The content of this file is not sensitive; it can be world-readable.

@@ -618,14 +618,14 @@
 +
  .Sh SEE ALSO
  .Xr scp 1 ,
  .Xr sftp 1 ,
 diff --git a/sshd.c b/sshd.c
-index 3df50f8..5a00ae2 100644
+index 84e1dee..7e519d4 100644
 --- a/sshd.c
 +++ b/sshd.c
-@@ -2159,6 +2159,11 @@ main(int ac, char **av)
+@@ -2165,6 +2165,11 @@ main(int ac, char **av)
  
         sshd_exchange_identification(sock_in, sock_out);
  
 +#ifdef PAM_ENHANCEMENT
 +       if (!compat20)

@@ -670,7 +670,7 @@
 +On Solaris, the option is always enabled.
  .It Cm UsePrivilegeSeparation
  Specifies whether
  .Xr sshd 1M
 -- 
-2.3.2 (Apple Git-55)
+2.5.4 (Apple Git-61)