diff options
27 files changed, 1707 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c6795b5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.bzr +.bzrignore diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b591089 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,564 @@ +ipmitool (1.8.14-4) unstable; urgency=medium + + * New debian/patches/120-Dell-13G.patch: + - Add support for Dell 13G server (Closes: #756555) + * debian/rules: + - Remove oldstyle CFLAGS parameter. + - change hardening to modern dh. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Thu, 07 Aug 2014 15:09:16 +0200 + +ipmitool (1.8.14-3) unstable; urgency=medium + + * move ipmitool.conf + from /etc/modules-load.d + to /usr/lib/modules-load.d ( Closes: #753762 ) + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Mon, 02 Jun 2014 20:46:28 +0200 + +ipmitool (1.8.14-2) unstable; urgency=medium + + * patch 115-lib_declarations.patch + - lib/kontronoem.c + correct declaration of write_fru_area ( Closes: #749913 ) + * remove hardening-wrapper from build-Depends + * add ipmi* kernel-modules to startup-script + ( LP: #908112 ) + * add debian/systemd/ipmitool.conf to load + ipmi* kernel-modules under systemd + * add debian/source/option + compression xy / level 9 + + [ Gerald Turner <gturner@unzane.com> ] + * changes on systemd startup scripts ( Closes: #750003 ) + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Tue, 27 May 2014 14:53:55 +0200 + +ipmitool (1.8.14-1) unstable; urgency=medium + + * remove debian/README.debian + * remove debian/dirs + * add debian/ipmitool.ipmievd.default + - default ipmievd start is disabled + * add patch + - 096-manpage_longlines.patch + - 097-source_typo.patch + - 098-manpage_typo.patch + - fix "tiny misprint" ( Closes: #554348 ) + * add systemd + * rewrite debian/copyright + * add debian/source/format + * debian/control + - add homepage ( Closes: #744283 ) + - bump Standards-Version to 3.9.5 + - remove unused Build-Depends + - quilt + * change to upstream version 1.8.14 + - fix FTBFS on kfreebsd ( Closes: #725476 ) + * Bumps compat to 9 + * New maintainer ( Closes: #748487 ) + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sun, 18 May 2014 17:40:37 +0200 + +ipmitool (1.8.13-1) unstable; urgency=low + + * New upstream release + - Fixes regression in default cipher suite selection (Closes: #708621). + + -- Luk Claes <luk@debian.org> 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 <luk@debian.org> 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 <robie.basak@canonical.com> 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 <robie.basak@canonical.com> 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 <l3on@ubuntu.com> 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 <luk@debian.org> 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 <luk@debian.org> 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 <luk@debian.org> Mon, 19 Sep 2011 19:35:04 +0200 + +ipmitool (1.8.11-2ubuntu6) oneiric; urgency=low + + * Add armel/armhf support + + -- Michael Casadevall <mcasadevall@ubuntu.com> Wed, 05 Oct 2011 15:04:58 -0700 + +ipmitool (1.8.11-2ubuntu5) oneiric; urgency=low + + * Rebuild for OpenSSL 1.0.0. + + -- Colin Watson <cjwatson@ubuntu.com> 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 <jeff@ubuntu.com> 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 <zulcss@ubuntu.com> 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 <stefano@rivera.za.net> 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 <blackz@ubuntu.com> 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 <mjj29@debian.org> 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 <zulcss@ubuntu.com> 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 <mjj29@debian.org> 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 <ivoks@ubuntu.com> 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 + <cyril.brulebois@kerlabs.com>) + * Bump Standards-Version + * Remove empty /usr/share/ipmitool directory + + -- Matthew Johnson <mjj29@debian.org> 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 <mjj29@debian.org> 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 <jcristau@debian.org> 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 <pere@debian.org> 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 <pere@debian.org> 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 <pere@debian.org> Fri, 29 Sep 2006 19:16:41 +0200 + +ipmitool (1.8.7-2) unstable; urgency=low + + * Fix typo in init.d/ipmievd. (Closes: #361309) + + -- Petter Reinholdtsen <pere@debian.org> Sat, 8 Apr 2006 06:44:31 +0200 + +ipmitool (1.8.7-1) unstable; urgency=low + + * New upstream version. + - Dropped nuclear clause from the copyright. Updated debian/copyright + to reflect this. + - ipmievd now store pid in /var/run/ipmievd.pid. Adjust init.d + script to use it. + * Rename /etc/default/ipmievd variable IPMIEVD_OPTS is renamed to + IPMIEVD_OPTIONS to stay compatible with upstream and other + distributions. Add backwards compatibility code with a warning to + the users of the old variable. + + -- Petter Reinholdtsen <pere@debian.org> Sun, 26 Mar 2006 21:11:08 +0200 + +ipmitool (1.8.6-2) unstable; urgency=low + + * Add ia64 as an supported arch. (Closes: #355930) + + -- Petter Reinholdtsen <pere@debian.org> Fri, 10 Mar 2006 23:34:50 +0100 + +ipmitool (1.8.6-1) unstable; urgency=low + + * New upstream version. + - Avoid crashing when setting lan IP address. (Closes: #351205) + * Avoid changing history by reverding upstream change + to email addresses in debian/changelog. + * Correct typo in control file: Suggest -> Suggests. Thanks + to Philipp Matthias Hahn for the report. + * Add init.d/ipmievd script. Based on script from Elmar Hoffmann, + slightly modified to use lsb-base functions. Added dependency on + lsb-base. (Closes: #345994) + + -- Petter Reinholdtsen <pere@debian.org> Sun, 26 Feb 2006 10:31:14 +0100 + +ipmitool (1.8.2-2) unstable; urgency=low + + * Add build-dependency on 'libreadline5-dev | libreadline-dev' to make + sure all archs get readline support. (Closes: #326341) + * Add build-dependency on libssl-dev to enable SSL support on + all archs. + * Updated Standards-Version to 3.6.2.1. (No updates required) + + -- Petter Reinholdtsen <pere@debian.org> Sat, 3 Sep 2005 19:18:51 +0200 + +ipmitool (1.8.2-1) unstable; urgency=low + + * New upstream release. + - Fix FRU reading for large (>255 bytes) areas. + - Overhaul to ipmievd to support SEL polling in addition to OpenIPMI. + - Fix LAN parameter segfault when no Ciphers supported by + BMC. (Closes: #306806) + - Fix IPMIv2 support on Intel v2 BMCs (use -o intelplus). + - Separate option parsing code from main ipmitool source file. + - Add raw I2C support with IPMI Master Read-Write command. + - Add support for new 'sdr elist' extended output format. + - Add support for listing sensors by type with 'sdr type' command. + - Add support for new 'sel elist' extended output format that + cross-references events with sensors. + - Add support for sending dynamically generated platform events + based on existing sensor information. + - New '-S' argument to read local SDR cache created with 'sdr dump'. + - Updated manpage for ipmitool and ipmievd. (Closes: #306894) + * Correct the upstream URL in debian/changelog to the current one. + * Suggest package openipmi. (Closes: #305629) + * Add debian/watch file to detect new source versions. + + -- Petter Reinholdtsen <pere@debian.org> Sun, 5 Jun 2005 10:29:18 +0200 + +ipmitool (1.8.1-1) unstable; urgency=low + + * New upstream release. + * Install ipmievd into /usr/sbin/. + + -- Petter Reinholdtsen <pere@debian.org> Thu, 7 Apr 2005 01:18:44 +0200 + +ipmitool (1.8.0-1) unstable; urgency=low + + * Initial upload into Debian, based on the upstream build + rules. (Closes: #299924) + * Convert debian/changelog to UTF-8. + * Change section from 'contrib' to 'utils'. + * Build-depend on debhelper (>> 4.0.0) to match the rules file. + * Set Standards-version to 3.6.1. + * Make sure binary dependency is properly generated. + * Add long description, copied from the project README. + * Drop useless provides 'ipmitool', as the package is called 'ipmitool'. + * Don't install the COPYING file, as the license text already is + included in debian/copyright. + * Remove unused parts of the rules file. + * Correct clean target in rules file, to use 'distclean' and remove + configure-stamp not bogus config-stamp. + + -- Petter Reinholdtsen <pere@debian.org> Sun, 3 Apr 2005 20:52:02 +0200 + +ipmitool (1.8.0) unstable; urgency=low + + * Fix IPMIv2.0 issues + * Fix chassis boot parameter support + * Add support for linear sensors + + -- Duncan Laurie <duncan@iceblink.org> 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 <sethmeisterg@hotmail.com> Mon, 7 Mar 2005 18:03:00 -0800 + +ipmitool (1.7.0) unstable; urgency=low + + * Propogate errors correctly so exit status will be useful + * More consistent display of errors including completion code text + * Errors and debug is send to stderr now + * New "sel get" command that will print details about SEL entry + and corresponding SDR records as well as FRUs via entity association + * Improved event generator, now supports reading events from text file + * New "-o oemtype" option for specifying OEM boards + exsting types are "supermicro" and "intelwv2" + * New PEF subsystem + * New "bmc" plugin for Solaris 10 x86 + * Many bugfixes and contributed patches + + -- Duncan Laurie <duncan@iceblink.org> Fri, 7 Jan 2005 19:58:22 -0700 + +ipmitool (1.6.2) unstable; urgency=low + + * Support for Supermicro BMC OEM authentication method + + -- Duncan Laurie <duncan@iceblink.org> Mon, 16 Nov 2004 08:20:01 -0700 + +ipmitool (1.6.1) unstable; urgency=low + + * Fix minor problem with LAN parameter setting + + -- Duncan Laurie <duncan@iceblink.org> Wed, 29 Sep 2004 11:19:17 -0700 + +ipmitool (1.6.0) unstable; urgency=low + + * Add a README + * Add support for IPMIv2 and Serial-over-LAN from Newisys + * Add Solaris x86 lipmi interface + * Add support for building Solaris packages + * Add support for building RPMs as non-root user + * Fix segfault when doing "sel list" (from Matthew Braithwaite) + * Fix "chassis identify" on some BMCs (from ebrower@sourceforge) + * Add "bmc info" and related output (from ebrower@sourceforge) + * new "shell" and "exec" commands + * lots of other contributed patches + + -- Duncan Laurie <duncan@iceblink.org> Thu, 9 Sep 2004 21:39:37 -0700 + +ipmitool (1.5.9) unstable; urgency=low + + * Add ability to get a particular sensor by name + * Add ability to set a particular sensor threshold + * Add support for displaying V2 channel authentication levels + * Add README for rrdtool scripts in contrib directory + * Improve lan interface retry handling + * Support prompting for password or reading from environment + * Move chaninfo command into channel subcommand + * Fix reservation ID handling when two sessions open to BMC + * Fix reading of large FRU data + * Add configure option for changing binary to ipmiadm for Solaris + * Fix compile problem on Solaris 8 + + -- Duncan Laurie <duncan@sun.com> Sat, 27 Mar 2004 00:11:37 -0700 + +ipmitool (1.5.8) unstable; urgency=low + + * Enable static compilation of interfaces + * Fix types to be 64-bit safe + * Fix compilation problems on Solaris + * Fix multiple big-endian problems for Solaris/SPARC + * Fix channel access to save settings to NVRAM + * Set channel privilege limit to ADMIN during "access on" + * Enable gratuitous ARP in bmcautoconf.sh + * Add support for Linux kernel panic messages in SEL output + * Add support for type 3 SDR records + + -- Duncan Laurie <duncan@sun.com> Tue, 27 Jan 2004 16:23:25 -0700 + +ipmitool (1.5.7) unstable; urgency=low + + * add IPMIv1.5 eratta fixes + * additions to FRU printing and FRU multirecords + * better handling of SDR printing + * contrib scripts for creating rrdtool graphs + + -- Duncan Laurie <duncan@sun.com> Mon, 5 Jan 2004 17:29:50 -0700 + +ipmitool (1.5.6) unstable; urgency=low + + * Fix SEL event decoding for generic events + * Handle empty SEL gracefully when doing "sel list" + * Fix sdr handling of sensors that do not return a reading + * Fix for CSV display of sensor readings/units from Fredrik Öhrn + + -- Duncan Laurie <duncan@sun.com> 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 <duncan@sun.com> 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 <duncan@sun.com> 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 <duncan@sun.com> Mon, 3 Nov 2003 18:04:07 -0700 + +ipmitool (1.5.2) unstable; urgency=low + + * add support for setting gratuitous arp interval + + -- Duncan Laurie <duncan@sun.com> 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 <duncan@sun.com> Wed, 8 Oct 2003 17:28:51 -0700 + +ipmitool (1.5.0) unstable; urgency=low + + * more robust UDP packet handling + * add Intel IMB driver support + * use autoconf/automake/libtool + + -- Duncan Laurie <duncan@sun.com> 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 <duncan@sun.com> Wed, 2 Apr 2003 17:44:17 -0700 + +ipmitool (1.1-1) unstable; urgency=low + + * Minor fixes. + + -- Duncan Laurie <duncan@sun.com> Tue, 1 Apr 2003 14:31:10 -0700 + +ipmitool (1.0-1) unstable; urgency=low + + * Initial Release. + + -- Duncan Laurie <duncan@sun.com> Sun, 30 Mar 2003 21:30:46 -0700 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..219e010 --- /dev/null +++ b/debian/control @@ -0,0 +1,36 @@ +Source: ipmitool +Section: utils +Priority: optional +Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> +Build-Depends: + autotools-dev, + debhelper (>> 9), + dh-systemd (>= 1.5), + libncurses-dev, + libreadline-dev, + libssl-dev +Standards-Version: 3.9.5 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ipmitool.git +Vcs-Git: git://anonscm.debian.org/collab-maint/ipmitool.git +Homepage: http://sourceforge.net/projects/ipmitool/ + +Package: ipmitool +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 + for monitoring, logging, recovery, inventory, and control of hardware + that is implemented independent of the main CPU, BIOS, and OS. The + service processor (or Baseboard Management Controller, BMC) is the + brain behind platform management and its primary purpose is to handle + the autonomous sensor monitoring and event logging features. + . + The ipmitool program provides a simple command-line interface to this + BMC. It features the ability to read the sensor data repository + (SDR) and print sensor values, display the contents of the System + Event Log (SEL), print Field Replaceable Unit (FRU) inventory + information, read and set LAN configuration parameters, and perform + remote chassis power control. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..eb6858d --- /dev/null +++ b/debian/copyright @@ -0,0 +1,47 @@ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Source: http://sourceforge.net/projects/ipmitool/ + +Files: * +Copyright: 1999-2002 Aladdin Enterprises + 2002-2008 Intel Corporation + 2003 Elmar Hoffmann + 2003-2007 Kontron Canada, Inc. + 2003 Ducan Laurie + 2003-2004 Fredrik Ohrn + 2003-2005 Sun Microsystems, Inc. + 2004-2008 Dell Inc. + 2005 International Business Machines, Inc. + 2005 Tyan Computer Corp + 2009-2014 Oracle and/or its affiliates. + 2012 Hewlett-Packard Development Company, L.P. + 2012 Pigeon Point Systems + 2013 Zdenek Styblik + 2014 Jörg Frings-Fürst +License: BSD-3-clause + +License: BSD-3-clause + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + 2. 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. + 3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..03d0b5b --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +usr/lib/modules-load.d/
\ No newline at end of file diff --git a/debian/ipmitool.ipmievd.default b/debian/ipmitool.ipmievd.default new file mode 100644 index 0000000..0368b6c --- /dev/null +++ b/debian/ipmitool.ipmievd.default @@ -0,0 +1,11 @@ +# This is a shell script fraction + +# +# To enable ipmievd set ENABLED="true" for sysvinit (ignored by systemd) +# +ENABLED="false" + + +# Options to the daemon ipmievd(8). +# +IPMIEVD_OPTIONS="open daemon" diff --git a/debian/ipmitool.ipmievd.init b/debian/ipmitool.ipmievd.init new file mode 100644 index 0000000..62d8d13 --- /dev/null +++ b/debian/ipmitool.ipmievd.init @@ -0,0 +1,125 @@ +#! /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 <elho@elho.net> +# Licence: This script is public domain using the same +# licence as ipmitool itself. +# Modified by: Petter Reinholdtsen +# Jörg Frings-Fürst 2014-06-01 + +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" + +# +# requested kernelmodules +# +REQMODULES="ipmi_devintf ipmi_msghandler ipmi_poweroff ipmi_si ipmi_watchdog" + +# 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 to load requested kernelmodules +do_modprobe() { + if [ -x /sbin/modprobe -a -f /proc/modules ] + then + modprobe -q "$1" || true + 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) + # load kernelmodules + for rmod in ${REQMODULES} + do + do_modprobe ${rmod} + done + [ "$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 diff --git a/debian/ipmitool.ipmievd.service b/debian/ipmitool.ipmievd.service new file mode 120000 index 0000000..1ca4cb1 --- /dev/null +++ b/debian/ipmitool.ipmievd.service @@ -0,0 +1 @@ +systemd/ipmitool.ipmievd.service
\ No newline at end of file diff --git a/debian/ipmitool.postinst b/debian/ipmitool.postinst new file mode 100644 index 0000000..fb978c4 --- /dev/null +++ b/debian/ipmitool.postinst @@ -0,0 +1,17 @@ +#!/bin/sh + +set -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# diff --git a/debian/ipmitool.postrm b/debian/ipmitool.postrm new file mode 100644 index 0000000..6cd9693 --- /dev/null +++ b/debian/ipmitool.postrm @@ -0,0 +1,10 @@ +#!/bin/sh + +set -e + + +ipmievd_initd_failed() { + : +} + +#DEBHELPER# diff --git a/debian/ipmitool.prerm b/debian/ipmitool.prerm new file mode 100644 index 0000000..b45afde --- /dev/null +++ b/debian/ipmitool.prerm @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +ipmievd_initd_failed() { + : +} + +#DEBHELPER# diff --git a/debian/patches/096-manpage_longlines.patch b/debian/patches/096-manpage_longlines.patch new file mode 100644 index 0000000..4acf71a --- /dev/null +++ b/debian/patches/096-manpage_longlines.patch @@ -0,0 +1,56 @@ +Description: long lines in man-page + prevent "can't break line" warnings +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Forwarded: not-needed +Last-Update: 2014-05-20 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/ipmitool.1 +=================================================================== +--- trunk.orig/doc/ipmitool.1 2014-05-27 19:38:41.000000000 +0200 ++++ trunk/doc/ipmitool.1 2014-05-27 19:38:41.000000000 +0200 +@@ -1034,7 +1034,7 @@ + AMC slot B2 topology: + Port 0 =====> On Carrier Device ID 0, Port 3 + Port 2 =====> AMC slot B1, Port 2 +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-* + From Carrier file: carrierfru + On Carrier Device ID 0 topology: + Port 0 =====> AMC slot B1, Port 4 +@@ -1090,7 +1090,7 @@ + \-Link Type: AMC.2 Ethernet + \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link + \-Link Group ID: 0 || Link Asym. Match: exact match +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-* + AMC slot B1 port 1 ==> On-Carrier Device 0 port 12 + Matching Result + - From On-Carrier Device ID 0 +@@ -1103,7 +1103,7 @@ + \-Link Type: AMC.2 Ethernet + \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link + \-Link Group ID: 0 || Link Asym. Match: exact match +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-* + On-Carrier Device vs AMC slot A2 + AMC slot A2 port 0 ==> On-Carrier Device 0 port 3 + Matching Result +@@ -1117,7 +1117,7 @@ + \-Link Type: AMC.2 Ethernet + \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link + \-Link Group ID: 0 || Link Asym. Match: exact match +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-* + AMC slot B1 vs AMC slot A2 + AMC slot A2 port 2 ==> AMC slot B1 port 2 + Matching Result +@@ -1131,7 +1131,7 @@ + \-Link Type: AMC.3 Storage + \-Link Type extension: Serial Attached SCSI (SAS/SATA) + \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match} +- *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* ++ *-*-*-* *-*-* *-*-* *-*-* *-*-* *-*-* *-*-* + .TP + \fIunmatch\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr + .br diff --git a/debian/patches/097-source_typo.patch b/debian/patches/097-source_typo.patch new file mode 100644 index 0000000..1323caf --- /dev/null +++ b/debian/patches/097-source_typo.patch @@ -0,0 +1,27 @@ +Description: typo in source +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Forwarded: https://sourceforge.net/p/ipmitool/patches/101/ +Last-Update: 2014-05-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/ipmi_fwum.c +=================================================================== +--- trunk.orig/lib/ipmi_fwum.c 2014-03-28 13:36:21.000000000 +0100 ++++ trunk/lib/ipmi_fwum.c 2014-05-19 14:58:48.313044838 +0200 +@@ -892,14 +892,14 @@ + } + if (rc == 0) { + if ((address % 1024) == 0) { +- KfwumShowProgress("Writting Firmware in Flash", ++ KfwumShowProgress("Writing Firmware in Flash", + address, totalSize); + } + sequenceNumber++; + } + } while ((rc == 0) && (address < totalSize)); + if (rc == 0) { +- KfwumShowProgress("Writting Firmware in Flash", ++ KfwumShowProgress("Writing Firmware in Flash", + 100, 100); + } + return rc; diff --git a/debian/patches/098-manpage_typo.patch b/debian/patches/098-manpage_typo.patch new file mode 100644 index 0000000..c667278 --- /dev/null +++ b/debian/patches/098-manpage_typo.patch @@ -0,0 +1,245 @@ +Description: typo in man-page +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Last-Update: 2014-05-19 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/doc/ipmitool.1 +=================================================================== +--- trunk.orig/doc/ipmitool.1 2014-05-19 14:51:15.664997239 +0200 ++++ trunk/doc/ipmitool.1 2014-05-19 14:54:07.340072131 +0200 +@@ -10,47 +10,47 @@ + Any recognized option is accepted. Conditional options may be ignored or it's usage postponed until shell or exec processes relevant command. + .br + +-<general-options> := [ -h | -V | -v | -I <interface> | -H <address> | +- -d <N> | -p <port> | -c | -U <username> | +- -L <privlvl> | -l <lun> | -m <local_address> | +- -N <sec> | -R <count> | <password-option> | ++<general\-options> := [ \-h | \-V | \-v | \-I <interface> | \-H <address> | ++ \-d <N> | \-p <port> | \-c | \-U <username> | ++ \-L <privlvl> | \-l <lun> | \-m <local_address> | ++ \-N <sec> | \-R <count> | <password\-option> | + <oem-option> | <bridge-options> ] + +-<conditional-opts> := [ <lan-options> | <lanplus-options> | +- <command-options> ] ++<conditional\-opts> := [ <lan\-options> | <lanplus\-options> | ++ <command\-options> ] + .br + Bridging: + .br +-<bridge-options> := -t <target_address> [ -b <channel> | +- [ -T <address> | -B <channel> ] ] ++<bridge\-options> := \-t <target_address> [ \-b <channel> | ++ [ \-T <address> | \-B <channel> ] ] + .br + +-Options used with -I lan: ++Options used with \-I lan: + .br +-<lan-options> := [ -A <authtype> ] ++<lan\-options> := [ \-A <authtype> ] + .br + +-Options used with -I lanplus: ++Options used with \-I lanplus: + .br +-<lanplus-options> := [ -C <ciphersuite> | <key-option> ] ++<lanplus\-options> := [ \-C <ciphersuite> | <key\-option> ] + .br + + Option groups setting same value: + .br +-<key-option> := [ -k <key> | -K | -y <hex_key> | -Y ] ++<key\-option> := [ \-k <key> | \-K | \-y <hex_key> | \-Y ] + .br +-<password-option> := [ -f <password_file> | -a | -P <password> | -E ] ++<password\-option> := [ \-f <password_file> | \-a | \-P <password> | \-E ] + .br +-<oem-option> := [ -o <oemtype> | -g | -s ] ++<oem\-option> := [ \-o <oemtype> | \-g | \-s ] + .br + + Options used with specific command <command-options>: + .br +-<options-sdr> := [ -S <sdr_cache_file> ] ++<options\-sdr> := [ \-S <sdr_cache_file> ] + .br +-<options-sel> := [ -O <sel_oem> ] ++<options\-sel> := [ \-O <sel_oem> ] + .br +-<options-sol> := [ -e <sol_escape_char> ] ++<options\-sol> := [ \-e <sol_escape_char> ] + + + .SH "DESCRIPTION" +@@ -120,7 +120,7 @@ + will default to NULL. + .TP + \fB\-g\fR +-Deprecated. Use: -o intelplus ++Deprecated. Use: \-o intelplus + .TP + \fB\-h\fR + Get basic usage help from the command line. +@@ -151,7 +151,7 @@ + .TP + \fB\-m\fR <\fIlocal_address\fP> + Set the local IPMB address. The local address defaults to 0x20 +-or is auto discovered on PICMG platforms when -m is not specified. ++or is auto discovered on PICMG platforms when \-m is not specified. + There should be no need to change the local address for normal operation. + .TP + \fB\-N\fR <\fIsec\fP> +@@ -185,7 +185,7 @@ + Command \fIhpm\fP uses fixed value of 10 retries. + .TP + \fB\-s\fR +-Deprecated. Use: -o supermicro ++Deprecated. Use: \-o supermicro + .TP + \fB\-S\fR <\fIsdr_cache_file\fP> + Use local file for remote SDR cache. Using a local SDR cache +@@ -223,7 +223,7 @@ + \fB\-y\fR <\fIhex key\fP> + Use supplied Kg key for IPMIv2.0 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 ++characters. E.g. '\-k PASSWORD' and '\-y 50415353574F5244' are + equivalent. + The default is not to use any Kg key. + .TP +@@ -1051,7 +1051,7 @@ + \fIpower\fP <\fBxx=filename1\fR> <\fBxx=filename2\fR> \fB...\fr + .br + +-Display power supply informations between carrier and AMC modules. ++Display power supply information between carrier and AMC modules. + .TP + \fIall\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr + .br +@@ -1063,7 +1063,7 @@ + .TP + \fIfrushow\fP <\fBxx=filename\fR> + .br +-Convert a binary FRU file into human readable text format. Use -v option to get ++Convert a binary FRU file into human readable text format. Use \-v option to get + more display information. + + .RE +@@ -1081,56 +1081,56 @@ + AMC slot B1 port 0 ==> On-Carrier Device 0 port 16 + Matching Result + - From On-Carrier Device ID 0 +- -Channel ID 11 || Lane 0: enable +- -Link Type: AMC.2 Ethernet +- -Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link +- -Link Group ID: 0 || Link Asym. Match: exact match ++ \-Channel ID 11 || Lane 0: enable ++ \-Link Type: AMC.2 Ethernet ++ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link ++ \-Link Group ID: 0 || Link Asym. Match: exact match + - To AMC slot B1 +- -Channel ID 0 || Lane 0: enable +- -Link Type: AMC.2 Ethernet +- -Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link +- -Link Group ID: 0 || Link Asym. Match: exact match ++ \-Channel ID 0 || Lane 0: enable ++ \-Link Type: AMC.2 Ethernet ++ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link ++ \-Link Group ID: 0 || Link Asym. Match: exact match + *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + AMC slot B1 port 1 ==> On-Carrier Device 0 port 12 + Matching Result + - From On-Carrier Device ID 0 +- -Channel ID 6 || Lane 0: enable +- -Link Type: AMC.2 Ethernet +- -Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link +- -Link Group ID: 0 || Link Asym. Match: exact match ++ \-Channel ID 6 || Lane 0: enable ++ \-Link Type: AMC.2 Ethernet ++ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link ++ \-Link Group ID: 0 || Link Asym. Match: exact match + - To AMC slot B1 +- -Channel ID 1 || Lane 0: enable +- -Link Type: AMC.2 Ethernet +- -Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link +- -Link Group ID: 0 || Link Asym. Match: exact match ++ \-Channel ID 1 || Lane 0: enable ++ \-Link Type: AMC.2 Ethernet ++ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link ++ \-Link Group ID: 0 || Link Asym. Match: exact match + *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + On-Carrier Device vs AMC slot A2 + AMC slot A2 port 0 ==> On-Carrier Device 0 port 3 + Matching Result + - From On-Carrier Device ID 0 +- -Channel ID 9 || Lane 0: enable +- -Link Type: AMC.2 Ethernet +- -Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link +- -Link Group ID: 0 || Link Asym. Match: exact match ++ \-Channel ID 9 || Lane 0: enable ++ \-Link Type: AMC.2 Ethernet ++ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link ++ \-Link Group ID: 0 || Link Asym. Match: exact match + - To AMC slot A2 +- -Channel ID 0 || Lane 0: enable +- -Link Type: AMC.2 Ethernet +- -Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link +- -Link Group ID: 0 || Link Asym. Match: exact match ++ \-Channel ID 0 || Lane 0: enable ++ \-Link Type: AMC.2 Ethernet ++ \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link ++ \-Link Group ID: 0 || Link Asym. Match: exact match + *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + AMC slot B1 vs AMC slot A2 + AMC slot A2 port 2 ==> AMC slot B1 port 2 + Matching Result + - From AMC slot B1 +- -Channel ID 2 || Lane 0: enable +- -Link Type: AMC.3 Storage +- -Link Type extension: Serial Attached SCSI (SAS/SATA) +- -Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match} ++ \-Channel ID 2 || Lane 0: enable ++ \-Link Type: AMC.3 Storage ++ \-Link Type extension: Serial Attached SCSI (SAS/SATA) ++ \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match} + - To AMC slot A2 +- -Channel ID 2 || Lane 0: enable +- -Link Type: AMC.3 Storage +- -Link Type extension: Serial Attached SCSI (SAS/SATA) +- -Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match} ++ \-Channel ID 2 || Lane 0: enable ++ \-Link Type: AMC.3 Storage ++ \-Link Type extension: Serial Attached SCSI (SAS/SATA) ++ \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match} + *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* + .TP + \fIunmatch\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr +@@ -2981,7 +2981,7 @@ + + Execute the service processor command line interface commands. + Without any command string, an interactive session is started +-in the service processor command line environ ment. If a ++in the service processor command line environment. If a + command string is specified, the command string is executed + on the service processor and the connection is closed. + .TP +@@ -3376,7 +3376,7 @@ + The ipmitool \fIfree\fP interface utilizes the FreeIPMI libfreeipmi + drivers. + .LP +-You can tell ipmitool to use the FreeIPMI interface with the -I option: ++You can tell ipmitool to use the FreeIPMI interface with the \-I option: + .PP + ipmitool \fB\-I\fR \fIfree\fP <\fIcommand\fP> + +@@ -3386,7 +3386,7 @@ + The ipmitool \fIimb\fP interface supports the Intel IMB (Intel + Inter-module Bus) Interface through the /dev/imb device. + .LP +-You can tell ipmitool to use the IMB interface with the -I option: ++You can tell ipmitool to use the IMB interface with the \-I option: + .PP + ipmitool \fB\-I\fR \fIimb\fP <\fIcommand\fP> + diff --git a/debian/patches/099_readme_typo b/debian/patches/099_readme_typo new file mode 100644 index 0000000..732fc43 --- /dev/null +++ b/debian/patches/099_readme_typo @@ -0,0 +1,25 @@ +## 99_readme_typo.dpatch by dann frazier <dannf@hp.com> +## +## 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 diff --git a/debian/patches/101_fix_buf_overflow.patch b/debian/patches/101_fix_buf_overflow.patch new file mode 100644 index 0000000..68f05d8 --- /dev/null +++ b/debian/patches/101_fix_buf_overflow.patch @@ -0,0 +1,22 @@ +Description: fix buffer overflow + based on 101_fix_buf_overflow from Leo Iannacone <l3on@ubuntu.com> +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Bug: TSOL buffer overflow +Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/633054 +Forwarded: https://sourceforge.net/p/ipmitool/patches/100/ +Last-Update: 2014-05-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/ipmi_tsol.c +=================================================================== +--- trunk.orig/lib/ipmi_tsol.c 2014-05-18 19:36:46.059192272 +0200 ++++ trunk/lib/ipmi_tsol.c 2014-05-18 19:37:36.028189246 +0200 +@@ -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; diff --git a/debian/patches/112_fix_CVE-2011-4339.patch b/debian/patches/112_fix_CVE-2011-4339.patch new file mode 100644 index 0000000..f67b845 --- /dev/null +++ b/debian/patches/112_fix_CVE-2011-4339.patch @@ -0,0 +1,21 @@ +Description: CVE-2011-4339 + insecure file permission when creating PID files + based on 112_fix_CVE-2011-4339 +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651917 +Forwarded: https://sourceforge.net/p/ipmitool/patches/99/ +Last-Update: 2014-05-18 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/helper.c +=================================================================== +--- trunk.orig/lib/helper.c 2014-05-18 18:50:55.000000000 +0200 ++++ trunk/lib/helper.c 2014-05-18 19:30:41.275908129 +0200 +@@ -657,7 +657,6 @@ + #endif + + chdir("/"); +- umask(0); + + for (fd=0; fd<64; fd++) { + if (fd != intf->fd) diff --git a/debian/patches/115-lib_declarations.patch b/debian/patches/115-lib_declarations.patch new file mode 100644 index 0000000..8fc1356 --- /dev/null +++ b/debian/patches/115-lib_declarations.patch @@ -0,0 +1,23 @@ +Description: Correct function declarations +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749913 +Last-Update: 2014-05-31 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/ipmi_kontronoem.c +=================================================================== +--- trunk.orig/lib/ipmi_kontronoem.c 2014-03-28 13:36:21.000000000 +0100 ++++ trunk/lib/ipmi_kontronoem.c 2014-05-31 10:25:10.583475442 +0200 +@@ -53,9 +53,9 @@ + uint8_t id, uint32_t offset, uint32_t length, + uint8_t *frubuf); + extern int write_fru_area(struct ipmi_intf * intf, struct fru_info *fru, +- unsigned char id, unsigned int soffset, +- unsigned int doffset, unsigned int length, +- unsigned char *pFrubuf); ++ uint8_t id, uint16_t soffset, ++ uint16_t doffset, uint16_t length, ++ uint8_t *pFrubuf); + + extern char * get_fru_area_str(uint8_t * data, uint32_t * offset); + diff --git a/debian/patches/120-Dell-13G.patch b/debian/patches/120-Dell-13G.patch new file mode 100644 index 0000000..0f4ef9b --- /dev/null +++ b/debian/patches/120-Dell-13G.patch @@ -0,0 +1,401 @@ +Description: Add support for Dell 13G server. + Add support for upcoming Dell PowerEdge 13G server + and replace multiple if statments. + Based on patch from SriniG <srinivas_g_gowda@dell.com> +Author: Jörg Frings-Fürst <debian@jff-webhosting.net> +Origin: based on patch from SriniG <srinivas_g_gowda@dell.com> +Bug: http://sourceforge.net/p/ipmitool/patches/102/ +Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756555 +Forwarded: http://sourceforge.net/p/ipmitool/patches/102/ +Reviewed-by: 2014-08-07 SriniG <srinivas_g_gowda@dell.com> +Last-Update: 2014-08-07 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/include/ipmitool/ipmi_delloem.h +=================================================================== +--- trunk.orig/include/ipmitool/ipmi_delloem.h 2014-08-04 17:24:11.291429804 +0200 ++++ trunk/include/ipmitool/ipmi_delloem.h 2014-08-04 17:24:11.279429542 +0200 +@@ -72,6 +72,7 @@ + + #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 @@ + #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 +Index: trunk/lib/ipmi_delloem.c +=================================================================== +--- trunk.orig/lib/ipmi_delloem.c 2014-08-04 17:24:11.291429804 +0200 ++++ trunk/lib/ipmi_delloem.c 2014-08-04 17:24:11.279429542 +0200 +@@ -123,6 +123,16 @@ + + static int current_arg =0; + uint8_t iDRAC_FLAG=0; ++ ++/* ++ * new flags for ++ * 11G || 12G || 13G -> _ALL ++ * 12G || 13G -> _12_13 ++ * ++ */ ++uint8_t iDRAC_FLAG_ALL=0; ++uint8_t iDRAC_FLAG_12_13=0; ++ + LCD_MODE lcd_mode; + static uint8_t LcdSupported=0; + static uint8_t SetLEDSupported=0; +@@ -358,7 +368,7 @@ + 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_ALL) { + rc = ipmi_lcd_get_info_wh(intf); + } else { + rc = ipmi_lcd_get_info(intf); +@@ -392,7 +402,7 @@ + } + } + if ((strncmp(argv[current_arg], "mode\0", 5) == 0) +- && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) { ++ && (iDRAC_FLAG_ALL)) { + current_arg++; + if (argc <= current_arg) { + ipmi_lcd_usage(); +@@ -446,7 +456,7 @@ + ipmi_lcd_usage(); + } + } else if ((strncmp(argv[current_arg], "lcdqualifier\0", 13) == 0) +- && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) { ++ && (iDRAC_FLAG_ALL)) { + current_arg++; + if (argc <= current_arg) { + ipmi_lcd_usage(); +@@ -470,7 +480,7 @@ + ipmi_lcd_usage(); + } + } else if ((strncmp(argv[current_arg], "errordisplay\0", 13) == 0) +- && ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) { ++ && (iDRAC_FLAG_ALL)) { + current_arg++; + if (argc <= current_arg) { + ipmi_lcd_usage(); +@@ -635,17 +645,33 @@ + val2str(rsp->ccode, completion_code_vals)); */ + return -1; + } ++ /* ++ * Set the new flags to 0 ++ */ ++ iDRAC_FLAG_ALL = 0; ++ iDRAC_FLAG_12_13 = 0; + /* Support the 11G Monolithic, modular, Maisy and Coaster */ + if ((IMC_IDRAC_11G_MONOLITHIC == data[10]) + || (IMC_IDRAC_11G_MODULAR == data[10]) + || (IMC_MASER_LITE_BMC == data[10]) + || (IMC_MASER_LITE_NU == data[10])) { + iDRAC_FLAG=IDRAC_11G; ++ iDRAC_FLAG_ALL = 1; + } else if((IMC_IDRAC_12G_MONOLITHIC == data[10]) + || (IMC_IDRAC_12G_MODULAR == data[10])) { + iDRAC_FLAG = IDRAC_12G; ++ iDRAC_FLAG_ALL = 1; ++ iDRAC_FLAG_12_13 = 1; ++ } else if( (IMC_IDRAC_13G_MONOLITHIC == data[10]) ++ || (IMC_IDRAC_13G_MODULAR == data[10]) ++ || (IMC_IDRAC_13G_DCS == data[10]) ) { ++ iDRAC_FLAG=IDRAC_13G; ++ iDRAC_FLAG_ALL = 1; ++ iDRAC_FLAG_12_13 = 1; + } else { + iDRAC_FLAG = 0; ++ iDRAC_FLAG_ALL = 0; ++ iDRAC_FLAG_12_13 = 0; + } + IMC_Type = data[10]; + return 0; +@@ -1394,7 +1420,7 @@ + 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 +1587,9 @@ + 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 +1627,9 @@ + } 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 +1699,9 @@ + } 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 +1913,8 @@ + || 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 +1982,7 @@ + ipmi_lan_usage(); + return -1; + } +- if (iDRAC_FLAG == IDRAC_12G) { ++ if (iDRAC_FLAG_12_13) { + nic_selection = get_nic_selection_mode_12g(intf, current_arg, argv, + nic_set); + if (INVALID == nic_selection) { +@@ -2063,7 +2099,7 @@ + } + 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 +2118,7 @@ + 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 +2137,7 @@ + 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 +2156,7 @@ + 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 +2175,7 @@ + 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 +2195,7 @@ + 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 +2278,8 @@ + 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_12_13 ) ++ && (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 +2334,7 @@ + input_length = 0; + req.msg.netfn = DELL_OEM_NETFN; + req.msg.lun = 0; +- if (iDRAC_FLAG == IDRAC_12G) { ++ if( iDRAC_FLAG_12_13 ) { + req.msg.cmd = GET_NIC_SELECTION_12G_CMD; + } else { + req.msg.cmd = GET_NIC_SELECTION_CMD; +@@ -2314,7 +2351,7 @@ + return -1; + } + nic_selection = rsp->data[0]; +- if (iDRAC_FLAG == IDRAC_12G) { ++ if( iDRAC_FLAG_12_13 ) { + nic_selection_failover = rsp->data[1]; + if ((nic_selection < 6) && (nic_selection > 0) + && (nic_selection_failover < 7)) { +@@ -2413,7 +2450,7 @@ + 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 +2470,7 @@ + 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 +2699,7 @@ + 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_12_13 ) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; /* Return Error as unlicensed */ +@@ -2713,7 +2750,7 @@ + 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_12_13) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; /* return unlicensed Error code */ +@@ -2807,7 +2844,7 @@ + return -1; + } + +- if((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { ++ if((iDRAC_FLAG_12_13) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -2910,7 +2947,7 @@ + if (rsp == NULL) { + lprintf(LOG_ERR, "Error clearing power values."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) ++ } else if ((iDRAC_FLAG_12_13) + && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +@@ -2988,7 +3025,7 @@ + if (rsp == NULL) { + lprintf(LOG_ERR, "Error getting power headroom status"); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) ++ } else if ((iDRAC_FLAG_12_13) + && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +@@ -3122,7 +3159,7 @@ + if (rsp == NULL) { + lprintf(LOG_ERR, "Error getting instantaneous power consumption data ."); + return -1; +- } else if ((iDRAC_FLAG == IDRAC_12G) ++ } else if ((iDRAC_FLAG_12_13) + && (rsp->ccode == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); +@@ -3215,7 +3252,7 @@ + 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_12_13) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3264,7 +3301,7 @@ + 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_12_13) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3321,7 +3358,7 @@ + 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_12_13) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3518,7 +3555,7 @@ + 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_12_13) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3618,7 +3655,7 @@ + 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_12_13) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3698,7 +3735,7 @@ + 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_12_13) && (rc == LICENSE_NOT_SUPPORTED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); + return -1; +@@ -3860,7 +3897,7 @@ + + sdcardinfoblock = (IPMI_DELL_SDCARD_INFO *) (void *) rsp->data; + +- if ((iDRAC_FLAG == IDRAC_12G) ++ if ((iDRAC_FLAG_12_13) + && (sdcardinfoblock->vflashcompcode == VFL_NOT_LICENSED)) { + lprintf(LOG_ERR, + "FM001 : A required license is missing or expired"); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..1239814 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,8 @@ +120-Dell-13G.patch +115-lib_declarations.patch +097-source_typo.patch +098-manpage_typo.patch +101_fix_buf_overflow.patch +112_fix_CVE-2011-4339.patch +099_readme_typo +096-manpage_longlines.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..f2c9474 --- /dev/null +++ b/debian/rules @@ -0,0 +1,31 @@ +#!/usr/bin/make -f + +#include /usr/share/quilt/quilt.make + +#export DH_VERBOSE=1 +export DH_OPTIONS + +# +# Hardening +# +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk + + + +%: + dh $@ --with systemd + +override_dh_auto_install: + dh_auto_install + cp -f $(CURDIR)/debian/systemd/ipmitool.conf $(CURDIR)/debian/ipmitool/usr/lib/modules-load.d/ipmievd.conf + # No need to have two copies of the license text/changelog in the package. + $(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/COPYING + $(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog + +override_dh_installinit: + dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed + +override_dh_auto_configure: + dh_auto_configure -- --prefix=/usr --with-kerneldir --mandir=/usr/share/man diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 0000000..22a4de9 --- /dev/null +++ b/debian/source/options @@ -0,0 +1,2 @@ +compression = xz +compression-level = 9 diff --git a/debian/systemd/ipmitool.conf b/debian/systemd/ipmitool.conf new file mode 100644 index 0000000..cdfba64 --- /dev/null +++ b/debian/systemd/ipmitool.conf @@ -0,0 +1,7 @@ +# systemd kernelmodules for ipmitools +# +ipmi_devintf +ipmi_msghandler +ipmi_poweroff +ipmi_si +ipmi_watchdog diff --git a/debian/systemd/ipmitool.ipmievd.service b/debian/systemd/ipmitool.ipmievd.service new file mode 100644 index 0000000..e7a8528 --- /dev/null +++ b/debian/systemd/ipmitool.ipmievd.service @@ -0,0 +1,11 @@ +[Unit] +Description=IPMI event daemon + +[Service] +Type=forking +EnvironmentFile=-/etc/default/ipmievd +ExecStart=/usr/sbin/ipmievd $IPMIEVD_OPTIONS + +[Install] +WantedBy=multi-user.target +Alias=ipmi.service diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..d6990ab --- /dev/null +++ b/debian/watch @@ -0,0 +1,3 @@ +version=3 +opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$// \ +http://sf.net/ipmitool/ipmitool-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2) debian uupdate |