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

@@ -1,9 +1,9 @@
-From 71e2185a3a2301f08c845a9cb884280dcb0d2cff Mon Sep 17 00:00:00 2001
+From 4836dba2499f4c161ea7f18bb35535c366a4cdec Mon Sep 17 00:00:00 2001
 From: oracle <solaris@oracle.com>
 Date: Mon, 3 Aug 2015 14:36:13 -0700
-Subject: [PATCH 09/30] PAM conversation fix
+Subject: [PATCH 11/36] PAM conversation fix
 
 #
 # This patch contains an important bug fix for the PAM password userauth
 # conversation function. This bug fix was contributed back to the upstream in
 # 2009, but it was not accepted by the upstream.  For more information, see

@@ -98,7 +98,7 @@
 +
         if (sshpam_err == PAM_SUCCESS && authctxt->valid) {
                 debug("PAM: password authentication accepted for %.100s",
                     authctxt->user);
 -- 
-2.3.2 (Apple Git-55)
+2.5.4 (Apple Git-61)