Accepting request 339080 from home:trenn:branches:systemsmanagement

- Update to latest ipmitool source code
  commit 999cd0ad9192b19ec57574e7aca111571f4d21d8
  Date:   Fri Mar 6 09:03:05 2015 -0600
  and throw away patches that went mainline.

OBS-URL: https://build.opensuse.org/request/show/339080
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=31

fix_dell_oem_exitcode

@@ -1,38 +0,0 @@
-From: Paul Zirnik <tami@suse.de>
-Return proper error value for Dell oem commands - easy and obvious fix
-
-Signed-off-by: Thomas Renninger <trenn@suse.de> 
-
-diff --git a/lib/ipmi_delloem.c b/lib/ipmi_delloem.c
-index d18e84a..2214c99 100644
---- a/lib/ipmi_delloem.c
-+++ b/lib/ipmi_delloem.c
-@@ -273,22 +273,22 @@ ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv)
- 		return 0;
- 	}
- 	if (0 ==strncmp(argv[current_arg], "lcd\0", 4)) {
--		ipmi_delloem_lcd_main(intf,argc,argv);
-+		rc = ipmi_delloem_lcd_main(intf,argc,argv);
- 	} else if (strncmp(argv[current_arg], "mac\0", 4) == 0) {
- 		/* mac address*/
--		ipmi_delloem_mac_main(intf,argc,argv);
-+		rc = ipmi_delloem_mac_main(intf,argc,argv);
- 	} else if (strncmp(argv[current_arg], "lan\0", 4) == 0) {
- 		/* lan address*/
--		ipmi_delloem_lan_main(intf,argc,argv);
-+		rc = ipmi_delloem_lan_main(intf,argc,argv);
- 	} else if (strncmp(argv[current_arg], "setled\0", 7) == 0) {
- 		/* SetLED support */
--		ipmi_delloem_setled_main(intf,argc,argv);
-+		rc = ipmi_delloem_setled_main(intf,argc,argv);
- 	} else if (strncmp(argv[current_arg], "powermonitor\0", 13) == 0) {
- 		/*Powermanagement report processing*/
--		ipmi_delloem_powermonitor_main(intf,argc,argv);
-+		rc = ipmi_delloem_powermonitor_main(intf,argc,argv);
- 	} else if (strncmp(argv[current_arg], "vFlash\0", 7) == 0) {
- 		/* vFlash Support */
--		ipmi_delloem_vFlash_main(intf,argc,argv);
-+		rc = ipmi_delloem_vFlash_main(intf,argc,argv);
- 	} else {
- 		usage();
- 		return -1;

ipmitool.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Oct 14 16:02:43 UTC 2015 - trenn@suse.de
+
+- Update to latest ipmitool source code
+  commit 999cd0ad9192b19ec57574e7aca111571f4d21d8
+  Date:   Fri Mar 6 09:03:05 2015 -0600
+  and throw away patches that went mainline.
+
 -------------------------------------------------------------------
 Wed Mar 11 15:21:40 UTC 2015 - trenn@suse.de
 

ipmitool.spec

@@ -40,7 +40,6 @@ Patch9:         ipmitool_adjust_suse.paths
 Patch10:        0001-Incorporate-upstream-comments-to-289-add-whitespace.patch
 Patch11:        ipmitool-1.8.10-implicit-fortify-decl.patch
 Patch12:        latest_compile_fixes.patch
-Patch13:        fix_dell_oem_exitcode
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # bmc-snmp-proxy needs /usr/sbin/snmpd
@@ -76,7 +75,6 @@ and setting LAN configuration, and chassis power control.
 %patch10 -p1
 %patch11 -p0
 %patch12 -p1
-%patch13 -p1
 
 %build
 touch INSTALL NEWS

several_more_compile_fixes.patch

@@ -8,14 +8,6 @@ Index: ipmitool-1.8.15/lib/ipmi_ekanalyzer.c
 ===================================================================
 --- ipmitool-1.8.15.orig/lib/ipmi_ekanalyzer.c	2015-01-14 14:27:59.116693459 +0100
 +++ ipmitool-1.8.15/lib/ipmi_ekanalyzer.c	2015-01-14 14:28:08.504693609 +0100
-@@ -399,7 +399,6 @@
- static int
- ipmi_ek_get_file_type(char *argument)
- {
--	int index_name=0;
- 	int filetype = ERROR_STATUS;
- 	if (strlen(argument) <= MIN_ARGUMENT) {
- 		return filetype;
 @@ -3366,7 +3365,7 @@
  		printf("\n");
  		offset += sizeof(struct fru_picmgext_guid);
@@ -43,30 +35,6 @@ Index: ipmitool-1.8.15/lib/ipmi_ekanalyzer.c
  					freq, min_freq, max_freq);
  		}
  		printf("\n");
-Index: ipmitool-1.8.15/lib/ipmi_fwum.c
-===================================================================
---- ipmitool-1.8.15.orig/lib/ipmi_fwum.c	2015-01-14 14:27:59.116693459 +0100
-+++ ipmitool-1.8.15/lib/ipmi_fwum.c	2015-01-14 14:28:08.504693609 +0100
-@@ -858,7 +858,6 @@
- 	unsigned long lastAddress = 0;
- 	unsigned char sequenceNumber = 0;
- 	unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
--	unsigned char isLengthValid = 1;
- 	do {
- 		writeSize = save_fw_nfo.bufferSize - save_fw_nfo.overheadSize;
- 		/* Reach the end */
-Index: ipmitool-1.8.15/lib/ipmi_isol.c
-===================================================================
---- ipmitool-1.8.15.orig/lib/ipmi_isol.c	2015-01-14 14:27:59.116693459 +0100
-+++ ipmitool-1.8.15/lib/ipmi_isol.c	2015-01-14 14:28:08.504693609 +0100
-@@ -413,7 +413,6 @@
- 	struct ipmi_rs * rsp;
- 	struct ipmi_rq   req;
- 	uint8_t    data[6];	 
--	struct isol_config_parameters params;
- 
- 	memset(&req, 0, sizeof(req));
- 	req.msg.netfn = IPMI_NETFN_ISOL;
 Index: ipmitool-1.8.15/lib/ipmi_picmg.c
 ===================================================================
 --- ipmitool-1.8.15.orig/lib/ipmi_picmg.c	2015-01-14 14:25:17.556690891 +0100
@@ -89,18 +57,6 @@ Index: ipmitool-1.8.15/lib/ipmi_picmg.c
  		   }
  		}
  	}
-Index: ipmitool-1.8.15/lib/ipmi_sdradd.c
-===================================================================
---- ipmitool-1.8.15.orig/lib/ipmi_sdradd.c	2015-01-14 14:27:59.120693459 +0100
-+++ ipmitool-1.8.15/lib/ipmi_sdradd.c	2015-01-14 14:28:08.504693609 +0100
-@@ -575,7 +575,6 @@
- static int
- ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
- {
--  struct sdr_get_rs header;
-   int rc = 0;
-   int fd;
-   uint8_t binHdr[5];
 Index: ipmitool-1.8.15/lib/ipmi_sdr.c
 ===================================================================
 --- ipmitool-1.8.15.orig/lib/ipmi_sdr.c	2015-01-14 14:27:59.120693459 +0100