diff options
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/ipmitool.ipmievd.init | 2 | ||||
| -rw-r--r-- | debian/patches/00list | 2 | ||||
| -rw-r--r-- | debian/patches/30_ipmi_lanplus.dpatch | 26 | ||||
| -rw-r--r-- | debian/patches/99_readme_typo.dpatch | 32 |
5 files changed, 66 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog index 0cb479e..6ac0817 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,14 @@ -ipmitool (1.8.9-3) unstable; urgency=low +ipmitool (1.8.9-3) 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>) + * Add patch to fix SEGV in lanplus (Closes: #484560) - -- Matthew Johnson <mjj29@debian.org> Mon, 08 Dec 2008 21:45:20 +0000 + -- Matthew Johnson <mjj29@debian.org> Tue, 23 Dec 2008 18:51:16 +0000 ipmitool (1.8.9-2) unstable; urgency=low diff --git a/debian/ipmitool.ipmievd.init b/debian/ipmitool.ipmievd.init index d63d1f7..8eb1014 100644 --- a/debian/ipmitool.ipmievd.init +++ b/debian/ipmitool.ipmievd.init @@ -22,7 +22,7 @@ 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.pid +PIDFILE=/var/run/$NAME.pid0 SCRIPTNAME=/etc/init.d/$NAME ENABLED=true diff --git a/debian/patches/00list b/debian/patches/00list index 878c6c3..dfc9e30 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -2,3 +2,5 @@ 20_ipmi_isol.dpatch 20_ipmi_impi.dpatch 20_ipmi_sdr.dpatch +30_ipmi_lanplus.dpatch +99_readme_typo.dpatch diff --git a/debian/patches/30_ipmi_lanplus.dpatch b/debian/patches/30_ipmi_lanplus.dpatch new file mode 100644 index 0000000..55b9f90 --- /dev/null +++ b/debian/patches/30_ipmi_lanplus.dpatch @@ -0,0 +1,26 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_ipmi_lanplus.dpatch by "Daniel J Blueman" <daniel.blueman@gmail.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add null checking to lanplus to fix segv (Closes: #484560) + +@DPATCH@ + +--- ./ipmitool-1.8.8/src/plugins/lanplus/lanplus.c 2006-04-21 17:34:30.000000000 +0100 ++++ ./ipmitool-1.8.8-dan/ipmitool-1.8.8/src/plugins/lanplus/lanplus.c 2008-05-30 18:12:02.000000000 +0100 +@@ -2165,6 +2165,8 @@ + + rsp = ipmi_lanplus_recv_sol(intf); /* Grab the next packet */ ++ if (!rsp) ++ break; + + if (sol_response_acks_packet(rsp, payload)) + break; +@@ -2456,7 +2458,7 @@ + { + struct ipmi_rs * rsp = ipmi_lan_poll_recv(intf); + +- if(rsp->session.authtype != 0) ++ if(rsp && rsp->session.authtype != 0) + { + ack_sol_packet(intf, rsp); diff --git a/debian/patches/99_readme_typo.dpatch b/debian/patches/99_readme_typo.dpatch new file mode 100644 index 0000000..f70f54c --- /dev/null +++ b/debian/patches/99_readme_typo.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 99_readme_typo.dpatch by dann frazier <dannf@hp.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Typo in README. Closes: #508231 + +@DPATCH@ + +diff -urpN ipmitool-1.8.9.orig/README ipmitool-1.8.9/README +--- ipmitool-1.8.9.orig/README 2005-01-06 12:13:51.000000000 -0700 ++++ ipmitool-1.8.9/README 2008-12-08 18:12:15.000000000 -0700 +@@ -24,7 +24,7 @@ Background + ========== + 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 +diff -urpN ipmitool-1.8.9.orig/doc/ipmitool.1 ipmitool-1.8.9/doc/ipmitool.1 +--- ipmitool-1.8.9.orig/doc/ipmitool.1 2007-03-06 15:15:36.000000000 -0700 ++++ ipmitool-1.8.9/doc/ipmitool.1 2008-12-08 18:11:56.000000000 -0700 +@@ -39,7 +39,7 @@ chassis power control. + 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 |