From 667485b71df528e0d67e8d4f6e18ab972d8bf7ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 20 Feb 2016 02:38:51 +0100 Subject: Refresh patches --- debian/changelog | 7 + debian/patches/0100-fix_buf_overflow.patch | 22 +++ debian/patches/0500-fix_CVE-2011-4339.patch | 21 +++ debian/patches/0600-manpage_longlines.patch | 56 +++++++ debian/patches/0605-manpage_typo.patch | 245 ++++++++++++++++++++++++++++ debian/patches/0610-readme_typo.patch | 29 ++++ debian/patches/096-manpage_longlines.patch | 56 ------- debian/patches/098-manpage_typo.patch | 245 ---------------------------- debian/patches/099_readme_typo | 29 ---- debian/patches/101_fix_buf_overflow.patch | 22 --- debian/patches/112_fix_CVE-2011-4339.patch | 21 --- debian/patches/series | 10 +- 12 files changed, 385 insertions(+), 378 deletions(-) create mode 100644 debian/patches/0100-fix_buf_overflow.patch create mode 100644 debian/patches/0500-fix_CVE-2011-4339.patch create mode 100644 debian/patches/0600-manpage_longlines.patch create mode 100644 debian/patches/0605-manpage_typo.patch create mode 100644 debian/patches/0610-readme_typo.patch delete mode 100644 debian/patches/096-manpage_longlines.patch delete mode 100644 debian/patches/098-manpage_typo.patch delete mode 100644 debian/patches/099_readme_typo delete mode 100644 debian/patches/101_fix_buf_overflow.patch delete mode 100644 debian/patches/112_fix_CVE-2011-4339.patch diff --git a/debian/changelog b/debian/changelog index 1d6f9bb..ee5938d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ipmitool (1.8.16-1) UNRELEASED; urgency=medium + + * New upstram release. + * Refresh patches. + + -- Jörg Frings-Fürst Sat, 20 Feb 2016 02:13:33 +0100 + ipmitool (1.8.15-1) unstable; urgency=medium * New upstream release. diff --git a/debian/patches/0100-fix_buf_overflow.patch b/debian/patches/0100-fix_buf_overflow.patch new file mode 100644 index 0000000..174d205 --- /dev/null +++ b/debian/patches/0100-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-12-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/ipmi_tsol.c +=================================================================== +--- trunk.orig/lib/ipmi_tsol.c ++++ trunk/lib/ipmi_tsol.c +@@ -375,7 +375,7 @@ ipmi_tsol_main(struct ipmi_intf *intf, i + char *recvip = NULL; + char in_buff[IPMI_BUF_SIZE]; + char out_buff[IPMI_BUF_SIZE * 8]; +- 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/0500-fix_CVE-2011-4339.patch b/debian/patches/0500-fix_CVE-2011-4339.patch new file mode 100644 index 0000000..48bfe8c --- /dev/null +++ b/debian/patches/0500-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-12-01 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/lib/helper.c +=================================================================== +--- trunk.orig/lib/helper.c ++++ trunk/lib/helper.c +@@ -659,7 +659,6 @@ ipmi_start_daemon(struct ipmi_intf *intf + #endif + + chdir("/"); +- umask(0); + + for (fd=0; fd<64; fd++) { + if (fd != intf->fd) diff --git a/debian/patches/0600-manpage_longlines.patch b/debian/patches/0600-manpage_longlines.patch new file mode 100644 index 0000000..8fae0a9 --- /dev/null +++ b/debian/patches/0600-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 ++++ trunk/doc/ipmitool.1 +@@ -1035,7 +1035,7 @@ Display point to point physical connecti + 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 +@@ -1091,7 +1091,7 @@ and an AMC module or between 2 AMC modul + \-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 +@@ -1104,7 +1104,7 @@ and an AMC module or between 2 AMC modul + \-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 +@@ -1118,7 +1118,7 @@ and an AMC module or between 2 AMC modul + \-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 +@@ -1132,7 +1132,7 @@ and an AMC module or between 2 AMC modul + \-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/0605-manpage_typo.patch b/debian/patches/0605-manpage_typo.patch new file mode 100644 index 0000000..982036c --- /dev/null +++ b/debian/patches/0605-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 ++++ trunk/doc/ipmitool.1 +@@ -10,47 +10,47 @@ ipmitool [ ] [ := [ -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 @@ option is absent, or if password_file is + 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 @@ combined with \fI-t target address\fP. + .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 \fIraw\fP uses fixed value of on + 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 @@ Display version information. + \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 +@@ -1052,7 +1052,7 @@ Display point to point physical connecti + \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 +@@ -1064,7 +1064,7 @@ modules. + .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 +@@ -1082,56 +1082,56 @@ and an AMC module or between 2 AMC modul + 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 +@@ -3269,7 +3269,7 @@ I2C Master Write\-Read IPMI command. + + 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 +@@ -3664,7 +3664,7 @@ encryption algorightms. + 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> + +@@ -3674,7 +3674,7 @@ ipmitool \fB\-I\fR \fIfree\fP <\fIcomman + 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/0610-readme_typo.patch b/debian/patches/0610-readme_typo.patch new file mode 100644 index 0000000..89fb104 --- /dev/null +++ b/debian/patches/0610-readme_typo.patch @@ -0,0 +1,29 @@ +## 99_readme_typo.dpatch by dann frazier +## +## Typo in README. Closes: #508231 +Index: trunk/README +=================================================================== +--- trunk.orig/README ++++ trunk/README +@@ -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 +Index: trunk/doc/ipmitool.1 +=================================================================== +--- trunk.orig/doc/ipmitool.1 ++++ trunk/doc/ipmitool.1 +@@ -63,7 +63,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 diff --git a/debian/patches/096-manpage_longlines.patch b/debian/patches/096-manpage_longlines.patch deleted file mode 100644 index 4acf71a..0000000 --- a/debian/patches/096-manpage_longlines.patch +++ /dev/null @@ -1,56 +0,0 @@ -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/098-manpage_typo.patch b/debian/patches/098-manpage_typo.patch deleted file mode 100644 index c667278..0000000 --- a/debian/patches/098-manpage_typo.patch +++ /dev/null @@ -1,245 +0,0 @@ -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 deleted file mode 100644 index 89fb104..0000000 --- a/debian/patches/099_readme_typo +++ /dev/null @@ -1,29 +0,0 @@ -## 99_readme_typo.dpatch by dann frazier -## -## Typo in README. Closes: #508231 -Index: trunk/README -=================================================================== ---- trunk.orig/README -+++ trunk/README -@@ -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 -Index: trunk/doc/ipmitool.1 -=================================================================== ---- trunk.orig/doc/ipmitool.1 -+++ trunk/doc/ipmitool.1 -@@ -63,7 +63,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 diff --git a/debian/patches/101_fix_buf_overflow.patch b/debian/patches/101_fix_buf_overflow.patch deleted file mode 100644 index f479558..0000000 --- a/debian/patches/101_fix_buf_overflow.patch +++ /dev/null @@ -1,22 +0,0 @@ -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-12-01 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/lib/ipmi_tsol.c -=================================================================== ---- trunk.orig/lib/ipmi_tsol.c -+++ trunk/lib/ipmi_tsol.c -@@ -374,7 +374,7 @@ ipmi_tsol_main(struct ipmi_intf *intf, i - char *recvip = NULL; - char in_buff[IPMI_BUF_SIZE]; - char out_buff[IPMI_BUF_SIZE * 8]; -- 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 deleted file mode 100644 index 9354c47..0000000 --- a/debian/patches/112_fix_CVE-2011-4339.patch +++ /dev/null @@ -1,21 +0,0 @@ -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-12-01 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: trunk/lib/helper.c -=================================================================== ---- trunk.orig/lib/helper.c -+++ trunk/lib/helper.c -@@ -658,7 +658,6 @@ ipmi_start_daemon(struct ipmi_intf *intf - #endif - - chdir("/"); -- umask(0); - - for (fd=0; fd<64; fd++) { - if (fd != intf->fd) diff --git a/debian/patches/series b/debian/patches/series index db22c50..48d1d23 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ -098-manpage_typo.patch -101_fix_buf_overflow.patch -112_fix_CVE-2011-4339.patch -099_readme_typo -096-manpage_longlines.patch +0605-manpage_typo.patch +0100-fix_buf_overflow.patch +0500-fix_CVE-2011-4339.patch +0610-readme_typo.patch +0600-manpage_longlines.patch -- cgit v1.2.3