--- a/components/tcl/expect/Makefile	Wed Feb 17 22:18:42 2016 -0800
+++ b/components/tcl/expect/Makefile	Thu Feb 18 18:29:18 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../../make-rules/shared-macros.mk
@@ -44,6 +44,7 @@
 SCRIPTS = timed-run timed-read ftp-rfc autopasswd lpunlock weather \
           passmass rftp kibitz rlogin-cwd xpstat tkpasswd dislocate xkibitz \
           tknewsbiff unbuffer mkpasswd cryptdir decryptdir autoexpect multixterm
+COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv); 
 
 COMPONENT_PRE_CONFIGURE_ACTION = \
 	($(CLONEY) $(SOURCE_DIR) $(@D))

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tcl/expect/patches/openpty.patch	Thu Feb 18 18:29:18 2016 -0800
@@ -0,0 +1,18 @@
+Patch to disable openpty function in expect.
+This bug originated in-house. This is a temporary
+fix until 22706805 is fixed and expect is modified
+to use openpty correctly on Solaris and thus
+will not be submitted upstream. (see bug 22742744)
+
+
+--- expect5.45/configure.in.orig	2010-08-27 14:51:53.000000000 -0700
++++ expect5.45/configure.in	2016-02-17 17:25:12.678863161 -0800
+@@ -207,7 +207,7 @@
+ 
+ ######################################################################
+ # Check for FreeBSD/NetBSD openpty()
+-unset ac_cv_func_openpty
++ac_cv_func_openpty=no
+ 
+ AC_CHECK_FUNC(openpty, AC_DEFINE(HAVE_OPENPTY) openpty=1 , openpty=0)
+ if test $openpty -eq 0 ; then