Imported Upstream version 1.8.14upstream/1.8.14

16 files changed, 115 insertions, 381 deletions

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c839da7..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,2 +0,0 @@
-More information on how to use quilt can be found in:
-/usr/share/doc/quilt/README.source
diff --git a/debian/changelog b/debian/changelog
index afd483f..449d067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,113 +1,60 @@
-ipmitool (1.8.11-4) unstable; urgency=low
+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 <pere@debian.org>  Wed, 25 Feb 2009 09:44:31 +0200
+
+ipmitool (1.8.10) 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-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-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-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.
+  * New upstream version.
+  * Patch to allow Debian package builds from cvs.
 
- -- Petter Reinholdtsen <pere@debian.org>  Fri, 29 Sep 2006 19:16:41 +0200
+ -- Petter Reinholdtsen <pere@debian.org>  Fri,  8 Aug 2008 09:44:31 +0200
 
 ipmitool (1.8.7-2) unstable; urgency=low
 
@@ -215,14 +162,14 @@ ipmitool (1.8.0) unstable; urgency=low
   * Fix chassis boot parameter support
   * Add support for linear sensors
 
- -- Duncan Laurie <duncan@iceblink.org>  Wed, 16 Mar 2005 17:08:12 -0700
+ -- Duncan Laurie <duncan@iceblink.org>  Wed, Mar 16 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
+ -- Seth Goldberg <sethmeisterg@hotmail.com>  Mon, Mar 7 2005 18:03:00 -0800
 
 ipmitool (1.7.0) unstable; urgency=low
 
@@ -238,7 +185,7 @@ ipmitool (1.7.0) unstable; urgency=low
   * 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
+ -- Duncan Laurie <duncan@iceblink.org>  Fri, Jan 7 2005 19:58:22 -0700
 
 ipmitool (1.6.2) unstable; urgency=low
 
@@ -281,7 +228,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 <duncan@sun.com>  Sat, 27 Mar 2004 00:11:37 -0700
+ -- Duncan Laurie <duncan@iceblink.org>  Sat, 27 Mar 2004 00:11:37 -0700
 
 ipmitool (1.5.8) unstable; urgency=low
 
@@ -295,7 +242,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 <duncan@sun.com>  Tue, 27 Jan 2004 16:23:25 -0700
+ -- Duncan Laurie <duncan@iceblink.org>  Tue, 27 Jan 2004 16:23:25 -0700
 
 ipmitool (1.5.7) unstable; urgency=low
 
@@ -304,7 +251,7 @@ ipmitool (1.5.7) unstable; urgency=low
   * better handling of SDR printing
   * contrib scripts for creating rrdtool graphs
 
- -- Duncan Laurie <duncan@sun.com>  Mon,  5 Jan 2004 17:29:50 -0700
+ -- Duncan Laurie <duncan@iceblink.org>  Mon,  5 Jan 2004 17:29:50 -0700
 
 ipmitool (1.5.6) unstable; urgency=low
 
@@ -313,40 +260,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 <duncan@sun.com>  Thu,  4 Dec 2003 14:47:19 -0700
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  Wed,  8 Oct 2003 17:28:51 -0700
 
 ipmitool (1.5.0) unstable; urgency=low
 
@@ -354,24 +301,24 @@ ipmitool (1.5.0) unstable; urgency=low
   * add Intel IMB driver support
   * use autoconf/automake/libtool
 
- -- Duncan Laurie <duncan@sun.com>  Fri,  5 Sep 2003 11:57:32 -0700
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  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
+ -- Duncan Laurie <duncan@iceblink.org>  Sun, 30 Mar 2003 21:30:46 -0700
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/control b/debian/control
index fe27bd9..80725ab 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,14 @@
 Source: ipmitool
 Section: utils
 Priority: optional
