From b32d92e890caac903491116e9d817aa780c0323b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 23 Jul 2014 15:03:00 +0200 Subject: Imported Upstream version 1.8.14 --- debian/patches/101_fix_buf_overflow | 12 ------------ debian/patches/99_readme_typo | 29 ----------------------------- debian/patches/fix_sdr_segfault | 13 ------------- debian/patches/passwd_option | 21 --------------------- debian/patches/series | 4 ---- 5 files changed, 79 deletions(-) delete mode 100644 debian/patches/101_fix_buf_overflow delete mode 100644 debian/patches/99_readme_typo delete mode 100644 debian/patches/fix_sdr_segfault delete mode 100644 debian/patches/passwd_option delete mode 100644 debian/patches/series (limited to 'debian/patches') 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 -## -## 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 -- cgit v1.2.3