--- a/components/open-fabrics/ibutils/patches/base.patch Tue Jan 20 05:18:57 2015 -0800
+++ b/components/open-fabrics/ibutils/patches/base.patch Fri Jan 23 08:29:14 2015 -0800
@@ -1,3 +1,6 @@
+# This patch was developed in-house. Since it is Solaris-specific,
+# it is not suitable for upstream.
+#
diff -r -u /tmp/ibutils-1.5.7/config/osm.m4 ibutils-1.5.7/config/osm.m4
--- /tmp/ibutils-1.5.7/config/osm.m4 Thu Feb 18 03:31:34 2010
+++ ibutils-1.5.7/config/osm.m4 Thu Feb 24 16:51:16 2011
@@ -210,7 +213,7 @@
INSTALL_HEADER = $(INSTALL_DATA)
diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl ibutils-1.5.7/ibdiag/src/ibdebug.tcl
--- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl Tue Mar 8 03:08:02 2011
-+++ ibutils-1.5.7/ibdiag/src/ibdebug.tcl Thu Jun 27 22:46:57 2013
++++ ibutils-1.5.7/ibdiag/src/ibdebug.tcl Wed Apr 16 17:45:12 2014
@@ -352,13 +352,16 @@
if {[file exists $ibisOutDir/$ibisLogFile] && (![file writable $ibisOutDir/$ibisLogFile])} {
set ibisLogFile $ibisLogFile.[pid]
@@ -253,7 +256,7 @@
foreach {array_name data} {G data* Neighbor *} {
diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl
--- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl Thu Oct 7 07:29:56 2010
-+++ ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl Wed Jun 19 07:43:17 2013
++++ ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl Wed Apr 16 17:45:12 2014
@@ -675,6 +675,16 @@
}
@@ -947,6 +950,18 @@
#define CR_CLASS 0x09
#define CR_ATTR_50 0x50
+diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibis_base.h ibutils-1.5.7/ibis/src/ibis_base.h
+--- /tmp/ibutils-1.5.7/ibis/src/ibis_base.h Wed Feb 24 02:09:25 2010
++++ ibutils-1.5.7/ibis/src/ibis_base.h Wed Apr 9 10:54:26 2014
+@@ -64,7 +64,7 @@
+ #define IBIS_FILE_PATH_MAX PATH_MAX
+ #endif
+
+-#define MAX_LOCAL_IBPORTS 32
++#define MAX_LOCAL_IBPORTS MAX_PORTS
+ #define DISP_HANDLE_MAX 32
+
+ END_C_DECLS
diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c ibutils-1.5.7/ibis/src/ibis_wrap.c
--- /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Nov 1 16:03:44 2010
+++ ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Jun 6 15:35:52 2011
@@ -1366,7 +1381,7 @@
OSM_CLFAGS=disabled
diff -r -u /tmp/ibutils-1.5.7/Makefile.in ibutils-1.5.7/Makefile.in
--- /tmp/ibutils-1.5.7/Makefile.in Tue Mar 8 03:09:29 2011
-+++ ibutils-1.5.7/Makefile.in Thu Mar 10 18:33:24 2011
++++ ibutils-1.5.7/Makefile.in Thu Dec 12 15:36:52 2013
@@ -54,7 +54,7 @@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -1378,7 +1393,7 @@
INSTALL_HEADER = $(INSTALL_DATA)
diff -r -u /tmp/ibutils-1.5.7/configure ibutils-1.5.7/configure
--- /tmp/ibutils-1.5.7/configure Tue Mar 8 03:09:29 2011
-+++ ibutils-1.5.7/configure Thu Mar 10 18:33:24 2011
++++ ibutils-1.5.7/configure Thu Dec 12 16:51:11 2013
@@ -1824,7 +1824,7 @@
test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'