-Maintainer: Matthew Johnson <mjj29@debian.org>
-Uploaders: Luk Claes <luk@debian.org>
-Build-Depends: debhelper (>> 5.0.0), libreadline-dev, libssl-dev, quilt, autotools-dev
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ipmitool.git
-Vcs-Git: git://anonscm.debian.org/git/collab-maint/ipmitool.git
-Standards-Version: 3.8.0
+Maintainer: Petter Reinholdtsen <pere@debian.org>
+Uploaders: Duncan Laurie <duncan@iceblink.org>
+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
 
 Package: ipmitool
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base
+Architecture: i386 amd64 ia64
+Depends: ${shlibs:Depends}, lsb-base
 Suggests: openipmi
 Description: utility for IPMI control with kernel driver or LAN interface
  A utility for managing and configuring devices that support the
diff --git a/debian/dirs b/debian/dirs
index acc4e39..58600cc 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,3 +1,4 @@
 usr/bin
 usr/sbin
+usr/share/ipmitool
 usr/share/doc/ipmitool
diff --git a/debian/ipmitool.ipmievd.init b/debian/ipmitool.ipmievd.init
deleted file mode 100644
index a0c5f20..0000000
--- a/debian/ipmitool.ipmievd.init
+++ /dev/null
@@ -1,105 +0,0 @@
-#! /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
-
-set -e
-
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DESC="IPMI event daemon"
-NAME=ipmievd
-DAEMON=/usr/sbin/$NAME
-PIDFILE=/var/run/$NAME.pid0
-SCRIPTNAME=/etc/init.d/$NAME
-ENABLED=true
-
-# Gracefully exit if the package has been removed.
-test -x $DAEMON || exit 0
-
-. /lib/lsb/init-functions
-test -r /etc/default/rcS && . /etc/default/rcS
-
-# Options used by ipmievd.
-#
-# "open" uses the asynchronous event notification from the OpenIPMI
-# kernel driver, "sel" uses active polling of the contents of the SEL
-# for new events.
-#
-# Need to force 'daemon' mode, to make sure messages are sent to
-# syslog and the program forks into the background.
-#
-# Se ipmievd(8) for more info.
-IPMIEVD_OPTIONS="open daemon"
-
-# Read config file if it is present.
-[ -f /etc/default/$NAME ] && . /etc/default/$NAME
-
-test "$ENABLED" != "false" || exit 0
-
-# Backwards compatibility with version 1.8.6-2 and 1.8.6-1.  The
-# variable was renamed to be compatible with upstream, SuSe and RedHat.
-if [ -n "$IPMIEVD_OPTS" ]; then
-    echo "warning: /etc/default/$NAME variable IPMIEVD_OPTS should be renamed to IPMIEVD_OPTIONS"
-    IPMIEVD_OPTIONS="$IPMIEVD_OPTS"
-fi
-
-#
-#	Function that starts the daemon/service.
-#
-d_start() {
-	start-stop-daemon --start --quiet --exec $DAEMON --pidfile $PIDFILE -- $IPMIEVD_OPTIONS
-}
-
-#
-#	Function that stops the daemon/service.
-#
-d_stop() {
-	start-stop-daemon --stop --oknodo --quiet --name $NAME --exec $DAEMON --pidfile $PIDFILE 
-}
-
-CODE=0
-
-case "$1" in
-  start)
-	[ "$VERBOSE" != no ] && log_begin_msg "Starting $DESC" "$NAME"
-	d_start || CODE=$?
-	[ "$VERBOSE" != no ] && log_end_msg $CODE
-	exit $CODE
-	;;
-  stop)
-	log_begin_msg "Stopping $DESC" "$NAME"
-	d_stop || CODE=$?
-	log_end_msg $CODE
-	exit $CODE
-	;;
-  restart|force-reload)
-	log_begin_msg "Restarting $DESC" "$NAME"
-	d_stop || true
-	sleep 1
-	d_start || CODE=$?
-	log_end_msg $CODE
-	exit $CODE
-	;;
-  status)
-	status_of_proc $DAEMON $NAME
-	;;
-  *)
-	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
-	exit 1
-	;;
-esac
-
-exit 0
diff --git a/debian/ipmitool.postinst b/debian/ipmitool.postinst
deleted file mode 100644
index 125653a..0000000
--- a/debian/ipmitool.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-ipmievd_initd_failed() {
-	echo "Unable to start ipmievd during installation.  Trying to disable."
-	if [ -f /etc/default/ipmievd ] && \
-           grep -q ^ENABLED=false /etc/default/ipmievd ; then
-	    :
-	else
-	    touch /etc/default/ipmievd
-	    echo "ENABLED=false" >> /etc/default/ipmievd
-	fi
-}
-
-#DEBHELPER#
diff --git a/debian/ipmitool.postrm b/debian/ipmitool.postrm
deleted file mode 100644
index 7ad5024..0000000
--- a/debian/ipmitool.postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-ipmievd_initd_failed() {
-    :
-}
-
-#DEBHELPER#
diff --git a/debian/ipmitool.prerm b/debian/ipmitool.prerm
deleted file mode 100644
index 7ad5024..0000000
--- a/debian/ipmitool.prerm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh -e
-
-ipmievd_initd_failed() {
-    :
-}
-
-#DEBHELPER#
diff --git a/debian/patches/101_fix_buf_overflow b/debian/patches/101_fix_buf_overflow
deleted file mode 100644
index 56b2d89..0000000
--- a/debian/patches/101_fix_buf_overflow
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naurp ipmitool-1.8.11.orig//lib/ipmi_tsol.c ipmitool-1.8.11//lib/ipmi_tsol.c
---- ipmitool-1.8.11.orig//lib/ipmi_tsol.c	2009-02-25 15:38:52.000000000 -0500
-+++ ipmitool-1.8.11//lib/ipmi_tsol.c	2010-09-08 09:10:24.611519035 -0400
-@@ -385,7 +385,7 @@ ipmi_tsol_main(struct ipmi_intf * intf,
- 	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/99_readme_typo b/debian/patches/99_readme_typo
deleted file mode 100644
index 84496f1..0000000
--- a/debian/patches/99_readme_typo
+++ /dev/null
@@ -1,29 +0,0 @@
-## 99_readme_typo.dpatch by dann frazier <dannf@hp.com>
-##
-## Typo in README. Closes: #508231
-Index: ipmitool-1.8.11/README
-===================================================================
---- ipmitool-1.8.11.orig/README	2009-02-25 20:38:52.000000000 +0000
-+++ ipmitool-1.8.11/README	2009-03-22 16:55:46.254570261 +0000
-@@ -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
-Index: ipmitool-1.8.11/doc/ipmitool.1
-===================================================================
---- ipmitool-1.8.11.orig/doc/ipmitool.1	2009-02-25 20:38:52.000000000 +0000
-+++ ipmitool-1.8.11/doc/ipmitool.1	2009-03-22 16:55:46.270571619 +0000
-@@ -40,7 +40,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/fix_sdr_segfault b/debian/patches/fix_sdr_segfault
deleted file mode 100644
index b9680e0..0000000
--- a/debian/patches/fix_sdr_segfault
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur ipmitool-1.8.11/lib/ipmi_sdr.c ipmitool-1.8.11.fix/lib/ipmi_sdr.c
---- ipmitool-1.8.11/lib/ipmi_sdr.c	2009-02-25 21:38:52.000000000 +0100
-+++ ipmitool-1.8.11.fix/lib/ipmi_sdr.c	2011-08-10 18:21:26.000000000 +0200
-@@ -1828,7 +1828,7 @@
- 				printf("ns  | %2d.%1d | ",
- 				       sensor->entity.id,
- 				       sensor->entity.instance);
--				if (IS_SCANNING_DISABLED(rsp->data[1]))
-+				if (rsp && IS_SCANNING_DISABLED(rsp->data[1]))
- 					printf("Disabled");
- 				else
- 					printf("No Reading");
-
diff --git a/debian/patches/passwd_option b/debian/patches/passwd_option
deleted file mode 100644
index 94c96eb..0000000
--- a/debian/patches/passwd_option
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN ipmitool-1.8.11/lib/ipmi_main.c ipmitool-1.8.11.fixed/lib/ipmi_main.c
---- ipmitool-1.8.11/lib/ipmi_main.c	2009-02-26 05:38:52.000000000 +0900
-+++ ipmitool-1.8.11.fixed/lib/ipmi_main.c	2009-12-04 06:50:08.246119798 +0900
-@@ -106,7 +106,7 @@ ipmi_password_file_read(char * filename)
- 	char * pass = NULL;
- 	int l;
- 
--	pass = malloc(16);
-+	pass = malloc(21);
- 	if (pass == NULL) {
- 		lprintf(LOG_ERR, "ipmitool: malloc failure");
- 		return NULL;
-@@ -120,7 +120,7 @@ ipmi_password_file_read(char * filename)
- 	}
- 
- 	/* read in id */
--	if (fgets(pass, 16, fp) == NULL) {
-+	if (fgets(pass, 21, fp) == NULL) {
- 		lprintf(LOG_ERR, "Unable to read password from file %s",
- 			filename);
- 		fclose(fp);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1d8f38f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-99_readme_typo
-passwd_option
-fix_sdr_segfault
-101_fix_buf_overflow
diff --git a/debian/rules b/debian/rules
index 255653e..96a6920 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make
-
 #export DH_VERBOSE=1
+export DH_COMPAT=4
 export DH_OPTIONS
 
 CFLAGS = -Wall -g
@@ -17,10 +16,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
 configure: configure-stamp
-configure-stamp: patch
+configure-stamp:
 	dh_testdir
-	cp /usr/share/misc/config.sub config.sub
-	cp /usr/share/misc/config.guess config.guess
+
+	./bootstrap
+
 	./configure --prefix=/usr \
 		    --with-kerneldir \
 		    --mandir=/usr/share/man
@@ -31,27 +31,24 @@ 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.
+
+# Add here commands to compile the arch part of the package.
 	$(MAKE)
-	touch build-arch-stamp
 
 build-indep: build-indep-stamp
 build-indep-stamp: configure-stamp 
-	touch build-indep-stamp
 
-	# Add here commands to compile the indep part of the package.
-	#$(MAKE) doc
+# Add here commands to compile the indep part of the package.
+#$(MAKE) doc
 
-clean: unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
-	rm -f config.sub config.guess
-	
-	# Add here commands to clean up after the build process.
-	if [ -f Makefile ]; then $(MAKE) distclean; fi
-	
+
+# Add here commands to clean up after the build process.
+	-$(MAKE) distclean
+
 	dh_clean
 
 install: install-arch #install-indep
@@ -61,26 +58,34 @@ install-indep:
 	dh_clean -k -i
 	dh_installdirs -i
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
-	#	$(MAKE) install-doc DESTDIR=$(CURDIR)/debian/tmp/ipmitool-doc
-	#	dh_movefiles -i
+# Add here commands to install the indep part of the package into
+# debian/<package>-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.
+
+# 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/changelog in the package.
+
+	# No need to have two copies of the license text in the package.
 	$(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/COPYING
-	$(RM) $(CURDIR)/debian/ipmitool/usr/share/doc/ipmitool/ChangeLog 
 
+	# 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.
@@ -88,8 +93,8 @@ binary-common:
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_installchangelogs ChangeLog
-	dh_installinit --name ipmievd --error-handler=ipmievd_initd_failed
+	dh_installchangelogs 
+	dh_installinit --name ipmievd
 	dh_link
 	dh_strip
 	dh_compress 
@@ -109,4 +114,5 @@ binary-arch: build-arch install-arch
 	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
 
 binary: binary-arch #binary-indep
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install install-indep install-arch configure
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
+
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index d6990ab..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$// \
-http://sf.net/ipmitool/ipmitool-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2) debian uupdate