6978267 Integration of ipmitool 1.8.11
7104935 ipmitool: need to integrate bmc interface for sparc platform
7104933 ipmitool: need to integrate with open interface
7052161 ipmitool dumping core
--- a/components/ipmitool/Makefile Thu Nov 17 16:59:01 2011 -0800
+++ b/components/ipmitool/Makefile Mon Nov 21 16:45:38 2011 -0800
@@ -26,25 +26,24 @@
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= ipmitool
-COMPONENT_VERSION= 1.8.10
+COMPONENT_VERSION= 1.8.11
COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_PROJECT_URL= http://ipmitool.sourceforge.net
COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha1:61605c1f11b74b0f6ff0ba4d019cd8d2e1bdc2c4
-COMPONENT_ARCHIVE_URL= http://cdnetworks-us-2.dl.sourceforge.net/sourceforge/ipmitool/$(COMPONENT_ARCHIVE)
+COMPONENT_ARCHIVE_HASH= sha1:4cb6ff3736fd3e166abc5303d6373672327a5db1
+COMPONENT_ARCHIVE_URL= http://sourceforge.net/projects/ipmitool/files/ipmitool/1.8.11/$(COMPONENT_ARCHIVE)
include ../../make-rules/prep.mk
include ../../make-rules/configure.mk
include ../../make-rules/ips.mk
-# The version of libtool in the source archive causes the build to fail to
-# link in src/plugins/lan. The bundled vesion works fine.
-COMPONENT_PREP_ACTION=(cd $(@D) ; libtoolize -f)
+COMPONENT_PREP_ACTION= (cd $(@D); $(TOUCH) NEWS; $(AUTORECONF) -f -i)
COMPILER=gcc
CONFIGURE_OPTIONS += --prefix=/usr/sfw
CONFIGURE_OPTIONS += --enable-intf-free=no
+CONFIGURE_OPTIONS += --enable-solaris-opt
CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)"
--- a/components/ipmitool/ipmievd.8 Thu Nov 17 16:59:01 2011 -0800
+++ b/components/ipmitool/ipmievd.8 Mon Nov 21 16:45:38 2011 -0800
@@ -24,19 +24,36 @@
.\"
.\" ipmievd man page
.\"
-.TH "ipmievd" "8" "29 November 2006"
+.TH "ipmievd" "8" "07 November 2011"
.SH "NAME"
ipmievd \- IPMI event daemon for sending events to syslog
.SH "SYNOPSIS"
-.B ipmievd
-[\-chvV] \-I lan \-H hostname [ \-p <port>] [\-U <username>] [ \-f <password_file>] [\-S <sdrcache>] sel [<option>]
+ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-d \fIN\fP\fR|\fB\-v\fR|\fB\-V\fR]
+\fB\-I\fR \fIopen\fP <\fIopen\fR | \fIsel\fR> [<\fIoption\fP>]
+
+Note: Use -I open on linux, use -I bmc on solaris
-.B ipmievd
-[\-chvV] \-I lanplus \-H hostname [\-p <port>] [\-U <username>] [\-f <password_file>] [\-S <sdrcache>] sel [<option>]
+ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-v\fR|\fB\-V\fR]
+\fB\-I\fR \fIlan\fP \fB\-H\fR <\fIhostname\fP>
+ [\fB\-p\fR <\fIport\fP>]
+ [\fB\-U\fR <\fIusername\fP>]
+ [\fB\-A\fR <\fIauthtype\fP>]
+ [\fB\-L\fR <\fIprivlvl\fP>]
+ [\fB\-a\fR|\fB\-E\fR|\fB\-P\fR|\fB\-f\fR <\fIpassword\fP>]
+ [\fB\-o\fR <\fIoemtype\fP>]
+ [\fB\-O\fR <\fIsel oem\fP>]
+ \fIsel\fP [<\fIoption\fP>]
-.B ipmievd
-[\-chvV] \-I bmc [\-S <sdrcache>] sel [<option>]
-
+ipmievd [\fB\-c\fR|\fB\-h\fR|\fB\-v\fR|\fB\-V\fR]
+\fB\-I\fR \fIlanplus\fP \fB\-H\fR <\fIhostname\fP>
+ [\fB\-p\fR <\fIport\fP>]
+ [\fB\-U\fR <\fIusername\fP>]
+ [\fB\-L\fR <\fIprivlvl\fP>]
+ [\fB\-a\fR|\fB\-E\fR|\fB\-P\fR|\fB\-f\fR <\fIpassword\fP>]
+ [\fB\-o\fR <\fIoemtype\fP>]
+ [\fB\-O\fR <\fIsel oem\fP>]
+ [\fB\-C\fR <\fIciphersuite\fP>]
+ \fIsel\fR [<\fIoption\fP>]
.SH "DESCRIPTION"
\fBipmievd\fP is a daemon that listens for events from the
Baseboard Management Controller (BMC) which are being sent to the
@@ -55,9 +72,26 @@
interfaces.
.SH "OPTIONS"
.TP
+\fB\-a\fR
+Prompt for the remote server password.
+.TP
+\fB\-A\fR <\fIauthtype\fP>
+Specify an authentication type to use during IPMIv1.5 \fIlan\fP
+session activation. Supported types are NONE, PASSWORD, MD2, MD5, or OEM.
+.TP
.B \-c
Present output in comma separated variable (CSV) format.
-.TP
+.TP
+\fB\-C\fR <\fIciphersuite\fP>
+The remote server authentication, integrity, and encryption algorithms
+to use for IPMIv2 \fIlanplus\fP connections. See table 22\-19 in the
+IPMIv2 specification. The default is 3 which specifies RAKP\-HMAC\-SHA1
+authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorightms.
+.TP
+\fB\-E\fR
+The remote server password is specified by the environment
+variable \fIIPMI_PASSWORD\fP.
+.TP
.BI \-f " password_file"
Specify a file containing the remote server password. If this
option is absent, or if password_file is empty, the password
@@ -90,24 +124,57 @@
.TS
tab(+);
-l l .
bmc+IPMI v2.0 BMC interface [default]
lan+IPMI v1.5 LAN Interface
lanplus+IPMI v2.0 RMCP+ LAN Interface
.TE
.TP
+\fB\-L\fR <\fIprivlvl\fP>
+Force session privilege level. Can be CALLBACK, USER,
+OPERATOR, ADMIN. Default is ADMIN.
+.TP
+\fB\-m\fR <\fIlocal_address\fP>
+Set the local IPMB address. The default is 0x20 and there
+should be no need to change it for normal operation.
+.TP
+\fB\-o\fR <\fIoemtype\fP>
+Select OEM type to support. This usually involves minor hacks
+in place in the code to work around quirks in various BMCs from
+various manufacturers. Use \fI\-o list\fP to see a list of
+current supported OEM types.
+.TP
+\fB\-O\fR <\fIsel oem\fP>
+Open selected file and read OEM SEL event descriptions to be used
+during SEL listings. See examples in contrib dir for file format.
+.TP
.BI \-p " port"
Remote server UDP port to connect to (default is 623).
.TP
+\fB\-P\fR <\fIpassword\fP>
+Remote server password is specified on the command line.
+If supported it will be obscured in the process list.
+\fBNote!\fR Specifying the password as a command line
+option is not recommended.
+.TP
.BI \-S " sdrcache"
Use local file for remote Sensor Data Repository (SDR) cache.
Using a local SDR cache can drastically increase performance
for commands that require knowledge of the entire SDR to perform
their function.
.TP
+\fB\-t\fR <\fItarget_address\fP>
+Bridge IPMI requests to the remote target address.
+.TP
\.BI \-U " username"
Remote server username; default is NULL user.
.TP
+\fB\-d \fIN\fP\fR
+Use device number N to specify the /dev/ipmiN (or
+/dev/ipmi/N or /dev/ipmidev/N) device to use for in-band
+BMC communication. Used to target a specific BMC on a
+multi-node, multi-BMC system through the ipmi device
+driver interface. Default is 0.
+.TP
.B \-v
Increase verbose output level. This option can be specified
multiple times to increase the level of debug output. If given
@@ -122,7 +189,7 @@
This can be used to get command\-line help. It can also be
placed at the end of commands to get option usage help.
-> ipmievd bmc help
+> ipmievd help
.br
Commands:
sel Poll SEL for notification of events
--- a/components/ipmitool/ipmitool.1m Thu Nov 17 16:59:01 2011 -0800
+++ b/components/ipmitool/ipmitool.1m Mon Nov 21 16:45:38 2011 -0800
@@ -21,19 +21,37 @@
.\"
.\" Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
.\"
-.TH ipmitool 1m "10 December 2008"
+.TH ipmitool 1m "07 November 2011"
.SH NAME
ipmitool \- utility for controlling IPMI\-enabled devices
-.SH SYNOPSIS
-.B ipmitool
-[\-chvV] \-I lan \-H hostname [\-p <port>] [\-U <username>] [\-f <password_file>] [\-S <sdrcache>] <command>
+.SH "SYNOPSIS"
+ipmitool [\-c|\-h|\-d N|\-v|\-V] \-I bmc [-S <sdrcache>] <command>
-.B ipmitool
-[\-chvV] \-I lanplus \-H hostname [\-p <port>] [\-U <username>] [\-f <password_file>] [\-S <sdrcache>] <command>
+ipmitool [\-c|\-h|\-v|\-V]
+\-I lan \-H <hostname>
+ [\-p <port>]
+ [\-U <username>]
+ [\-A <authtype>]
+ [\-L <privlvl>]
+ [\-a|\-E|\-P|\-f <password>]
+ [\-o <oemtype>]
+ [\-O <sel oem>]
+ [\-e <esc_char>]
+ <command>
-.B ipmitool
-[\-chvV] \-I bmc [\-S <sdrcache>] <command>
-
+ipmitool [\-c|\-h|\-v|\-V]
+\-I lanplus \-H <hostname>
+ [\-p <port>]
+ [\-U <username>]
+ [\-L <privlvl>]
+ [\-a|\-E|\-P|\-f <password>]
+ [\-o <oemtype>]
+ [\-O <sel oem>]
+ [\-C <ciphersuite>]
+ [\-K|\-k <kg_key>]
+ [\-y <hex_kg_key>]
+ [\-e <esc_char>]
+ <command>
.SH DESCRIPTION
This program lets you manage Intelligent Platform Management Interface
(IPMI) functions of either the local system, via a kernel device driver,
@@ -63,10 +81,43 @@
on the local station.
.SH OPTIONS
-.TP
+.TP
+\-a
+Prompt for the remote server password.
+.TP
+\-A <authtype>
+Specify an authentication type to use during IPMIv1.5 lan
+session activation. Supported types are NONE, PASSWORD, MD2, MD5, or OEM.
+.TP
\-c
-Present output in CSV (comma separated variable) format.
-.TP
+Present output in CSV (comma separated variable) format.
+This is not available with all commands.
+.TP
+\-e <sol_escape_char>
+Use supplied character for SOL session escape character. The default
+is to use ~ but this can conflict with ssh sessions.
+.TP
+\-k <key>
+Use supplied Kg key for IPMIv2 authentication. The default is not to
+use any Kg key.
+.TP
+\-y <hex key>
+Use supplied Kg key for IPMIv2 authentication. The key is expected in
+hexadecimal format and can be used to specify keys with non-printable
+characters. E.g. '-k PASSWORD' and '-y 50415353574F5244' are
+equivalent.
+The default is not to use any Kg key.
+.TP
+\-C <ciphersuite>
+The remote server authentication, integrity, and encryption algorithms
+to use for IPMIv2 lanplus connections. See table 22\-19 in the
+IPMIv2 specification. The default is 3 which specifies RAKP\-HMAC\-SHA1
+authentication, HMAC\-SHA1\-96 integrity, and AES\-CBC\-128 encryption algorightms.
+.TP
+\-E
+The remote server password is specified by the environment
+variable IPMI_PASSWORD.
+.TP
\-f <password_file>
Specifies a file containing the remote server password. If this
option is absent, or if password_file is empty, the password
@@ -82,47 +133,86 @@
For IPMI v2.0, the maximum password length is 20 characters;
longer passwords are truncated.
The longer password length is supported by the lanplus interface.
-.TP
+.TP
\-h
Get basic usage help from the command line.
-.TP
-\-H <hostname>
-Remote server address, can be IP address or hostname.
-This option is required for the LAN interface connection.
-.TP
+.TP
+\-H <address>
+Remote server address, can be IP address or hostname. This
+option is required for lan and lanplus interfaces.
+.TP
\-I <interface>
-Selects IPMI interface to use. Possible interfaces are
-lan, lanplus or bmc.
-.TP
-\-p <port>
-Selects remote port (default is 623).
+Selects IPMI interface to use. Supported interfaces that are
+compiled in are visible in the usage help output.
+.TP
+\-L <privlvl>
+Force session privilege level. Can be CALLBACK, USER,
+OPERATOR, ADMINISTRATOR. Default is ADMINISTRATOR.
+.TP
+\-m <local_address>
+Set the local IPMB address. The default is 0x20 and there
+should be no need to change it for normal operation.
+.TP
+\-o <oemtype>
+Select OEM type to support. This usually involves minor hacks
+in place in the code to work around quirks in various BMCs from
+various manufacturers. Use \-o list to see a list of
+current supported OEM types.
+.TP
+\-O <sel oem>
+Open selected file and read OEM SEL event descriptions to be used
+during SEL listings. See examples in contrib dir for file format.
.TP
-\-S <sdrcache>
-Uses Sensor Data Repository information from the file
-<sdrcache> to dramatically speed up the `sdr' and
-`sel elist' commands. This file is typically created
-with the `sdr dump <sdrcache>' command.
-.TP
+\-p <port>
+Remote server UDP port to connect to. Default is 623.
+.TP
+\-P <password>
+Remote server password is specified on the command line.
+If supported it will be obscured in the process list.
+Note! Specifying the password as a command line
+option is not recommended.
+.TP
+\-S <sdr_cache_file>
+Use Sensor Data Repository information from local file
+<sdr_cache_file> for remote SDR cache. Using a local SDR cache
+can drastically increase performance for commands that require
+knowledge of the entire SDR to perform their function. Local
+SDR cache from a remote system can be created with the
+`sdr dump <sdr_cache_file>` command.
+.TP
+\-t <target_address>
+Bridge IPMI requests to the remote target address.
+.TP
\-U <username>
-Remote username, default is NULL user.
+Remote server username, default is NULL user.
.TP
+\-d N
+Use device number N to specify the /dev/ipmiN (or
+/dev/ipmi/N or /dev/ipmidev/N) device to use for in-band
+BMC communication. Used to target a specific BMC on a
+multi-node, multi-BMC system through the ipmi device
+driver interface. Default is 0.
+.TP
\-v
-Increase verbose output level. This option may be
-specified multiple times to increase the level of debug
-output. If given three times you will get hexdumps of
-all incoming and outgoing packets.
-.TP
+Increase verbose output level. This option may be specified
+multiple times to increase the level of debug output. If given
+three times you will get hexdumps of all incoming and
+outgoing packets.
+.TP
\-V
Display version information.
-
+.LP
+If no password method is specified then ipmitool will prompt the
+user for a password. If no password is entered at the prompt,
+the remote server password will default to NULL.
.SH COMMANDS
.TP
help This can be used to get command\-line help on ipmitool
commands. It may also be placed at the end of commands
to get option usage help.
-ipmitool \-I bmc help
+ipmitool help
.br
Commands:
raw Send a RAW IPMI request and print
@@ -146,8 +236,11 @@
sel Print System Event Log (SEL)
pef Configure Platform Event Filtering
(PEF)
- sol Configure IPMIv2.0 Serial-over-LAN
- isol Configure IPMIv1.5 Serial-over-LAN
+ sol Configure IPMIv2.0 Serial\-over\-LAN
+ tsol Configure and connect Tyan
+ IPMIv1.5 Serial\-over\-LAN
+ isol Configure and connect Intel
+ IPMIv1.5 Serial\-over\-LAN
user Configure Management Controller
users
channel Configure Management Controller
@@ -164,11 +257,11 @@
ekanalyzer Run FRU-Ekeying analyzer using FRU
files
-ipmitool \-I bmc chassis help
+ipmitool chassis help
.br
Chassis Commands: status, power, identify, policy, restart_cause, poh, bootdev, bootparam, selftest
-ipmitool \-I bmc chassis power help
+ipmitool chassis power help
.br
chassis power Commands: status, on, off, cycle, reset, diag, soft
.TP
@@ -1756,10 +1849,11 @@
the specified channel. If no channel is given, it will display
SOL configuration data for the currently used channel.
.TP
-payload <enable | disable> <channel> <userid>
+payload <enable | disable | status> <channel> <userid>
.br
-Enable or disable SOL payload for the user on the specified channel.
+Enable, disable or show status of SOL payload for the user on the
+specified channel.
.TP
set <parameter> <value> [channel]
.br
--- a/components/ipmitool/ipmitool.license Thu Nov 17 16:59:01 2011 -0800
+++ b/components/ipmitool/ipmitool.license Mon Nov 21 16:45:38 2011 -0800
@@ -1,3 +1,30 @@
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+----------------
+ipmitool v1.8.11
+----------------
+Oracle Internal Tracking Number 4179
+
+Copyright (C) 1999, 2000, 2002 Aladdin Enterprises. All rights reserved.
+Copyright (C) 1999, 2002 Aladdin Enterprises. All rights reserved.
+Copyright (c) 2000 Red Hat Software, Inc.
+Copyright (c) 2002, Intel Corporation
+Copyright (c) 2003-2004 Fredrik Ohrn. All Rights Reserved.
+Copyright (c) 2003, 2004 Sun Microsystems, Inc. All Rights Reserved.
+Copyright (c) 2003 Fredrik Ohrn. All Rights Reserved.
+Copyright (c) 2003 Kontron Canada, Inc. All Rights Reserved.
+Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
+Copyright (c) 2004 Dell Computers. All Rights Reserved.
+Copyright (c) 2004 Kontron Canada, Inc. All Rights Reserved.
+Copyright (c) 2004 Sun Microsystems, Inc. All Rights Reserved.
+Copyright (c) 2005 International Business Machines, Inc. All Rights Reserved.
+Copyright (c) 2005 Sun Microsystems, Inc. All Rights Reserved.
+Copyright (c) 2005 Tyan Computer Corp. All Rights Reserved.
+Copyright (c) 2006 Kontron Canada, Inc. All Rights Reserved.
+Copyright (c) 2007 Kontron Canada, Inc. All Rights Reserved.
+Copyright (c) Kontron. All right reserved
+
Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved.
Redistribution and use in source and binary forms, with or without
@@ -20,11 +47,10 @@
INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
-FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
-OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL
-SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
-OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
-PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
-LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
-EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
+FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING OR
+DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL SUN OR
+ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR DIRECT,
+INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER
+CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF THE USE OF
+OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ipmitool/patches/7052161.patch Mon Nov 21 16:45:38 2011 -0800
@@ -0,0 +1,31 @@
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
+
+--- ipmitool-1.8.11.old/lib/ipmi_fru.c Wed Feb 25 12:38:52 2009
++++ ipmitool-1.8.11/lib/ipmi_fru.c Thu Oct 27 12:28:57 2011
[email protected]@ -1310,12 +1310,20 @@
+ printf (" Peak capacity holdup : %d s\n",
+ peak_hold_up_time);
+ if (ps->combined_capacity == 0)
+- printf (" Combined capacity : not specified\n");
+- else
+- printf (" Combined capacity : %d W (%s and %s)\n",
+- ps->combined_capacity,
+- combined_voltage_desc [ps->combined_voltage1],
+- combined_voltage_desc [ps->combined_voltage2]);
++ printf (" Combined capacity : not specified\n");
++ else {
++ if ((ps->combined_voltage1 <
++ sizeof(combined_voltage_desc)/sizeof(char *)) &&
++ (ps->combined_voltage2 <
++ sizeof(combined_voltage_desc)/sizeof(char *)))
++ printf (" Combined capacity : %d W (%s and %s)\n",
++ ps->combined_capacity,
++ combined_voltage_desc [ps->combined_voltage1],
++ combined_voltage_desc [ps->combined_voltage2]);
++ else
++ printf (" Combined capacity : %d W (voltages not specified correctly)\n",
++ ps->combined_capacity);
++ }
+ if (ps->predictive_fail)
+ printf (" Fan lower threshold : %d RPS\n",
+ ps->rps_threshold);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ipmitool/patches/enable.sparc.patch Mon Nov 21 16:45:38 2011 -0800
@@ -0,0 +1,18 @@
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
+
+--- ipmitool-1.8.11.old/configure.in Thu Aug 7 11:26:08 2008
++++ ipmitool-1.8.11/configure.in Tue Oct 25 11:48:31 2011
[email protected]@ -63,12 +63,7 @@
+ # openssl libs are in /usr/sfw/lib on solaris 10
+ LIBS="$LIBS -R/usr/sfw/lib"
+ # disable the linux-specific interfaces
+- # and bmc on SPARC (there is no bmc driver for SPARC)
+- if [[ `mach -p` = sparc ]]; then
+- enable_intf_bmc=no
+- else
+- enable_intf_bmc=yes
+- fi
++ enable_intf_bmc=yes
+ enable_intf_imb=no
+ enable_intf_open=no
+ enable_intf_lipmi=no
--- a/components/ipmitool/patches/ipmievd.local4.patch Thu Nov 17 16:59:01 2011 -0800
+++ b/components/ipmitool/patches/ipmievd.local4.patch Mon Nov 21 16:45:38 2011 -0800
@@ -1,3 +1,5 @@
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
+
--- ipmitool-1.8.10/lib/log.c.orig Fri Nov 21 13:00:00 2008
+++ ipmitool-1.8.10/lib/log.c Fri Nov 21 13:02:00 2008
@@ -120,7 +120,7 @@
--- a/components/ipmitool/patches/ipmitool.scanning.patch Thu Nov 17 16:59:01 2011 -0800
+++ b/components/ipmitool/patches/ipmitool.scanning.patch Mon Nov 21 16:45:38 2011 -0800
@@ -1,3 +1,5 @@
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
+
--- ipmitool-1.8.10/lib/ipmi_sdr.c.orig Fri Nov 21 13:00:00 2008
+++ ipmitool-1.8.10/lib/ipmi_sdr.c Fri Nov 21 13:01:00 2008
@@ -1760,7 +1760,8 @@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/ipmitool/patches/openipmi.patch Mon Nov 21 16:45:38 2011 -0800
@@ -0,0 +1,50 @@
+Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
+
+--- ipmitool-1.8.11.old/configure.in Tue Oct 25 12:43:52 2011
++++ ipmitool-1.8.11/configure.in Tue Oct 25 12:46:49 2011
[email protected]@ -65,7 +65,7 @@
+ # disable the linux-specific interfaces
+ enable_intf_bmc=yes
+ enable_intf_imb=no
+- enable_intf_open=no
++ enable_intf_open=yes
+ enable_intf_lipmi=no
+ enable_ipmishell=no
+ enable_all_options=no
[email protected]@ -219,6 +219,10 @@
+ [Define to 1 if you have the <sys/ipmi.h> header file.])],
+ [echo "** Unable to find OpenIPMI header files. Using internal version."])])
+
++AC_CHECK_HEADER([sys/ioccom.h],
++ [AC_DEFINE(HAVE_IOCCOM_H, [1],
++ [Define to 1 if you have the <sys/ioccom.h> header file.])])
++
+ dnl look for FreeIPMI files
+ AC_CHECK_LIB(freeipmi, ipmi_open_inband, [have_free=yes], [have_free=no])
+ if test "x$have_free" != "xyes"; then
+--- ipmitool-1.8.11.old/src/ipmievd.c Wed Feb 25 12:38:52 2009
++++ ipmitool-1.8.11/src/ipmievd.c Fri Oct 21 16:41:54 2011
[email protected]@ -66,6 +66,10 @@
+ # include <sys/poll.h>
+ #endif /* IPMI_INTF_OPEN */
+
++#ifdef HAVE_IOCCOM_H
++#include <sys/ioccom.h>
++#endif
++
+ #include <ipmitool/helper.h>
+ #include <ipmitool/log.h>
+ #include <ipmitool/ipmi.h>
+--- ipmitool-1.8.11.old/src/plugins/open/open.c Wed Feb 25 12:38:53 2009
++++ ipmitool-1.8.11/src/plugins/open/open.c Fri Oct 21 16:41:08 2011
[email protected]@ -62,6 +62,10 @@
+ # include "open.h"
+ #endif
+
++#ifdef HAVE_IOCCOM_H
++#include <sys/ioccom.h>
++#endif
++
+ extern int verbose;
+
+ static int