rpm/ipmitool
SHA256
1
0
Fork 0
forked from pool/ipmitool
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipmitool?expand=0&rev=6

Browse Source
This commit is contained in:
OBS User unknown 2008-09-26 12:54:07 +00:00 committed by Git OBS Bridge
parent bba110465c
commit 557cede139
3 changed files with 116 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
compile-fixes
View File

@ -1,5 +1,73 @@
--- ipmitool-1.8.10/lib/ipmi_chassis.c.orig 2008-07-09 22:14:42.000000000 +0200
+++ ipmitool-1.8.10/lib/ipmi_chassis.c 2008-09-26 13:28:16.000000000 +0200
@@ -33,6 +33,7 @@
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
+#include <time.h>
#include <ipmitool/helper.h>
#include <ipmitool/ipmi.h>
--- ipmitool-1.8.10/lib/ipmi_ekanalyzer.c.orig 2008-06-10 23:07:39.000000000 +0200
+++ ipmitool-1.8.10/lib/ipmi_ekanalyzer.c 2008-09-26 13:37:43.000000000 +0200
@@ -3025,9 +3025,10 @@ ipmi_ek_display_address_table_record( st
for ( i = 0; i < entries; i++ ){
printf("\tHWAddr: 0x%02x - SiteNum: 0x%02x - SiteType: 0x%02x \n",
- record->data[offset++],
- record->data[offset++],
- record->data[offset++]);
+ record->data[offset+2],
+ record->data[offset+1],
+ record->data[offset+0]);
+ offset += 3;
}
}
@@ -3148,21 +3149,24 @@ ipmi_ek_display_shelf_ip_connection_reco
int offset = START_DATA_OFFSET;
if (offset > record->header.len){
printf(" Shelf Manager IP Address: %d.%d.%d.%d\n",
- record->data[offset++], record->data[offset++],
- record->data[offset++], record->data[offset++]
+ record->data[offset+3], record->data[offset+2],
+ record->data[offset+1], record->data[offset+0]
);
+ offset += 4;
}
if (offset > record->header.len){
printf(" Default Gateway Address: %d.%d.%d.%d\n",
- record->data[offset++], record->data[offset++],
- record->data[offset++], record->data[offset++]
+ record->data[offset+3], record->data[offset+2],
+ record->data[offset+1], record->data[offset+0]
);
+ offset += 4;
}
if (offset > record->header.len){
- printf(" Subnet Mask: %d.%d.%d.%d\n", record->data[offset++],
- record->data[offset++], record->data[offset++],
- record->data[offset++]
+ printf(" Subnet Mask: %d.%d.%d.%d\n",
+ record->data[offset+3], record->data[offset+2],
+ record->data[offset+1], record->data[offset+0]
);
+ offset += 4;
}
}
--- ipmitool-1.8.10/lib/ipmi_fru.c.orig 2008-06-10 23:40:47.000000000 +0200
+++ ipmitool-1.8.10/lib/ipmi_fru.c 2008-09-12 16:34:18.000000000 +0200
+++ ipmitool-1.8.10/lib/ipmi_fru.c 2008-09-26 13:22:52.000000000 +0200
@@ -1259,7 +1259,8 @@ static void ipmi_fru_picmg_ext_print(uin
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;
}
}
break;
@@ -2353,7 +2353,7 @@ ipmi_fru_edit_multirec(struct ipmi_intf
fru_data = malloc(fru.size + 1);
if (fru_data == NULL) {
@ -9,3 +77,41 @@
}
memset(fru_data, 0, fru.size + 1);
--- ipmitool-1.8.10/lib/ipmi_hpmfwupg.c.orig 2008-06-10 23:02:10.000000000 +0200
+++ ipmitool-1.8.10/lib/ipmi_hpmfwupg.c 2008-09-26 13:46:19.000000000 +0200
@@ -877,7 +877,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)
@@ -903,7 +903,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);
@@ -974,7 +974,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);
@@ -3257,7 +3257,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) )
{

5
ipmitool.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Sep 26 13:55:29 CEST 2008 - duwe@suse.de
- fix ugly code and sloppy programming found by RPMlint
-------------------------------------------------------------------
Fri Sep 12 16:42:17 CEST 2008 - duwe@suse.de

6
ipmitool.spec
View File

@ -23,7 +23,7 @@ BuildRequires: openssl-devel readline-devel
Url: http://ipmitool.sourceforge.net/
Summary: Utility for IPMI Control
Version: 1.8.10
Release: 1
Release: 2
License: BSD 3-Clause
Group: System/Management
Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README contrib
%doc AUTHORS COPYING README
%{_bindir}/*
%{_sbindir}/*
%{_datadir}/ipmitool
@ -82,6 +82,8 @@ rm -rf $RPM_BUILD_ROOT
%doc %{_mandir}/man8/*
%changelog
* Fri Sep 26 2008 duwe@suse.de
- fix ugly code and sloppy programming found by RPMlint
* Fri Sep 12 2008 duwe@suse.de
- update to version 1.8.10 as requested in FATE#304431
+ remove fixes now in mainline