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

Accepting request 202141 from systemsmanagement

Browse Source 
- Update to 1.8.13
  Changes: many, see
  http://sourceforge.net/projects/ipmitool/files/ipmitool/1.8.13/
- drop patches included upstream
  * compile-fixes.patch
  * ekanalyzer_fix_wrong_type_comparison.patch
  * increase_possible_fw_file_size.patch
  * ipmitool-bigendian.patch
  * old-gcc-options.patch

OBS-URL: https://build.opensuse.org/request/show/202141
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ipmitool?expand=0&rev=26
This commit is contained in:
Tomáš Chvátal 2013-10-04 14:15:14 +00:00 committed by Git OBS Bridge
commit 41a8b58853
14 changed files with 73 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
automake-1.13.patch
View File

@ -1,10 +1,10 @@
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/configure.in ./configure.in
--- ../orig-ipmitool-1.8.12/configure.in 2013-02-28 13:52:11.893152359 +0100
+++ ./configure.in 2013-02-28 14:19:51.398619156 +0100
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/configure.in ./configure.in
--- ../orig-ipmitool-1.8.13/configure.in 2013-09-09 17:48:19.000000000 +0200
+++ ./configure.in 2013-10-04 08:55:15.863873774 +0200
@@ -4,7 +4,7 @@
AC_INIT([src/ipmitool.c])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([ipmitool], [1.8.12])
AM_INIT_AUTOMAKE([ipmitool], [1.8.13])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR([src/ipmitool.c])

62
compile-fixes
View File

@ -1,62 +0,0 @@
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",
- 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 @@
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;
}
}
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;
}
}
break;

36
ekanalyzer_fix_wrong_type_comparison.patch
View File

@ -1,36 +0,0 @@
Fix typo, fix wrong pointer usage
I expect this is what the author wanted to do.
Testing the board_length pointer to be !NULL makes no sense at this place,
it should have been done earlier or a segfault could already happen because
of the (*board_length)--; usage some lines above.
This fixes a compiler warning and likley fixes a real bug.
Additional reference:
https://bugzilla.novell.com/show_bug.cgi?id=439490
Signed-off-by: Thomas Renninger <trenn@suse.de>
---
lib/ipmi_ekanalyzer.c | 4 ++--
1 file changed, 2 insertions(+), 2 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
@@ -2624,12 +2624,12 @@ ipmi_ek_display_board_info_area( FILE *
if ( !feof(input_file) ){
unsigned int size_board = 0;
- /*Bit 5:0 of Board Mfg type represent legnth*/
+ /*Bit 5:0 of Board Mfg type represent length*/
size_board = (len & 0x3f);
if (size_board > 0){
if ( strncmp( board_type, "Custom", 6 ) == 0 ){
#define NO_MORE_INFO_FIELD 0xc1
- while ( !feof(input_file) && (board_length > 0) ){
+ while ( !feof(input_file) && (*board_length > 0) ){
if (len != NO_MORE_INFO_FIELD){
printf("Additional Custom Mfg. length: 0x%02x\n", len);
if ( (size_board > 0) && (size_board < (*board_length)) ){

18
fix_file_permissions.patch
View File

@ -1,7 +1,7 @@
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/helper.c ./lib/helper.c
--- ../orig-ipmitool-1.8.12/lib/helper.c 2012-08-03 19:07:07.000000000 +0200
+++ ./lib/helper.c 2013-02-28 13:46:20.139280500 +0100
@@ -593,7 +593,6 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/helper.c ./lib/helper.c
--- ../orig-ipmitool-1.8.13/lib/helper.c 2013-07-12 14:06:08.000000000 +0200
+++ ./lib/helper.c 2013-10-04 09:09:37.911160342 +0200
@@ -656,7 +656,6 @@
#endif
chdir("/");
@ -9,10 +9,10 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
for (fd=0; fd<64; fd++) {
if (fd != intf->fd)
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/src/ipmievd.c ./src/ipmievd.c
--- ../orig-ipmitool-1.8.12/src/ipmievd.c 2012-05-01 18:59:23.000000000 +0200
+++ ./src/ipmievd.c 2013-02-28 13:47:23.777788780 +0100
@@ -691,6 +691,7 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/src/ipmievd.c ./src/ipmievd.c
--- ../orig-ipmitool-1.8.13/src/ipmievd.c 2013-03-29 19:45:16.000000000 +0100
+++ ./src/ipmievd.c 2013-10-04 09:09:37.911160342 +0200
@@ -700,6 +700,7 @@
int i, rc;
int daemon = 1;
struct sigaction act;
@ -20,7 +20,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
memset(pidfile, 0, 64);
sprintf(pidfile, "%s%d", DEFAULT_PIDFILE, eintf->intf->devnum);
@@ -752,8 +753,9 @@
@@ -761,8 +762,9 @@
ipmi_start_daemon(eintf->intf);

10
fwum_enhance_output.patch
View File

@ -1,7 +1,7 @@
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_fwum.c ./lib/ipmi_fwum.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c 2012-01-21 06:35:49.000000000 +0100
+++ ./lib/ipmi_fwum.c 2013-02-28 13:53:34.644417793 +0100
@@ -1648,13 +1656,15 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c ./lib/ipmi_fwum.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c 2013-08-23 21:02:34.000000000 +0200
+++ ./lib/ipmi_fwum.c 2013-10-04 09:07:13.153233777 +0200
@@ -1651,13 +1651,15 @@
if(boardInfo.iana != firmInfo.iana)
{
@ -19,7 +19,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
status = KFWUM_STATUS_ERROR;
}
@@ -1672,6 +1682,8 @@
@@ -1675,6 +1677,8 @@
{
printf("Target Board Id : %u\n",boardInfo.boardId);
printf("Target IANA number : %u\n",boardInfo.iana);

34
increase_possible_fw_file_size.patch
View File

@ -1,34 +0,0 @@
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_fwum.c ./lib/ipmi_fwum.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c 2012-01-21 06:35:49.000000000 +0100
+++ ./lib/ipmi_fwum.c 2013-02-28 13:39:10.666350090 +0100
@@ -141,7 +141,8 @@
extern int verbose;
static unsigned char fileName[512];
-static unsigned char firmBuf[1024*512];
+#define MAX_FW_FILE_SIZE 1024*512
+static unsigned char firmBuf[MAX_FW_FILE_SIZE];
static tKFWUM_SaveFirmwareInfo saveFirmwareInfo;
static void KfwumOutputHelp(void);
@@ -508,6 +509,12 @@
tKFWUM_Status status = KFWUM_STATUS_OK;
FILE * pFileHandle;
+ if(fileSize >= MAX_FW_FILE_SIZE)
+ {
+ printf("Error: Firmware file size exceeds %dK\n", MAX_FW_FILE_SIZE / 1024);
+ return KFWUM_STATUS_ERROR;
+ }
+
pFileHandle = fopen((const char *)pFileName, "rb");
if(pFileHandle)
@@ -538,6 +545,7 @@
{
KfwumShowProgress((const unsigned char *)"Reading Firmware from File", 100, 100);
}
+ fclose(pFileHandle);
}
return(status);
}

3
ipmitool-1.8.12.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:549b2da65c30905248aee07367a9cae3dd94bceaddd9c122d55075766c868733
size 684159

3
ipmitool-1.8.13.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:530bea8685a647a2ca58f40a1b317d529056f00129ad770e376a5b8a7faa8575
size 717294

24
ipmitool-bigendian.patch
View File

@ -1,24 +0,0 @@
Index: ipmitool-1.8.12/lib/ipmi_chassis.c
===================================================================
--- ipmitool-1.8.12.orig/lib/ipmi_chassis.c
+++ ipmitool-1.8.12/lib/ipmi_chassis.c
@@ -41,6 +41,7 @@
#include <ipmitool/ipmi_intf.h>
#include <ipmitool/ipmi_strings.h>
#include <ipmitool/ipmi_chassis.h>
+#include <ipmitool/bswap.h>
extern int verbose;
Index: ipmitool-1.8.12/lib/ipmi_pef.c
===================================================================
--- ipmitool-1.8.12.orig/lib/ipmi_pef.c
+++ ipmitool-1.8.12/lib/ipmi_pef.c
@@ -39,6 +39,7 @@
#include <ipmitool/ipmi.h>
#include <ipmitool/ipmi_intf.h>
#include <ipmitool/ipmi_pef.h>
+#include <ipmitool/bswap.h>
extern int verbose;
/*

15
ipmitool.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Fri Oct 4 06:38:02 UTC 2013 - kkaempf@suse.com
- Update to 1.8.13
Changes: many, see
http://sourceforge.net/projects/ipmitool/files/ipmitool/1.8.13/
- drop patches included upstream
* compile-fixes.patch
* ekanalyzer_fix_wrong_type_comparison.patch
* increase_possible_fw_file_size.patch
* ipmitool-bigendian.patch
* old-gcc-options.patch
-------------------------------------------------------------------
Tue Jul 16 13:36:07 UTC 2013 - tchvatal@suse.com
@ -25,6 +39,7 @@ Thu Feb 28 12:28:56 UTC 2013 - kkaempf@suse.com
- 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
-------------------------------------------------------------------
Mon Feb 13 10:47:55 UTC 2012 - coolo@suse.com

16
ipmitool.spec
View File

@ -24,22 +24,15 @@ Url: http://ipmitool.sourceforge.net/
Summary: Utility for IPMI Control
License: BSD-3-Clause
Group: System/Management
Version: 1.8.12
Version: 1.8.13
Release: 0
Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
Patch: compile-fixes
Patch1: ipmitool-1.8.10-implicit-fortify-decl.patch
Patch2: increase_possible_fw_file_size.patch
Patch3: fwum_enhance_output.patch
Patch4: sdradd_close_file_handle.patch
Patch5: ekanalyzer_fix_wrong_type_comparison.patch
Patch6: fix_file_permissions.patch
Patch8: several_more_compile_fixes.patch
Patch9: automake-1.13.patch
#PATCH-FIX-UPSTREAM https://sourceforge.net/tracker/?func=detail&aid=3578022&group_id=95200&atid=610550
Patch10: ipmitool-bigendian.patch
#PATCH-FIX-SUSE gcc 4.3 does not like -Wno-unused-result -Wno-packed-bitfield-compat, kkaempf@suse.de
Patch11: old-gcc-options.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -62,19 +55,12 @@ and setting LAN configuration, and chassis power control.
%prep
%setup -q
%patch -p1
%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%if 0%{?suse_version} < 1140
%patch11 -p1
%endif
%build
touch INSTALL NEWS

12
old-gcc-options.patch
View File

@ -1,12 +0,0 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs -x Makefile -x Makefile ../orig-ipmitool-1.8.12/configure.in ./configure.in
--- ../orig-ipmitool-1.8.12/configure.in 2013-02-28 13:52:11.893152359 +0100
+++ ./configure.in 2013-05-15 14:01:22.874811257 +0200
@@ -34,7 +34,7 @@
AC_CHECK_FUNCS([memmove memset strchr strdup strerror])
AC_CHECK_FUNCS([getpassphrase])
-CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type -Wno-unused-result -Wno-packed-bitfield-compat"
+CFLAGS="$CFLAGS -fno-strict-aliasing -Wreturn-type"
AM_PROG_LIBTOOL
LIBTOOL="$LIBTOOL --silent"

8
sdradd_close_file_handle.patch
View File

@ -1,7 +1,7 @@
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_sdradd.c ./lib/ipmi_sdradd.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_sdradd.c 2010-04-23 22:00:41.000000000 +0200
+++ ./lib/ipmi_sdradd.c 2013-02-28 13:44:59.044084023 +0100
@@ -628,6 +629,7 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c ./lib/ipmi_sdradd.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c 2013-10-04 09:06:38.279805998 +0200
+++ ./lib/ipmi_sdradd.c 2013-10-04 09:08:04.979355617 +0200
@@ -634,6 +634,7 @@
queue->tail->next = sdrr;
queue->tail = sdrr;
}

90
several_more_compile_fixes.patch
View File

@ -1,7 +1,7 @@
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 2013-02-28 13:59:10.489669393 +0100
+++ ./lib/ipmi_ekanalyzer.c 2013-02-28 14:03:01.722792252 +0100
@@ -395,7 +395,6 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_ekanalyzer.c ./lib/ipmi_ekanalyzer.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_ekanalyzer.c 2013-08-23 21:02:34.000000000 +0200
+++ ./lib/ipmi_ekanalyzer.c 2013-10-04 09:11:10.594954861 +0200
@@ -397,7 +397,6 @@
static int
ipmi_ek_get_file_type( char * argument )
{
@ -9,24 +9,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
int filetype = ERROR_STATUS;
if( strlen (argument) > MIN_ARGUMENT ){
@@ -1092,8 +1091,6 @@
}
else{
int num_file=0;
- int index_data = 0;
- int first_data = 1;
tboolean amc_file = FALSE; /*used to indicate the present of AMC file*/
tboolean oc_file = FALSE; /*used to indicate the present of Carrier file*/
@@ -1139,7 +1136,6 @@
struct ipmi_ek_multi_header * pcarrier_p2p;
int list = 0;
int match_pair = 0;
- tboolean match_result = FALSE;
/*Create an empty list*/
for ( list=0; list<argc; list++ ){
@@ -3250,7 +3246,7 @@
@@ -3378,7 +3377,7 @@
offset += sizeof(struct fru_picmgext_guid);
}
@ -35,7 +18,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
offset < record->header.len;
offset += sizeof(struct fru_picmgext_link_desc)
) {
@@ -3419,7 +3415,7 @@
@@ -3547,7 +3546,7 @@
printf(" IPMB-0 Hub Descriptor Count: 0x%02x", record->data[offset++]);
if (record->data[offset] > 0){
@ -44,7 +27,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
unsigned char entry_count = 0;
printf(" IPMB-0 Hub Descriptor\n");
printf("\tHardware Address: 0x%02x\n", record->data[offset++]);
@@ -3850,7 +3846,7 @@
@@ -3990,7 +3989,7 @@
(feature > 1) & 1,
(feature&1)?"Source":"Receiver");
printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n", family, accuracy);
@ -53,19 +36,10 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
freq, min_freq, max_freq);
}
printf("\n");
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_fwum.c ./lib/ipmi_fwum.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_fwum.c 2013-02-28 13:53:34.644417793 +0100
+++ ./lib/ipmi_fwum.c 2013-02-28 14:04:34.910468572 +0100
@@ -480,7 +480,7 @@
if(pFileHandle)
{
- if(fseek(pFileHandle, 0L , SEEK_END) == (unsigned int) NULL)
+ if(fseek(pFileHandle, 0L , SEEK_END) == 0)
{
*pFileSize = ftell(pFileHandle);
@@ -1307,7 +1307,6 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c ./lib/ipmi_fwum.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c 2013-10-04 09:07:54.914943566 +0200
+++ ./lib/ipmi_fwum.c 2013-10-04 09:11:10.594954861 +0200
@@ -1302,7 +1302,6 @@
unsigned long lastAddress = 0;
unsigned char sequenceNumber = 0;
unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
@ -73,10 +47,10 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
do
{
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_hpmfwupg.c ./lib/ipmi_hpmfwupg.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_hpmfwupg.c 2013-02-28 13:52:11.893152359 +0100
+++ ./lib/ipmi_hpmfwupg.c 2013-02-28 14:01:19.162746040 +0100
@@ -1286,7 +1286,6 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_hpmfwupg.c ./lib/ipmi_hpmfwupg.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_hpmfwupg.c 2013-10-04 09:06:38.711823686 +0200
+++ ./lib/ipmi_hpmfwupg.c 2013-10-04 09:11:10.594954861 +0200
@@ -1323,7 +1323,6 @@
*****************************************************************************/
int HpmfwupgTargetCheck(struct ipmi_intf * intf, int option)
{
@ -84,7 +58,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
int rc = HPMFWUPG_SUCCESS;
int componentId = 0;
@@ -1445,7 +1444,6 @@
@@ -1507,7 +1506,6 @@
int activate,int componentToUpload, int option)
{
int rc = HPMFWUPG_SUCCESS;
@ -92,9 +66,9 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
struct HpmfwupgUpgradeCtx fwupgCtx;
/*
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_isol.c ./lib/ipmi_isol.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_isol.c 2012-01-21 06:32:24.000000000 +0100
+++ ./lib/ipmi_isol.c 2013-02-28 14:01:19.162746040 +0100
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_isol.c ./lib/ipmi_isol.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_isol.c 2013-01-16 13:29:21.000000000 +0100
+++ ./lib/ipmi_isol.c 2013-10-04 09:11:10.594954861 +0200
@@ -413,7 +413,6 @@
struct ipmi_rs * rsp;
struct ipmi_rq req;
@ -103,10 +77,10 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_ISOL;
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_picmg.c ./lib/ipmi_picmg.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_picmg.c 2012-08-03 19:07:07.000000000 +0200
+++ ./lib/ipmi_picmg.c 2013-02-28 14:18:31.523468906 +0100
@@ -432,7 +432,7 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_picmg.c ./lib/ipmi_picmg.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_picmg.c 2013-05-18 08:31:02.000000000 +0200
+++ ./lib/ipmi_picmg.c 2013-10-04 09:11:10.598955025 +0200
@@ -878,7 +878,7 @@
}
else if (d->type >= 0x06 && d->type <= 0xef)
{
@ -115,7 +89,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
}
else if (d->type >= 0xf0 && d->type <= 0xfe)
{
@@ -1201,7 +1201,7 @@
@@ -1690,7 +1690,7 @@
oemval2str( rsp->data[3], rsp->data[4],
picmg_clk_accuracy_vals));
@ -124,7 +98,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
}
}
}
@@ -1258,7 +1258,7 @@
@@ -1751,7 +1751,7 @@
printf("## setting: 0x%02x\n", msg_data[3]);
printf("## family: %d\n", msg_data[4]);
printf("## acc: %d\n", msg_data[5]);
@ -133,10 +107,10 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
printf("## res: %d\n", msg_data[10]);
#endif
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_sdradd.c ./lib/ipmi_sdradd.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_sdradd.c 2013-02-28 13:55:22.988692984 +0100
+++ ./lib/ipmi_sdradd.c 2013-02-28 14:01:19.166746197 +0100
@@ -573,7 +573,6 @@
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c ./lib/ipmi_sdradd.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c 2013-10-04 09:10:35.533519436 +0200
+++ ./lib/ipmi_sdradd.c 2013-10-04 09:11:10.598955025 +0200
@@ -576,7 +576,6 @@
static int
ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
{
@ -144,9 +118,9 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
int rc = 0;
int fd;
uint8_t binHdr[5];
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_sdr.c ./lib/ipmi_sdr.c
--- ../orig-ipmitool-1.8.12/lib/ipmi_sdr.c 2012-07-23 16:52:57.000000000 +0200
+++ ./lib/ipmi_sdr.c 2013-02-28 14:01:19.166746197 +0100
diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-ipmitool-1.8.13/lib/ipmi_sdr.c ./lib/ipmi_sdr.c
--- ../orig-ipmitool-1.8.13/lib/ipmi_sdr.c 2013-08-23 21:02:34.000000000 +0200
+++ ./lib/ipmi_sdr.c 2013-10-04 09:11:10.598955025 +0200
@@ -52,6 +52,7 @@
#include <ipmitool/ipmi_entity.h>
#include <ipmitool/ipmi_constants.h>