From 0ae21f1afc754ef2b33f58f8f3a91e56fb11292c53986942175c33ca51ae9a32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Thu, 28 Feb 2013 13:22:05 +0000
Subject: [PATCH] - Version 1.8.12 released 2012-08-09   Changes: many, see  
 http://ipmitool.cvs.sourceforge.net/viewvc/ipmitool/ipmitool/ChangeLog?revision=1.37&view=markup&pathrev=IPMITOOL_1_8_12

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=4
---
 compile-fixes | 82 +++++++++------------------------------------------
 1 file changed, 14 insertions(+), 68 deletions(-)

diff --git a/compile-fixes b/compile-fixes
index 70dd7f8..8cdbf34 100644
--- a/compile-fixes
+++ b/compile-fixes
@@ -1,20 +1,7 @@
-Several compiler warning fixes
-
-These were in SUSE distris for quite some time and got
-forwardported from 1.8.10 to 1.8.11.
-
-
----
- lib/ipmi_ekanalyzer.c |   24 ++++++++++++++----------
- lib/ipmi_fru.c        |    3 ++-
- lib/ipmi_hpmfwupg.c   |    8 ++++----
- 3 files changed, 20 insertions(+), 15 deletions(-)
-
-Index: ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
-===================================================================
---- ipmitool-1.8.11.orig/lib/ipmi_ekanalyzer.c
-+++ ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
-@@ -3025,9 +3025,10 @@ ipmi_ek_display_address_table_record( st
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_ekanalyzer.c ./lib/ipmi_ekanalyzer.c
+--- ../orig-ipmitool-1.8.12/lib/ipmi_ekanalyzer.c	2012-08-03 19:07:07.000000000 +0200
++++ ./lib/ipmi_ekanalyzer.c	2013-02-28 13:30:17.885338630 +0100
+@@ -3025,9 +3025,10 @@
  
     for ( i = 0; i < entries; i++ ){
        printf("\tHWAddr: 0x%02x  - SiteNum: 0x%02x - SiteType: 0x%02x \n",
@@ -28,7 +15,7 @@ Index: ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
     }
  }
  
-@@ -3148,21 +3149,24 @@ ipmi_ek_display_shelf_ip_connection_reco
+@@ -3148,21 +3149,24 @@
     int offset = START_DATA_OFFSET;
     if (offset > record->header.len){
        printf("   Shelf Manager IP Address: %d.%d.%d.%d\n",
@@ -60,57 +47,16 @@ Index: ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
     }
  }
  
-Index: ipmitool-1.8.11/lib/ipmi_fru.c
-===================================================================
---- ipmitool-1.8.11.orig/lib/ipmi_fru.c
-+++ ipmitool-1.8.11/lib/ipmi_fru.c
-@@ -1840,7 +1840,8 @@ static void ipmi_fru_picmg_ext_print(uin
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile.in ../orig-ipmitool-1.8.12/lib/ipmi_fru.c ./lib/ipmi_fru.c
+--- ../orig-ipmitool-1.8.12/lib/ipmi_fru.c	2012-08-03 19:07:07.000000000 +0200
++++ ./lib/ipmi_fru.c	2013-02-28 13:33:32.677021926 +0100
+@@ -2070,7 +2070,8 @@
  
  			for (i=0; i<entries; i++) {
- 				printf("			 HWAddr: 0x%02x  - SiteNum: 0x%02x - SiteType: 0x%02x \n",
--					 fru_data[offset++], fru_data[offset++], fru_data[offset++]);
-+					 fru_data[offset+2], fru_data[offset+1], fru_data[offset+0]);
-+				offset += 3;
+ 				printf("        HWAddr: 0x%02x  - SiteNum: 0x%02x - SiteType: 0x%02x \n",
+-					fru_data[offset++], fru_data[offset++], fru_data[offset++]);
++					fru_data[offset+2], fru_data[offset+1], fru_data[offset+0]);
++                                offset += 3;
  			}
  		}
- 			break;
-Index: ipmitool-1.8.11/lib/ipmi_hpmfwupg.c
-===================================================================
---- ipmitool-1.8.11.orig/lib/ipmi_hpmfwupg.c
-+++ ipmitool-1.8.11/lib/ipmi_hpmfwupg.c
-@@ -1136,7 +1136,7 @@ void HpmDisplayUpgrade( int skip, unsign
- * Description: This function displays the information about version header 
- *
- *****************************************************************************/
--int HpmDisplayVersionHeader(int mode)
-+void HpmDisplayVersionHeader(int mode)
- {
- 
-    if ( mode & IMAGE_VER)
-@@ -1162,7 +1162,7 @@ int HpmDisplayVersionHeader(int mode)
- * Description: This function displays the version of the image and target
- *
- *****************************************************************************/
--int HpmDisplayVersion(int mode,VERSIONINFO *pVersion)
-+void HpmDisplayVersion(int mode,VERSIONINFO *pVersion)
- {
-       char descString[12];
-       memset(&descString,0x00,12);
-@@ -1233,7 +1233,7 @@ int HpmfwupgTargetCheck(struct ipmi_intf
-     if (rc != HPMFWUPG_SUCCESS)
-     {
-         lprintf(LOG_NOTICE,"Verify whether the Target board is present \n");
--        return;
-+        return rc;
-     }
- 
-     rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
-@@ -3516,7 +3516,7 @@ int ipmi_hpmfwupg_main(struct ipmi_intf
-    if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) 
-    {
-       HpmfwupgPrintUsage();
--      return;
-+      return rc;
-     }
-    if ( (strcmp(argv[0], "check") == 0) )
-    {
+ 		break;