From 1acb8ee5140d8a2d474700987435bc0630cb24f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:07:04 +0200 Subject: New maintainer --- debian/changelog | 372 +++++++++++++++++++++++------ debian/compat | 1 + debian/control | 22 +- debian/copyright | 77 +++--- debian/dirs | 5 +- debian/ipmitool.ipmievd.default | 11 + debian/ipmitool.ipmievd.init | 125 ++++++++++ debian/ipmitool.ipmievd.service | 1 + debian/ipmitool.postinst | 17 ++ debian/ipmitool.postrm | 10 + debian/ipmitool.prerm | 9 + debian/patches/096-manpage_longlines.patch | 56 +++++ debian/patches/097-source_typo.patch | 27 +++ debian/patches/098-manpage_typo.patch | 245 +++++++++++++++++++ debian/patches/099_readme_typo | 25 ++ debian/patches/101_fix_buf_overflow.patch | 22 ++ debian/patches/112_fix_CVE-2011-4339.patch | 21 ++ debian/patches/115-lib_declarations.patch | 23 ++ debian/patches/series | 7 + debian/rules | 119 ++------- debian/source/format | 1 + debian/source/options | 2 + debian/systemd/ipmitool.conf | 7 + debian/systemd/ipmitool.ipmievd.service | 11 + debian/watch | 3 + 25 files changed, 1006 insertions(+), 213 deletions(-) create mode 100644 debian/compat create mode 100644 debian/ipmitool.ipmievd.default create mode 100644 debian/ipmitool.ipmievd.init create mode 120000 debian/ipmitool.ipmievd.service create mode 100644 debian/ipmitool.postinst create mode 100644 debian/ipmitool.postrm create mode 100644 debian/ipmitool.prerm create mode 100644 debian/patches/096-manpage_longlines.patch create mode 100644 debian/patches/097-source_typo.patch create mode 100644 debian/patches/098-manpage_typo.patch create mode 100644 debian/patches/099_readme_typo create mode 100644 debian/patches/101_fix_buf_overflow.patch create mode 100644 debian/patches/112_fix_CVE-2011-4339.patch create mode 100644 debian/patches/115-lib_declarations.patch create mode 100644 debian/patches/series create mode 100644 debian/source/format create mode 100644 debian/source/options create mode 100644 debian/systemd/ipmitool.conf create mode 100644 debian/systemd/ipmitool.ipmievd.service create mode 100644 debian/watch (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 449d067..bd824c2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,60 +1,290 @@ -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 - - -- Petter Reinholdtsen Wed, 25 Feb 2009 09:44:31 +0200 - -ipmitool (1.8.10) unstable; urgency=low +ipmitool (1.8.14-3) unstable; urgency=medium - * New upstream version. - * Patch to allow Debian package builds from cvs. + * move ipmitool.conf + from /etc/modules-load.d + to /usr/lib/modules-load.d ( Closes: #753762 ) + + -- Jörg Frings-Fürst 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 ] + * changes on systemd startup scripts ( Closes: #750003 ) + + -- Jörg Frings-Fürst 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 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 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 +392,14 @@ ipmitool (1.8.0) unstable; urgency=low * 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 +415,7 @@ ipmitool (1.7.0) unstable; urgency=low * 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 +458,7 @@ ipmitool (1.5.9) unstable; urgency=low * 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 +472,7 @@ ipmitool (1.5.8) unstable; urgency=low * 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 +481,7 @@ ipmitool (1.5.7) unstable; urgency=low * 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 +490,40 @@ ipmitool (1.5.6) unstable; urgency=low * 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 +531,24 @@ ipmitool (1.5.0) unstable; urgency=low * 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 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 index 80725ab..219e010 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,23 @@ 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: Jörg Frings-Fürst +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: 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 diff --git a/debian/copyright b/debian/copyright index cb3569d..eb6858d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,36 +1,47 @@ -This package was debianized by Duncan Laurie before -2003-11-18 17:55:21 +0100. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Source: http://sourceforge.net/projects/ipmitool/ -It was downloaded from +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 -Upstream Author: Duncan Laurie - -Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. +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. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -Redistribution of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -Redistribution 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 Sun Microsystems, Inc. or the names of -contributors may be used to endorse or promote products derived -from this software without specific prior written permission. - -This software is provided "AS IS," without a warranty of any kind. -ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, -INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A -PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED. -SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE -FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING -OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. IN NO EVENT WILL -SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, -OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR -PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF -LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, -EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. diff --git a/debian/dirs b/debian/dirs index 58600cc..03d0b5b 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,4 +1 @@ -usr/bin -usr/sbin -usr/share/ipmitool -usr/share/doc/ipmitool +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 +# 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 +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 +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 +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 + +- := [ -h | -V | -v | -I | -H
| +- -d | -p | -c | -U | +- -L | -l | -m | +- -N | -R | | ++ := [ \-h | \-V | \-v | \-I | \-H
| ++ \-d | \-p | \-c | \-U | ++ \-L | \-l | \-m | ++ \-N | \-R | | + | ] + +- := [ | | +- ] ++ := [ | | ++ ] + .br + Bridging: + .br +- := -t [ -b | +- [ -T
| -B ] ] ++ := \-t [ \-b | ++ [ \-T
| \-B ] ] + .br + +-Options used with -I lan: ++Options used with \-I lan: + .br +- := [ -A ] ++ := [ \-A ] + .br + +-Options used with -I lanplus: ++Options used with \-I lanplus: + .br +- := [ -C | ] ++ := [ \-C | ] + .br + + Option groups setting same value: + .br +- := [ -k | -K | -y | -Y ] ++ := [ \-k | \-K | \-y | \-Y ] + .br +- := [ -f | -a | -P | -E ] ++ := [ \-f | \-a | \-P | \-E ] + .br +- := [ -o | -g | -s ] ++ := [ \-o | \-g | \-s ] + .br + + Options used with specific command : + .br +- := [ -S ] ++ := [ \-S ] + .br +- := [ -O ] ++ := [ \-O ] + .br +- := [ -e ] ++ := [ \-e ] + + + .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 +## +## 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 +Author: Jörg Frings-Fürst +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 +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 +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/series b/debian/patches/series new file mode 100644 index 0000000..bc270d8 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +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 index 96a6920..320b420 100755 --- a/debian/rules +++ b/debian/rules @@ -1,9 +1,17 @@ #!/usr/bin/make -f +#include /usr/share/quilt/quilt.make + #export DH_VERBOSE=1 -export DH_COMPAT=4 export DH_OPTIONS +# +# Hardening +# +export DEB_BUILD_HARDENING=1 + + + CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) @@ -15,104 +23,19 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif -configure: configure-stamp -configure-stamp: - dh_testdir - - ./bootstrap - - ./configure --prefix=/usr \ - --with-kerneldir \ - --mandir=/usr/share/man - touch configure-stamp - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: configure-stamp - -# Add here commands to compile the arch part of the package. - $(MAKE) - -build-indep: build-indep-stamp -build-indep-stamp: configure-stamp - -# Add here commands to compile the indep part of the package. -#$(MAKE) doc +%: + dh $@ --with systemd -clean: - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp configure-stamp - -# Add here commands to clean up after the build process. - -$(MAKE) distclean - - dh_clean - -install: install-arch #install-indep -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - -# Add here commands to install the indep part of the package into -# debian/-doc. -#INSTALLDOC# -# $(MAKE) install-doc DESTDIR=$(CURDIR)/debian/tmp/ipmitool-doc -# dh_movefiles -i - -install-arch: - dh_testdir - dh_testroot - dh_clean -k -a - dh_installdirs -a - -# Add here commands to install the arch part of the package into -# debian/tmp. - $(MAKE) install DESTDIR=$(CURDIR)/debian/ipmitool - - # No need to have two copies of the license text in the package. +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 - # Move upstream changelog to correct filename. - mv $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog \ - $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog - - # Compress to avoid lintian warning. Not sure why dh_compress - # isn't fixing this. - gzip -9 $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/changelog - -# dh_movefiles -a -# Must not depend on anything. This is to be called by -# binary-arch/binary-multi -# in another 'make' thread. -binary-common: - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs - dh_installinit --name ipmievd - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_shlibdeps - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -binary: binary-arch #binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure +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 -- cgit v1.2.3