diff -u ipmitool-1.8.11/debian/ipmitool.ipmievd.init ipmitool-1.8.11/debian/ipmitool.ipmievd.init --- ipmitool-1.8.11/debian/ipmitool.ipmievd.init +++ ipmitool-1.8.11/debian/ipmitool.ipmievd.init @@ -93,8 +93,11 @@ log_end_msg $CODE exit $CODE ;; + status) + status_of_proc $DAEMON $NAME + ;; *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2 exit 1 ;; esac diff -u ipmitool-1.8.11/debian/ipmitool.postinst ipmitool-1.8.11/debian/ipmitool.postinst --- ipmitool-1.8.11/debian/ipmitool.postinst +++ ipmitool-1.8.11/debian/ipmitool.postinst @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ipmievd_initd_failed() { echo "Unable to start ipmievd during installation. Trying to disable." diff -u ipmitool-1.8.11/debian/ipmitool.postrm ipmitool-1.8.11/debian/ipmitool.postrm --- ipmitool-1.8.11/debian/ipmitool.postrm +++ ipmitool-1.8.11/debian/ipmitool.postrm @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ipmievd_initd_failed() { : diff -u ipmitool-1.8.11/debian/control ipmitool-1.8.11/debian/control --- ipmitool-1.8.11/debian/control +++ ipmitool-1.8.11/debian/control @@ -3,12 +3,15 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Matthew Johnson -Build-Depends: debhelper (>> 5.0.0), libreadline-dev, libssl-dev, quilt, autotools-dev +Uploaders: Luk Claes +Build-Depends: debhelper (>> 5.0.0), libreadline-dev, libncurses-dev, libssl-dev, quilt, autotools-dev +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ipmitool.git +Vcs-Git: git://anonscm.debian.org/git/collab-maint/ipmitool.git Standards-Version: 3.8.0 Package: ipmitool -Architecture: i386 amd64 ia64 powerpc armel armhf -Depends: ${shlibs:Depends}, lsb-base +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 diff -u ipmitool-1.8.11/debian/changelog ipmitool-1.8.11/debian/changelog --- ipmitool-1.8.11/debian/changelog +++ ipmitool-1.8.11/debian/changelog @@ -1,3 +1,51 @@ +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 diff -u ipmitool-1.8.11/debian/ipmitool.prerm ipmitool-1.8.11/debian/ipmitool.prerm --- ipmitool-1.8.11/debian/ipmitool.prerm +++ ipmitool-1.8.11/debian/ipmitool.prerm @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e ipmievd_initd_failed() { : diff -u ipmitool-1.8.11/debian/patches/series ipmitool-1.8.11/debian/patches/series --- ipmitool-1.8.11/debian/patches/series +++ ipmitool-1.8.11/debian/patches/series @@ -3,7 +3,9 @@ +fix_sdr_segfault +101_fix_buf_overflow +112_fix_CVE-2011-4339 dell_01_basic.patch dell_02_lcd.patch dell_03_mac.patch dell_04_lan.patch dell_05_poowermonitor.patch dell_06_manpage.patch -101_fix_buf_overflow.patch only in patch2: unchanged: --- ipmitool-1.8.11.orig/debian/README.source +++ ipmitool-1.8.11/debian/README.source @@ -0,0 +1,2 @@ +More information on how to use quilt can be found in: +/usr/share/doc/quilt/README.source only in patch2: unchanged: --- ipmitool-1.8.11.orig/debian/patches/112_fix_CVE-2011-4339 +++ ipmitool-1.8.11/debian/patches/112_fix_CVE-2011-4339 @@ -0,0 +1,11 @@ +diff -up ipmitool-1.8.11/lib/helper.c.original ipmitool-1.8.11/lib/helper.c +--- ipmitool-1.8.11/lib/helper.c.original 2011-10-03 13:00:54.000000000 +0900 ++++ ipmitool-1.8.11/lib/helper.c 2011-10-03 13:01:01.000000000 +0900 +@@ -427,7 +427,6 @@ ipmi_start_daemon(struct ipmi_intf *intf + #endif + + chdir("/"); +- umask(0); + + for (fd=0; fd<64; fd++) { + if (fd != intf->fd) only in patch2: unchanged: --- ipmitool-1.8.11.orig/debian/patches/fix_sdr_segfault +++ ipmitool-1.8.11/debian/patches/fix_sdr_segfault @@ -0,0 +1,13 @@ +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"); + only in patch2: unchanged: --- ipmitool-1.8.11.orig/debian/patches/101_fix_buf_overflow +++ ipmitool-1.8.11/debian/patches/101_fix_buf_overflow @@ -0,0 +1,12 @@ +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;