--- ipmitool-1.8.13.orig/debian/README.source +++ ipmitool-1.8.13/debian/README.source @@ -0,0 +1,2 @@ +More information on how to use quilt can be found in: +/usr/share/doc/quilt/README.source --- ipmitool-1.8.13.orig/debian/changelog +++ ipmitool-1.8.13/debian/changelog @@ -1,60 +1,285 @@ -version (1.8.11) unstable; urgency=low - * Fix new GCC compilation issues in regards to Packing - * Fix Tracker bug #1642710 - ipmi_kcs_drv being loaded/unloaded - for 2.4 kernel instead of ipmi_si_drv driver module - * New -y option added to allow specification of kg keys with - non-printable characters - * New -K option added to allow kgkey settings via environmental - variable IPMI_KGKEY - * Generic device support added for EEPROM with SDR Type 10h (gendev) - * Fix to lan-bridging for a double-bridging crash and to fix - an issue with bridging multiple concurrent requests and - erroneous handling of raw Send Message - * Lanplus fix for commands like 'sensor list' without the -t option - causing wrong double bridged requests of a sensor is located - on another satellite controller - * Fix lan and lanplus request list entry removal bugs - * Fix non-working issue when trying to send a bridge message with - Cipher 3 - * Change bridge message handling to reuse command ipmi_lan_poll_recv - * Added PICMG 2.0 and 2.3 support - * Fix PICMG (ATCA) extension verification and reversal of BCD encoded - values for "major" and "minor" fields - * Add IANA support for Pigeon Point - * Add OEM SW/FW Record identification - * Fix to include I2C and LUN addresses so sensors are correctly managed - * Patch ID 1990560 to get readings from non-linear analog sensors - * Add support for SOL payload status command - * SOL set parameter range checking added - * Fixed SOL activate options usage - * Fixed crashes when parsing 'sol payload' and 'tsol' cmds (#216967) - * Added retries to SOL keepalive - * Fixed wrong mask values for Front Panel disable/enable status - * Add support to access fru internal use area - * Add support for new PICMG 3.0 R3.0 (March 24, 2008) to allow - blocks of data within the FRU storage area to be write - protected. - * Fix node reporting in GUID; Tracker bug #2339675 - * Fix watchdog use/action print strings - * Fix endian bug in SDR add from file; Tracker bug #2075258 - * Fix crash when dumping SDRs in a file and there's an error - getting an SDR; improve algorithm for optimal packet size - * Fix occasional SDR dump segfault; #1793076 - * Allow ipmitool sel delete to accept hex list entry numbers - * Fix SEL total space reporting. - * Fix for garbage sensor threshold values reported when none - returned. Tracker Bug #863748 - * ipmievd change to Monitor %used in SEL buffer and log warnings when - the buffer is 80% and 100% full +ipmitool (1.8.13-1ubuntu0.6) trusty; urgency=medium - -- Petter Reinholdtsen Wed, 25 Feb 2009 09:44:31 +0200 + * debian/patches/lp1509896_fix_scsi_probe_607cfe6.patch: allow for up to + 16 devices on the SCSI bus when probing. Fixes the probing failing the + use of the USB transport for IPMI when there are more than 8 SCSI devices + on the bus, and follows the max devices for SCSI-3. (LP: #1509896) -ipmitool (1.8.10) unstable; urgency=low + -- Mathieu Trudel-Lapierre Wed, 04 Nov 2015 17:36:22 -0600 - * New upstream version. - * Patch to allow Debian package builds from cvs. +ipmitool (1.8.13-1ubuntu0.5) trusty; urgency=medium + + * debian/patches/usb_interface_support.patch: include bswap.h from hpm2.h; + this is required for powerpc to build successfully. + + -- Mathieu Trudel-Lapierre Wed, 14 Oct 2015 15:48:33 -0400 + +ipmitool (1.8.13-1ubuntu0.4) trusty; urgency=medium + + * debian/patches/usb_interface_support.patch: backport more chunks of USB and + HPM interfaces to let the USB transport work properly. (LP: #1486931) + + -- Mathieu Trudel-Lapierre Thu, 24 Sep 2015 12:06:41 -0400 + +ipmitool (1.8.13-1ubuntu0.3) trusty; urgency=medium + + * debian/patches/memcpy_hpm_fix.patch: fix wrong memcpy boundary parameter in + HpmFwupgActionUploadFirmware(). (LP: #1481780) + * debian/patches/usb_interface_support.patch: add USB interface support. + (LP: #1481780) + + -- Mathieu Trudel-Lapierre Mon, 10 Aug 2015 21:15:35 -0400 + +ipmitool (1.8.13-1ubuntu0.2) trusty; urgency=medium + + * debian/patches/fix-add-options-to-chassis-bootparam-set-bootflag.patch: + This patch adds the ability to set/clear the BMC boot flag valid options + to chassis bootparam. (lp : 1393918) + + -- Jorge Niedbalski Tue, 18 Nov 2014 16:13:07 -0300 + +ipmitool (1.8.13-1ubuntu0.1) trusty; urgency=low + + * debian/patches/113_add-support-for-Dell-PowerEdge-13G.patch: Add support + for Dell PowerEdge 13G (LP: #1343407) + + -- Kent Baxley Thu, 17 Jul 2014 11:00:26 -0500 + +ipmitool (1.8.13-1) unstable; urgency=low + + * New upstream release + - Fixes regression in default cipher suite selection (Closes: #708621). + + -- Luk Claes Wed, 18 Sep 2013 07:45:10 +0200 + +ipmitool (1.8.12-1) unstable; urgency=low + + * Merge new upstream from Ubuntu (Closes: #692292). + + -- Luk Claes Tue, 07 May 2013 18:12:12 +0200 + +ipmitool (1.8.12-0ubuntu2) raring; urgency=low + + * debian/patches/big_endian: cherry-pick missing includes from upstream; + fixes FTBFS on powerpc. + + -- Robie Basak Tue, 05 Mar 2013 13:38:42 +0000 + +ipmitool (1.8.12-0ubuntu1) raring; urgency=low + + * New upstream release (LP: #1074443): + - Dropped patches: + + fix_sdr_segfault: ipmi_sdr_print_sensor_compact no longer + exists upstream. + + dell_*: merged upstream. + + -- Robie Basak Mon, 04 Mar 2013 12:13:46 +0000 + +ipmitool (1.8.11-5ubuntu1) precise; urgency=low + + * Merge from Debian testing (LP: #914920). Remaining changes: + - debian/contol: + + Changed openipmi from Suggests to Recommends + - debian/copyright: + + Add DELL copyright notice. + - Apply a series of 6 patches from upstream's patch tracker to + add DELL specific commands (delloem) + * Drop changes: + - Add armel/armhf support, now Architecture is any + - 101_fix_buf_overflow.patch now in debian + + -- Leo Iannacone Wed, 11 Jan 2012 18:49:15 +0100 + +ipmitool (1.8.11-5) unstable; urgency=high + + * debian/control: Add libncurses-dev build dependency + * Don't set umask to fix CVE-2011-4339 (Closes: #651917). + + -- Luk Claes Wed, 28 Dec 2011 12:34:15 +0100 + +ipmitool (1.8.11-4) unstable; urgency=low + + * debian/control: + - Add ${misc:Depends} so deps can be added by debhelper. + * debian/README.source: Add reference to quilt docs. + * debian/ipmitool.ipmievd.init: + - Test if /etc/default/rcS exists, before executing it. + - Add status support (Closes: #536119). + * debian/ipmitool.{post,pre}{inst,rm}: Add -e. + * Fix buffer overflow in tsol session. + * Update Vcs-Browser as URL mentioned within Alioth's gitweb + interface does not work. + + -- Luk Claes Thu, 22 Sep 2011 07:49:10 +0200 + +ipmitool (1.8.11-3) unstable; urgency=high + + * debian/control: + - Add myself as co-maintainer. + - Add Vcs entries. + - Update Architecture to any as ipmitool can be used for + remote devices (Closes: #578492). + * Only approach rsp->data when rsp is set (Closes: #637423). + + -- Luk Claes Mon, 19 Sep 2011 19:35:04 +0200 + +ipmitool (1.8.11-2ubuntu6) oneiric; urgency=low + + * Add armel/armhf support + + -- Michael Casadevall Wed, 05 Oct 2011 15:04:58 -0700 + +ipmitool (1.8.11-2ubuntu5) oneiric; urgency=low + + * Rebuild for OpenSSL 1.0.0. + + -- Colin Watson Wed, 18 May 2011 00:10:19 +0100 + +ipmitool (1.8.11-2ubuntu4) natty; urgency=low + + * Changed openipmi from Suggests to Recommends to ensure + it's installed too. (LP: #110992) + + -- Jeff Lane Wed, 09 Mar 2011 10:40:28 -0500 + +ipmitool (1.8.11-2ubuntu3) maverick; urgency=low + + * debian/patches/101_fix_buf_overflow.patch: Add patch to fix buffer overflow. + (LP: #633054) + + -- Chuck Short Wed, 08 Sep 2010 09:11:26 -0400 + +ipmitool (1.8.11-2ubuntu2) maverick; urgency=low + + * Actually remove 30_ipmi_delloem.patch this time. + + -- Stefano Rivera Mon, 28 Jun 2010 12:47:48 +0200 + +ipmitool (1.8.11-2ubuntu1) maverick; urgency=low + + [ Lorenzo De Liso ] + * Merge from debian unstable (LP: #598993), remaining changes: + - debian/copyright: + + Add DELL copyright notice. + + [ Stefano Rivera ] + * Replaced 30_ipmi_delloem.patch (never accepted upstream) with a new series + of 6 patches from upstream's patch tracker. + + -- Lorenzo De Liso Sun, 27 Jun 2010 12:26:30 +0200 + +ipmitool (1.8.11-2) unstable; urgency=low + + * Fix password reading (Patch from Kris Popendorf + <08kcn0b02@sneakemail.com> closes: #559363) + * Remove libreadline5-dev dependency in favour of libreadline-dev + (Closes: #553788) + + -- Matthew Johnson Sun, 06 Dec 2009 00:05:49 +0000 + +ipmitool (1.8.11-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/control: + - change Maintainer field according to specs. + + debian/patches/30_ipmi_delloem:.patch: + - Rediffed due to version bump. + - Dropped dpatchiness. + + debian/copyright: + - Add DELL copyright notice. + + -- Chuck Short Mon, 23 Mar 2009 00:01:26 +0000 + +ipmitool (1.8.11-1) unstable; urgency=low + + * New upstream release + * Change to quilt rather than dpatch + * Refresh config.sub/config.guess in configure + * Bump standards version + + -- Matthew Johnson Sun, 22 Mar 2009 16:44:06 +0000 + +ipmitool (1.8.9-2ubuntu1) jaunty; urgency=low + + * debian/patches/30_ipmi_delloem: + - add DELL specific commands (delloem) + * debian/patches/20_ipmi_ipmi: + - clean up *.orig + * debian/patches/20_ipmi_isol: + - clean up *.orig + * debian/copyright: + - add DELL copyright notice + * debian/control: + - change Maintainer field + + -- Ante Karamatic Wed, 18 Feb 2009 08:48:33 +0100 + +ipmitool (1.8.9-2) unstable; urgency=medium + + * Change pidfile name to the one it actually is. (Closes: #508434) + * Fix typo in README (Closes: #508231) + * Make sdr/Temperatures reading working again (Closes: #507760): + - Add patch to revert some bits from 1.8.8 to 1.8.9: + 20_ipmi_sdr.dpatch (Patch from Cyril Brulebois + ) + * Bump Standards-Version + * Remove empty /usr/share/ipmitool directory + + -- Matthew Johnson Tue, 19 Feb 2008 15:21:40 +0000 + +ipmitool (1.8.9-1) unstable; urgency=low + + * Adopt package (Closes: #432027) + * New upstream release + - Closes: #422864 + - Closes: #377628 + * Add patch to fix segfault (Closes: #389741) + * Add patch to fix isol (Closes: #412816) + * Add watch file + * Move from DH_COMPAT to debian/compat + * Bump to dephelper v5 + + -- Matthew Johnson Thu, 13 Dec 2007 10:25:22 +0000 + +ipmitool (1.8.8-3.1) unstable; urgency=high + + * Non-maintainer upload. + * High urgency for RC bug fix. + * Fix build with linux-libc-dev (closes: #428929). + * Fix debian/rules to not rerun configure in the binary target. + + -- Julien Cristau Fri, 20 Jul 2007 16:29:18 +0200 + +ipmitool (1.8.8-3) unstable; urgency=low + + * Ported fix to ipmievd from upstream version 1.8.9 (Closes: #408536): + - fix ipmievd fd closing bug. Patch from Rupert Hair. + * Started using dpatch to apply patches. Added dpatch to build dependencies. + * Add powerpc to the list of supported archs (Closes: #405455) + + -- Petter Reinholdtsen Tue, 03 Apr 2007 16:37:45 +0200 + +ipmitool (1.8.8-2) unstable; urgency=low + + * Add handler for the ipmievd init.d script failure during removal and + installation. If it fail during installation, update + /etc/default/ipmievd to disable ipmievd. + + -- Petter Reinholdtsen Sun, 1 Oct 2006 11:21:44 +0200 + +ipmitool (1.8.8-1) unstable; urgency=low + + * New upstream release. + - Daemon now tries to access device before it forks, and thus will + report errors to the init.d script if it fail. (Closes: #362425) + * Make it possible to disable ipmievd by setting ENABLED=false in + /etc/defaults/ipmievd. (Closes: #370511) + * Add --oknodo as start-stop-daemon argument when stopping ipmievd, + to avoid returning an error if it is not running. (Closes: #370509) + * Update standards-version from 3.6.2.1 to 3.7.2. No changes needed. + * Correct dependency and runlevel info in init.d script. - -- Petter Reinholdtsen Fri, 8 Aug 2008 09:44:31 +0200 + -- Petter Reinholdtsen Fri, 29 Sep 2006 19:16:41 +0200 ipmitool (1.8.7-2) unstable; urgency=low @@ -162,14 +387,14 @@ * Fix chassis boot parameter support * Add support for linear sensors - -- Duncan Laurie Wed, Mar 16 2005 17:08:12 -0700 + -- Duncan Laurie Wed, 16 Mar 2005 17:08:12 -0700 ipmitool (1.7.1) unstable; urgency=low * Update bmc plugin to work with new Solaris bmc driver (new ioctl for interface detection and new STREAMS message-based interface). - -- Seth Goldberg Mon, Mar 7 2005 18:03:00 -0800 + -- Seth Goldberg Mon, 7 Mar 2005 18:03:00 -0800 ipmitool (1.7.0) unstable; urgency=low @@ -185,7 +410,7 @@ * New "bmc" plugin for Solaris 10 x86 * Many bugfixes and contributed patches - -- Duncan Laurie Fri, Jan 7 2005 19:58:22 -0700 + -- Duncan Laurie Fri, 7 Jan 2005 19:58:22 -0700 ipmitool (1.6.2) unstable; urgency=low @@ -228,7 +453,7 @@ * Add configure option for changing binary to ipmiadm for Solaris * Fix compile problem on Solaris 8 - -- Duncan Laurie Sat, 27 Mar 2004 00:11:37 -0700 + -- Duncan Laurie Sat, 27 Mar 2004 00:11:37 -0700 ipmitool (1.5.8) unstable; urgency=low @@ -242,7 +467,7 @@ * Add support for Linux kernel panic messages in SEL output * Add support for type 3 SDR records - -- Duncan Laurie Tue, 27 Jan 2004 16:23:25 -0700 + -- Duncan Laurie Tue, 27 Jan 2004 16:23:25 -0700 ipmitool (1.5.7) unstable; urgency=low @@ -251,7 +476,7 @@ * better handling of SDR printing * contrib scripts for creating rrdtool graphs - -- Duncan Laurie Mon, 5 Jan 2004 17:29:50 -0700 + -- Duncan Laurie Mon, 5 Jan 2004 17:29:50 -0700 ipmitool (1.5.6) unstable; urgency=low @@ -260,40 +485,40 @@ * Fix sdr handling of sensors that do not return a reading * Fix for CSV display of sensor readings/units from Fredrik Öhrn - -- Duncan Laurie Thu, 4 Dec 2003 14:47:19 -0700 + -- Duncan Laurie Thu, 4 Dec 2003 14:47:19 -0700 ipmitool (1.5.5) unstable; urgency=low * Add -U option for setting LAN username * Fix -v usage for plugin interfaces - -- Duncan Laurie Tue, 25 Nov 2003 15:10:48 -0700 + -- Duncan Laurie Tue, 25 Nov 2003 15:10:48 -0700 ipmitool (1.5.4) unstable; urgency=low * Put interface plugin API into library * Fix ipmievd - -- Duncan Laurie Fri, 14 Nov 2003 15:16:34 -0700 + -- Duncan Laurie Fri, 14 Nov 2003 15:16:34 -0700 ipmitool (1.5.3) unstable; urgency=low * Add -g option to work with grizzly bmc - -- Duncan Laurie Mon, 3 Nov 2003 18:04:07 -0700 + -- Duncan Laurie Mon, 3 Nov 2003 18:04:07 -0700 ipmitool (1.5.2) unstable; urgency=low * add support for setting gratuitous arp interval - -- Duncan Laurie Fri, 24 Oct 2003 11:00:00 -0700 + -- Duncan Laurie Fri, 24 Oct 2003 11:00:00 -0700 ipmitool (1.5.1) unstable; urgency=low * better SEL support * fix display bug in SDR list - -- Duncan Laurie Wed, 8 Oct 2003 17:28:51 -0700 + -- Duncan Laurie Wed, 8 Oct 2003 17:28:51 -0700 ipmitool (1.5.0) unstable; urgency=low @@ -301,24 +526,24 @@ * add Intel IMB driver support * use autoconf/automake/libtool - -- Duncan Laurie Fri, 5 Sep 2003 11:57:32 -0700 + -- Duncan Laurie Fri, 5 Sep 2003 11:57:32 -0700 ipmitool (1.2-1) unstable; urgency=low * New command line option parsing * More chassis commands supported - -- Duncan Laurie Wed, 2 Apr 2003 17:44:17 -0700 + -- Duncan Laurie Wed, 2 Apr 2003 17:44:17 -0700 ipmitool (1.1-1) unstable; urgency=low * Minor fixes. - -- Duncan Laurie Tue, 1 Apr 2003 14:31:10 -0700 + -- Duncan Laurie Tue, 1 Apr 2003 14:31:10 -0700 ipmitool (1.0-1) unstable; urgency=low * Initial Release. - -- Duncan Laurie Sun, 30 Mar 2003 21:30:46 -0700 + -- Duncan Laurie Sun, 30 Mar 2003 21:30:46 -0700 --- ipmitool-1.8.13.orig/debian/compat +++ ipmitool-1.8.13/debian/compat @@ -0,0 +1 @@ +5 --- ipmitool-1.8.13.orig/debian/control +++ ipmitool-1.8.13/debian/control @@ -1,15 +1,18 @@ Source: ipmitool Section: utils Priority: optional -Maintainer: Petter Reinholdtsen -Uploaders: Duncan Laurie -Build-Depends: debhelper (>> 4.0.0), libreadline5-dev | libreadline-dev, libssl-dev, autoconf, automake1.9 | automake, autotools-dev, libtool -Standards-Version: 3.6.2.1 +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Matthew Johnson +Uploaders: Luk Claes +Build-Depends: debhelper (>> 5.0.0), libreadline-dev, libncurses-dev, libssl-dev, quilt, autotools-dev +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ipmitool.git +Vcs-Git: git://anonscm.debian.org/git/collab-maint/ipmitool.git +Standards-Version: 3.8.0 Package: ipmitool -Architecture: i386 amd64 ia64 -Depends: ${shlibs:Depends}, lsb-base -Suggests: openipmi +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base +Recommends: openipmi Description: utility for IPMI control with kernel driver or LAN interface A utility for managing and configuring devices that support the Intelligent Platform Management Interface. IPMI is an open standard --- ipmitool-1.8.13.orig/debian/copyright +++ ipmitool-1.8.13/debian/copyright @@ -34,3 +34,31 @@ 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. + + +Parts of code contributed by DELL: + +Copyright (c) 2006, Dell Inc +All rights reserved. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: +- Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + +- Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. +- Neither the name of Dell Inc nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. --- ipmitool-1.8.13.orig/debian/dirs +++ ipmitool-1.8.13/debian/dirs @@ -1,4 +1,3 @@ usr/bin usr/sbin -usr/share/ipmitool usr/share/doc/ipmitool --- ipmitool-1.8.13.orig/debian/ipmitool.ipmievd.init +++ ipmitool-1.8.13/debian/ipmitool.ipmievd.init @@ -0,0 +1,105 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: ipmievd +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: IPMI event daemon +# Description: ipmievd is a daemon which will listen for events +# from the BMC that are being sent to the SEL and +# also log those messages to syslog. +### END INIT INFO +# +# Author: Elmar Hoffmann +# Licence: This script is public domain using the same +# licence as ipmitool itself. +# Modified by: Petter Reinholdtsen + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="IPMI event daemon" +NAME=ipmievd +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME.pid0 +SCRIPTNAME=/etc/init.d/$NAME +ENABLED=true + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions +test -r /etc/default/rcS && . /etc/default/rcS + +# Options used by ipmievd. +# +# "open" uses the asynchronous event notification from the OpenIPMI +# kernel driver, "sel" uses active polling of the contents of the SEL +# for new events. +# +# Need to force 'daemon' mode, to make sure messages are sent to +# syslog and the program forks into the background. +# +# Se ipmievd(8) for more info. +IPMIEVD_OPTIONS="open daemon" + +# Read config file if it is present. +[ -f /etc/default/$NAME ] && . /etc/default/$NAME + +test "$ENABLED" != "false" || exit 0 + +# Backwards compatibility with version 1.8.6-2 and 1.8.6-1. The +# variable was renamed to be compatible with upstream, SuSe and RedHat. +if [ -n "$IPMIEVD_OPTS" ]; then + echo "warning: /etc/default/$NAME variable IPMIEVD_OPTS should be renamed to IPMIEVD_OPTIONS" + IPMIEVD_OPTIONS="$IPMIEVD_OPTS" +fi + +# +# Function that starts the daemon/service. +# +d_start() { + start-stop-daemon --start --quiet --exec $DAEMON --pidfile $PIDFILE -- $IPMIEVD_OPTIONS +} + +# +# Function that stops the daemon/service. +# +d_stop() { + start-stop-daemon --stop --oknodo --quiet --name $NAME --exec $DAEMON --pidfile $PIDFILE +} + +CODE=0 + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_begin_msg "Starting $DESC" "$NAME" + d_start || CODE=$? + [ "$VERBOSE" != no ] && log_end_msg $CODE + exit $CODE + ;; + stop) + log_begin_msg "Stopping $DESC" "$NAME" + d_stop || CODE=$? + log_end_msg $CODE + exit $CODE + ;; + restart|force-reload) + log_begin_msg "Restarting $DESC" "$NAME" + d_stop || true + sleep 1 + d_start || CODE=$? + log_end_msg $CODE + exit $CODE + ;; + status) + status_of_proc $DAEMON $NAME + ;; + *) + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 + exit 1 + ;; +esac + +exit 0 --- ipmitool-1.8.13.orig/debian/ipmitool.postinst +++ ipmitool-1.8.13/debian/ipmitool.postinst @@ -0,0 +1,14 @@ +#!/bin/sh -e + +ipmievd_initd_failed() { + echo "Unable to start ipmievd during installation. Trying to disable." + if [ -f /etc/default/ipmievd ] && \ + grep -q ^ENABLED=false /etc/default/ipmievd ; then + : + else + touch /etc/default/ipmievd + echo "ENABLED=false" >> /etc/default/ipmievd + fi +} + +#DEBHELPER# --- ipmitool-1.8.13.orig/debian/ipmitool.postrm +++ ipmitool-1.8.13/debian/ipmitool.postrm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +ipmievd_initd_failed() { + : +} + +#DEBHELPER# --- ipmitool-1.8.13.orig/debian/ipmitool.prerm +++ ipmitool-1.8.13/debian/ipmitool.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +ipmievd_initd_failed() { + : +} + +#DEBHELPER# --- ipmitool-1.8.13.orig/debian/patches/101_fix_buf_overflow +++ ipmitool-1.8.13/debian/patches/101_fix_buf_overflow @@ -0,0 +1,11 @@ +--- a/lib/ipmi_tsol.c ++++ b/lib/ipmi_tsol.c +@@ -385,7 +385,7 @@ + socklen_t mylen; + char *recvip = NULL; + char out_buff[IPMI_BUF_SIZE * 8], in_buff[IPMI_BUF_SIZE]; +- char buff[IPMI_BUF_SIZE + 4]; ++ char buff[IPMI_BUF_SIZE * 8 + 4]; + int fd_socket, result, i; + int out_buff_fill, in_buff_fill; + int ip1, ip2, ip3, ip4; --- ipmitool-1.8.13.orig/debian/patches/112_fix_CVE-2011-4339 +++ ipmitool-1.8.13/debian/patches/112_fix_CVE-2011-4339 @@ -0,0 +1,10 @@ +--- a/lib/helper.c ++++ b/lib/helper.c +@@ -593,7 +593,6 @@ + #endif + + chdir("/"); +- umask(0); + + for (fd=0; fd<64; fd++) { + if (fd != intf->fd) --- ipmitool-1.8.13.orig/debian/patches/113_add-support-for-Dell-PowerEdge-13G.patch +++ ipmitool-1.8.13/debian/patches/113_add-support-for-Dell-PowerEdge-13G.patch @@ -0,0 +1,369 @@ +Description: Add support for Dell PowerEdge 13G servers. +Author: Srini Gowda +Forwarded: http://sourceforge.net/p/ipmitool/patches/102/ +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/1343407 +Last-Update: 2014-07-21 + +From a0c9f3897bbc4a6b02534d9ef0d5e11af9a2672c Mon Sep 17 00:00:00 2001 +Date: Thu, 5 Jun 2014 16:55:44 +0530 +Subject: [PATCH 1/1]Dell Adding support for 13G(newer generation) Dell PowerEdge + servers + + +Signed-off-by: SriniG +--- + include/ipmitool/ipmi_delloem.h | 4 +++ + lib/ipmi_delloem.c | 77 ++++++++++++++++++++++++----------------- + 2 files changed, 50 insertions(+), 31 deletions(-) + +diff --git a/include/ipmitool/ipmi_delloem.h b/include/ipmitool/ipmi_delloem.h +index 88f5c22..bae9510 100644 +--- a/include/ipmitool/ipmi_delloem.h ++++ b/include/ipmitool/ipmi_delloem.h +@@ -72,6 +72,7 @@ POSSIBILITY OF SUCH DAMAGE. + + #define IDRAC_11G 1 + #define IDRAC_12G 2 ++#define IDRAC_13G 3 + // Return Error code for license + #define LICENSE_NOT_SUPPORTED 0x6F + #define VFL_NOT_LICENSED 0x33 +@@ -184,6 +185,9 @@ typedef struct _lcd_mode + #define IMC_IDRAC_12G_MONOLITHIC (uint8_t) (0x10) + #define IMC_IDRAC_12G_MODULAR (uint8_t) (0x11) + ++#define IMC_IDRAC_13G_MONOLITHIC (uint8_t) (0x20) ++#define IMC_IDRAC_13G_MODULAR (uint8_t) (0x21) ++#define IMC_IDRAC_13G_DCS (uint8_t) (0x22) + + + typedef struct +diff --git a/lib/ipmi_delloem.c b/lib/ipmi_delloem.c +index e190cd4..847f8d9 100644 +--- a/lib/ipmi_delloem.c ++++ b/lib/ipmi_delloem.c +@@ -358,7 +358,7 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv) + lprintf(LOG_ERR, "lcd is not supported on this system."); + return -1; + } else if (strncmp(argv[current_arg], "info\0", 5) == 0) { +- if ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G)) { ++ if ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G) || (iDRAC_FLAG == IDRAC_13G)) { + rc = ipmi_lcd_get_info_wh(intf); + } else { + rc = ipmi_lcd_get_info(intf); +@@ -392,7 +392,7 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv) + } + } + if ((strncmp(argv[current_arg], "mode\0", 5) == 0) +- && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) { ++ && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G) || (iDRAC_FLAG == IDRAC_13G))) { + current_arg++; + if (argc <= current_arg) { + ipmi_lcd_usage(); +@@ -446,7 +446,7 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv) + ipmi_lcd_usage(); + } + } else if ((strncmp(argv[current_arg], "lcdqualifier\0", 13) == 0) +- && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) { ++ && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G) || (iDRAC_FLAG == IDRAC_13G))) { + current_arg++; + if (argc <= current_arg) { + ipmi_lcd_usage(); +@@ -470,7 +470,7 @@ ipmi_delloem_lcd_main(struct ipmi_intf * intf, int argc, char ** argv) + ipmi_lcd_usage(); + } + } else if ((strncmp(argv[current_arg], "errordisplay\0", 13) == 0) +- && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) { ++ && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G) || (iDRAC_FLAG == IDRAC_13G))) { + current_arg++; + if (argc <= current_arg) { + ipmi_lcd_usage(); +@@ -644,6 +644,10 @@ ipmi_idracvalidator_command(struct ipmi_intf * intf) + } else if((IMC_IDRAC_12G_MONOLITHIC == data[10]) + || (IMC_IDRAC_12G_MODULAR == data[10])) { + iDRAC_FLAG = IDRAC_12G; ++ } else if( (IMC_IDRAC_13G_MONOLITHIC == data[10]) ++ || (IMC_IDRAC_13G_MODULAR == data[10]) ++ || (IMC_IDRAC_13G_DCS == data[10]) ) { ++ iDRAC_FLAG=IDRAC_13G; + } else { + iDRAC_FLAG = 0; + } +@@ -1394,7 +1398,7 @@ ipmi_lcd_usage(void) + lprintf(LOG_NOTICE, + ""); + lprintf(LOG_NOTICE, +-"iDRAC 11g or iDRAC 12g:"); ++"iDRAC 11g or iDRAC 12g or iDRAC 13g :"); + lprintf(LOG_NOTICE, + " lcd set {mode}|{lcdqualifier}|{errordisplay}"); + lprintf(LOG_NOTICE, +@@ -1561,7 +1565,9 @@ ipmi_macinfo_drac_idrac_virtual_mac(struct ipmi_intf* intf,uint8_t NicNum) + return -1; + } + if ((IMC_IDRAC_12G_MODULAR == IMC_Type) +- || (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) { ++ || (IMC_IDRAC_12G_MONOLITHIC== IMC_Type) ++ || (IMC_IDRAC_13G_MODULAR == IMC_Type) ++ || (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) { + /* Get the Chasiss Assigned MAC Addresss for 12g Only */ + memcpy(VirtualMacAddress, ((rsp->data) + 1), MACADDRESSLENGH); + for (i = 0; i < MACADDRESSLENGH; i++) { +@@ -1599,6 +1605,9 @@ ipmi_macinfo_drac_idrac_virtual_mac(struct ipmi_intf* intf,uint8_t NicNum) + } else if ((IMC_IDRAC_12G_MODULAR == IMC_Type) + || (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) { + printf("\niDRAC7 MAC Address "); ++ } else if ((IMC_IDRAC_13G_MODULAR == IMC_Type) ++ || (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) { ++ printf ("\niDRAC8 MAC Address "); + } else if ((IMC_MASER_LITE_BMC== IMC_Type) + || (IMC_MASER_LITE_NU== IMC_Type)) { + printf("\nBMC MAC Address "); +@@ -1668,6 +1677,9 @@ ipmi_macinfo_drac_idrac_mac(struct ipmi_intf* intf,uint8_t NicNum) + } else if ((IMC_IDRAC_12G_MODULAR == IMC_Type) + || (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) { + printf("\niDRAC7 MAC Address "); ++ } else if ((IMC_IDRAC_13G_MODULAR == IMC_Type) ++ || (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) { ++ printf ("\niDRAC8 MAC Address "); + } else if ((IMC_MASER_LITE_BMC== IMC_Type) + || (IMC_MASER_LITE_NU== IMC_Type)) { + printf("\n\rBMC MAC Address "); +@@ -1879,6 +1891,8 @@ ipmi_macinfo(struct ipmi_intf* intf, uint8_t NicNum) + || IMC_IDRAC_11G_MONOLITHIC == IMC_Type) + || (IMC_IDRAC_12G_MODULAR == IMC_Type + || IMC_IDRAC_12G_MONOLITHIC == IMC_Type) ++ || (IMC_IDRAC_13G_MODULAR == IMC_Type ++ || IMC_IDRAC_13G_MONOLITHIC == IMC_Type) + || (IMC_MASER_LITE_NU == IMC_Type || IMC_MASER_LITE_BMC== IMC_Type)) { + return ipmi_macinfo_11g(intf,NicNum); + } else { +@@ -1946,7 +1960,7 @@ ipmi_delloem_lan_main(struct ipmi_intf * intf, int argc, char ** argv) + ipmi_lan_usage(); + return -1; + } +- if (iDRAC_FLAG == IDRAC_12G) { ++ if ((iDRAC_FLAG == IDRAC_12G) || (iDRAC_FLAG == IDRAC_13G)) { + nic_selection = get_nic_selection_mode_12g(intf, current_arg, argv, + nic_set); + if (INVALID == nic_selection) { +@@ -2063,7 +2077,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, + } + if (argv[current_arg] != NULL + && strncmp(argv[current_arg], "lom1\0", 5) == 0) { +- if (IMC_IDRAC_12G_MODULAR == IMC_Type) { ++ if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) { + return INVAILD_SHARED_MODE; + } + if (failover) { +@@ -2082,7 +2096,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, + return 0; + } else if (argv[current_arg] != NULL + && strncmp(argv[current_arg], "lom2\0", 5) == 0) { +- if (IMC_IDRAC_12G_MODULAR == IMC_Type) { ++ if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) { + return INVAILD_SHARED_MODE; + } + if (failover) { +@@ -2101,7 +2115,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, + return 0; + } else if (argv[current_arg] != NULL + && strncmp(argv[current_arg], "lom3\0", 5) == 0) { +- if (IMC_IDRAC_12G_MODULAR == IMC_Type) { ++ if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) { + return INVAILD_SHARED_MODE; + } + if (failover) { +@@ -2120,7 +2134,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, + return 0; + } else if (argv[current_arg] != NULL + && strncmp(argv[current_arg], "lom4\0", 5) == 0) { +- if (IMC_IDRAC_12G_MODULAR == IMC_Type) { ++ if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) { + return INVAILD_SHARED_MODE; + } + if (failover) { +@@ -2139,7 +2153,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, + return 0; + } else if (failover && argv[current_arg] != NULL + && strncmp(argv[current_arg], "none\0", 5) == 0) { +- if (IMC_IDRAC_12G_MODULAR == IMC_Type) { ++ if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type) ) { + return INVAILD_SHARED_MODE; + } + if (failover) { +@@ -2159,7 +2173,7 @@ get_nic_selection_mode_12g(struct ipmi_intf* intf,int current_arg, + current_arg++; + if (failover && argv[current_arg] != NULL + && strncmp(argv[current_arg], "loms\0", 5) == 0) { +- if (IMC_IDRAC_12G_MODULAR == IMC_Type) { ++ if ((IMC_IDRAC_12G_MODULAR == IMC_Type) || (IMC_IDRAC_13G_MODULAR == IMC_Type)) { + return INVAILD_SHARED_MODE; + } + if (nic_set[0] == 1) { +@@ -2242,7 +2256,8 @@ ipmi_lan_set_nic_selection_12g(struct ipmi_intf * intf, uint8_t * nic_selection) + lprintf(LOG_ERR, "Error in setting nic selection"); + return -1; + } else if( (nic_selection[0] == 1) +- && ((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED))) { ++ && (( (iDRAC_FLAG == IDRAC_12G) || (iDRAC_FLAG == IDRAC_13G) ) ++ && (rsp->ccode == LICENSE_NOT_SUPPORTED))) { + /* Check license only for setting the dedicated nic. */ + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +@@ -2297,7 +2312,7 @@ ipmi_lan_get_nic_selection(struct ipmi_intf * intf) + input_length = 0; + req.msg.netfn = DELL_OEM_NETFN; + req.msg.lun = 0; +- if (iDRAC_FLAG == IDRAC_12G) { ++ if((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) { + req.msg.cmd = GET_NIC_SELECTION_12G_CMD; + } else { + req.msg.cmd = GET_NIC_SELECTION_CMD; +@@ -2314,7 +2329,7 @@ ipmi_lan_get_nic_selection(struct ipmi_intf * intf) + return -1; + } + nic_selection = rsp->data[0]; +- if (iDRAC_FLAG == IDRAC_12G) { ++ if((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) { + nic_selection_failover = rsp->data[1]; + if ((nic_selection < 6) && (nic_selection > 0) + && (nic_selection_failover < 7)) { +@@ -2413,7 +2428,7 @@ ipmi_lan_usage(void) + lprintf(LOG_NOTICE, + " sets the NIC Selection Mode :"); + lprintf(LOG_NOTICE, +-" on iDRAC12g :"); ++" on iDRAC12g OR iDRAC13g :"); + lprintf(LOG_NOTICE, + " dedicated, shared with lom1, shared with lom2,shared with lom3,shared"); + lprintf(LOG_NOTICE, +@@ -2433,7 +2448,7 @@ ipmi_lan_usage(void) + lprintf(LOG_NOTICE, + " lan get "); + lprintf(LOG_NOTICE, +-" on iDRAC12g :"); ++" on iDRAC12g or iDRAC13g :"); + lprintf(LOG_NOTICE, + " returns the current NIC Selection Mode (dedicated, shared with lom1, shared"); + lprintf(LOG_NOTICE, +@@ -2662,7 +2677,7 @@ ipmi_get_power_capstatus_command(struct ipmi_intf * intf) + if (rsp == NULL) { + lprintf(LOG_ERR, "Error getting powercap status"); + return -1; +- } else if((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { ++ } else if(((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; /* Return Error as unlicensed */ +@@ -2713,7 +2728,7 @@ ipmi_set_power_capstatus_command(struct ipmi_intf * intf, uint8_t val) + if (rsp == NULL) { + lprintf(LOG_ERR, "Error setting powercap status"); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; /* return unlicensed Error code */ +@@ -2807,7 +2822,7 @@ ipmi_powermgmt(struct ipmi_intf * intf) + return -1; + } + +- if((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { ++ if(((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -2910,7 +2925,7 @@ ipmi_powermgmt_clear(struct ipmi_intf * intf, uint8_t clearValue) + if (rsp == NULL) { + lprintf(LOG_ERR, "Error clearing power values."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) + && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +@@ -2988,7 +3003,7 @@ ipmi_get_power_headroom_command(struct ipmi_intf * intf,uint8_t unit) + if (rsp == NULL) { + lprintf(LOG_ERR, "Error getting power headroom status"); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) + && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +@@ -3122,7 +3137,7 @@ ipmi_get_instan_power_consmpt_data(struct ipmi_intf * intf, + if (rsp == NULL) { + lprintf(LOG_ERR, "Error getting instantaneous power consumption data ."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) + && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +@@ -3215,7 +3230,7 @@ ipmi_get_avgpower_consmpt_history(struct ipmi_intf * intf, + lprintf(LOG_ERR, + "Error getting average power consumption history data."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) { ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3264,7 +3279,7 @@ ipmi_get_peakpower_consmpt_history(struct ipmi_intf * intf, + if (rc < 0) { + lprintf(LOG_ERR, "Error getting peak power consumption history data."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) { ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3321,7 +3336,7 @@ ipmi_get_minpower_consmpt_history(struct ipmi_intf * intf, + if (rc < 0) { + lprintf(LOG_ERR, "Error getting peak power consumption history data ."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) { ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3518,7 +3533,7 @@ ipmi_get_power_cap(struct ipmi_intf * intf, IPMI_POWER_CAP * ipmipowercap) + if (rc < 0) { + lprintf(LOG_ERR, "Error getting power cap."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) { ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3618,7 +3633,7 @@ ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val) + if (rc < 0) { + lprintf(LOG_ERR, "Error getting power cap."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) { ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3698,7 +3713,7 @@ ipmi_set_power_cap(struct ipmi_intf * intf, int unit, int val) + if (rc < 0) { + lprintf(LOG_ERR, "Error setting power cap"); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) { ++ } else if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3860,7 +3875,7 @@ ipmi_get_sd_card_info(struct ipmi_intf * intf) { + + sdcardinfoblock = (IPMI_DELL_SDCARD_INFO *) (void *) rsp->data; + +- if ((iDRAC_FLAG == IDRAC_12G) ++ if (((iDRAC_FLAG == IDRAC_12G) ||(iDRAC_FLAG == IDRAC_13G) ) + && (sdcardinfoblock->vflashcompcode == VFL_NOT_LICENSED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +-- +1.8.1.2 + --- ipmitool-1.8.13.orig/debian/patches/99_readme_typo +++ ipmitool-1.8.13/debian/patches/99_readme_typo @@ -0,0 +1,25 @@ +## 99_readme_typo.dpatch by dann frazier +## +## Typo in README. Closes: #508231 +--- a/README ++++ b/README +@@ -24,7 +24,7 @@ + ========== + I originally wrote ipmitool while between projects and employeed at Sun + Microsystems. Sun had just embarked on a new line of general-purpose x86 +-servers that inclued an OEM Intel board with an IPMIv1.5 BMC on board. ++servers that included an OEM Intel board with an IPMIv1.5 BMC on board. + It started with an idea that remote chassis power control would be a handy + feature for my systems in the lab and from there it grew into a multi- + purpose tool that lots of people found useful. I decided to release it +--- a/doc/ipmitool.1 ++++ b/doc/ipmitool.1 +@@ -44,7 +44,7 @@ + IPMI management of a local system interface requires a compatible IPMI + kernel driver to be installed and configured. On Linux this driver is + called \fIOpenIPMI\fP and it is included in standard distributions. +-On Solaris this driver is called \fIBMC\fP and is inclued in Solaris 10. ++On Solaris this driver is called \fIBMC\fP and is included in Solaris 10. + Management of a remote station requires the IPMI\-over\-LAN interface to be + enabled and configured. Depending on the particular requirements of each + system it may be possible to enable the LAN interface using ipmitool over --- ipmitool-1.8.13.orig/debian/patches/fix-add-options-to-chassis-bootparam-set-bootflag.patch +++ ipmitool-1.8.13/debian/patches/fix-add-options-to-chassis-bootparam-set-bootflag.patch @@ -0,0 +1,347 @@ +Description: Add ability to set BMC boot flag valid bit clearing to chassis bootparam + +This patch adds bootflag options can be set or cleared using: +chassis bootparam set bootflag device options={PEF, timeout, watchdog, reset, power}. U +sing the prefix of "no-" on any of the options sets it the other way. +As part of this change, also cleaned up the command line parsing and added messages for set bootflag + +Author: Jim Mankovich +Origin: upstream, http://sourceforge.net/p/ipmitool/source/ci/ca5cc560f60ebe601b5219699f56f99938895b4b/ +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/1393918 + + +--- a/doc/ipmitool.1 ++++ b/doc/ipmitool.1 +@@ -2309,14 +2309,16 @@ + .br + + .TP +-\fIset\fP <\fBoption\fR> [\fBvalue ...\fR] +-.br +- +-Set boot parameter. +- +-.RS +-.TP +-Currently supported values for \fB