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

          --- old/build/openssh/patches/0002-PAM-Support.patch
          +++ new/build/openssh/patches/0004-PAM-Support.patch
   1      -From 26f612877a2a9db59657a74d178079f92f01eb97 Mon Sep 17 00:00:00 2001
        1 +From c57262f2123c44f2e306df153d6a3be1558ba228 Mon Sep 17 00:00:00 2001
   2    2  From: oracle <solaris@oracle.com>
   3    3  Date: Mon, 3 Aug 2015 14:34:19 -0700
   4      -Subject: [PATCH 02/30] PAM Support
        4 +Subject: [PATCH 04/36] PAM Support
   5    5  
   6    6  #
   7    7  # To comply to the Solaris PAM policy, the UsePAM option is changed to be
   8    8  # always on and not configurable on Solaris.  This is for Solaris only, so we
   9    9  # will not contribute the changes to the upstream community.
  10   10  #
  11   11  
  12   12  *** orig/servconf.c     Mon Dec  5 17:23:03 2011
  13   13  ---
  14   14   servconf.c | 14 ++++++++++++++

  15   15   1 file changed, 14 insertions(+)
  16   16  
  17   17  diff --git a/servconf.c b/servconf.c
  18   18  index 6c7a91e..5e8ed97 100644
  19   19  --- a/servconf.c
  20   20  +++ b/servconf.c
  21   21  @@ -185,7 +185,12 @@ fill_default_server_options(ServerOptions *options)
  22   22   
  23   23          /* Portable-specific options */
  24   24          if (options->use_pam == -1)
  25   25  +#ifdef SET_USE_PAM
  26   26  +               /* use_pam should be always set to 1 on Solaris */
  27   27  +               options->use_pam = 1;
  28   28  +#else
  29   29                  options->use_pam = 0;
  30   30  +#endif
  31   31   
  32   32          /* Standard Options */
  33   33          if (options->protocol == SSH_PROTO_UNKNOWN)
  34   34  @@ -997,8 +1002,17 @@ process_server_config_line(ServerOptions *options, char *line,
  35   35          switch (opcode) {
  36   36          /* Portable-specific options */
  37   37          case sUsePAM:
  38   38  +#ifdef SET_USE_PAM
  39   39  +               /* UsePAM is always on and not configurable on Solaris */
  40   40  +               logit("%s line %d: ignoring UsePAM option value."
  41   41  +                   " This option is always on.", filename, linenum);
  42   42  +               while (arg)

  43   43  +                       arg = strdelim(&cp);
  44   44  +               break; 
  45   45  +#else
  46   46                  intptr = &options->use_pam;
  47   47                  goto parse_flag;
  48   48  +#endif
  49   49   
  50   50          /* Standard Options */
  51   51          case sBadOption:
  52   52  -- 
  53      -2.3.2 (Apple Git-55)
       53 +2.5.4 (Apple Git-61)
  54   54  
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX