Hello community,
here is the log from the commit of package ipmitool for openSUSE:Factory checked in at 2013-03-08 21:13:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ipmitool (Old)
and /work/SRC/openSUSE:Factory/.ipmitool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ipmitool", Maintainer is "duwe@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ipmitool/ipmitool.changes 2012-02-16 14:57:09.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ipmitool.new/ipmitool.changes 2013-03-08 21:13:53.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Feb 28 13:25:09 UTC 2013 - kkaempf@suse.com
+
+- Adapt to Automake 1.13
+
+-------------------------------------------------------------------
+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
+-------------------------------------------------------------------
Old:
----
ipmitool-1.8.11.tar.bz2
lan_fix_return_value.patch
New:
----
automake-1.13.patch
ipmitool-1.8.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ipmitool.spec ++++++
--- /var/tmp/diff_new_pack.r1CQqi/_old 2013-03-08 21:13:54.000000000 +0100
+++ /var/tmp/diff_new_pack.r1CQqi/_new 2013-03-08 21:13:54.000000000 +0100
@@ -23,7 +23,7 @@
BuildRequires: libtool
Url: http://ipmitool.sourceforge.net/
Summary: Utility for IPMI Control
-Version: 1.8.11
+Version: 1.8.12
Release: 9
License: BSD-3-Clause
Group: System/Management
@@ -35,8 +35,8 @@
Patch4: sdradd_close_file_handle.patch
Patch5: ekanalyzer_fix_wrong_type_comparison.patch
Patch6: fix_file_permissions.patch
-Patch7: lan_fix_return_value.patch
Patch8: several_more_compile_fixes.patch
+Patch9: automake-1.13.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -60,14 +60,14 @@
%prep
%setup -q
%patch -p1
-%patch1
+%patch1 -p0
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
%patch8 -p1
+%patch9 -p1
%build
touch INSTALL NEWS
++++++ automake-1.13.patch ++++++
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
@@ -4,7 +4,7 @@
AC_INIT([src/ipmitool.c])
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE([ipmitool], [1.8.12])
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
AC_CONFIG_SRCDIR([src/ipmitool.c])
AC_PREREQ(2.50)
AC_SUBST(ac_configure_args)
++++++ compile-fixes ++++++
--- /var/tmp/diff_new_pack.r1CQqi/_old 2013-03-08 21:13:54.000000000 +0100
+++ /var/tmp/diff_new_pack.r1CQqi/_new 2013-03-08 21:13:54.000000000 +0100
@@ -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 @@
}
}
-@@ -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_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 wrong file permission
-
-Reference:
-https://bugzillafiles.novell.org/attachment.cgi?id=206754&t=hMTMCz2m9Q
-
-Signed-off-by: Thomas Renninger
-Signed-off-by: Wilken Gottwalt
-
-
----
- lib/helper.c | 1 -
- src/ipmievd.c | 3 +++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-Index: ipmitool-1.8.11/lib/helper.c
-===================================================================
---- ipmitool-1.8.11.orig/lib/helper.c
-+++ ipmitool-1.8.11/lib/helper.c
-@@ -427,7 +427,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
+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 @@
#endif
chdir("/");
@@ -24,11 +9,10 @@
for (fd=0; fd<64; fd++) {
if (fd != intf->fd)
-Index: ipmitool-1.8.11/src/ipmievd.c
-===================================================================
---- ipmitool-1.8.11.orig/src/ipmievd.c
-+++ ipmitool-1.8.11/src/ipmievd.c
-@@ -687,6 +687,7 @@ ipmievd_main(struct ipmi_event_intf * ei
+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 @@
int i, rc;
int daemon = 1;
struct sigaction act;
@@ -36,13 +20,14 @@
memset(pidfile, 0, 64);
sprintf(pidfile, "%s%d", DEFAULT_PIDFILE, eintf->intf->devnum);
-@@ -744,7 +745,9 @@ ipmievd_main(struct ipmi_event_intf * ei
- }
- }
+@@ -752,8 +753,9 @@
+ ipmi_start_daemon(eintf->intf);
+
+- umask(022);
+ oldumask = umask(022);
fp = ipmi_open_file_write(pidfile);
+ umask(oldumask);
- if (fp != NULL) {
- fprintf(fp, "%d\n", (int)getpid());
- fclose(fp);
+ if (fp == NULL) {
+ /* Failed to get fp on PID file -> exit. */
+ log_halt();
++++++ fwum_enhance_output.patch ++++++
--- /var/tmp/diff_new_pack.r1CQqi/_old 2013-03-08 21:13:54.000000000 +0100
+++ /var/tmp/diff_new_pack.r1CQqi/_new 2013-03-08 21:13:54.000000000 +0100
@@ -1,39 +1,30 @@
-Be more verbose when detecting a board mismatch when trying to flash the firmware
-
-Signed-off-by: Thomas Renninger
-
----
- lib/ipmi_fwum.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-Index: ipmitool-1.8.11/lib/ipmi_fwum.c
-===================================================================
---- ipmitool-1.8.11.orig/lib/ipmi_fwum.c
-+++ ipmitool-1.8.11/lib/ipmi_fwum.c
-@@ -1656,13 +1656,15 @@ tKFWUM_Status KfwumValidFirmwareForBoard
-
- if(boardInfo.iana != firmInfo.iana)
- {
-- printf("Board IANA does not match firmware IANA\n");
-+ printf("Board IANA [%u] does not match firmware IANA [%u]\n",
-+ boardInfo.iana, firmInfo.iana);
- status = KFWUM_STATUS_ERROR;
- }
-
- if(boardInfo.boardId != firmInfo.boardId)
- {
-- printf("Board IANA does not match firmware IANA\n");
-+ printf("Error: Board ID [%u] does not match firmware board ID [%u]\n",
-+ boardInfo.boardId, firmInfo.boardId);
- status = KFWUM_STATUS_ERROR;
- }
-
-@@ -1680,6 +1682,8 @@ static void KfwumOutputInfo(tKFWUM_Board
- {
- printf("Target Board Id : %u\n",boardInfo.boardId);
- printf("Target IANA number : %u\n",boardInfo.iana);
-+ printf("FW File Board Id : %u\n",firmInfo.boardId);
-+ printf("FW File IANA number : %u\n",firmInfo.iana);
- printf("File Size : %lu bytes\n",firmInfo.fileSize);
- printf("Firmware Version : %d.%d%d SDR %d\n",firmInfo.versMajor,
- firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev);
+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 @@
+
+ if(boardInfo.iana != firmInfo.iana)
+ {
+- printf("Board IANA does not match firmware IANA\n");
++ printf("Board IANA [%u] does not match firmware IANA [%u]\n",
++ boardInfo.iana, firmInfo.iana);
+ status = KFWUM_STATUS_ERROR;
+ }
+
+ if(boardInfo.boardId != firmInfo.boardId)
+ {
+- printf("Board IANA does not match firmware IANA\n");
++ printf("Error: Board ID [%u] does not match firmware board ID [%u]\n",
++ boardInfo.boardId, firmInfo.boardId);
+ status = KFWUM_STATUS_ERROR;
+ }
+
+@@ -1672,6 +1682,8 @@
+ {
+ printf("Target Board Id : %u\n",boardInfo.boardId);
+ printf("Target IANA number : %u\n",boardInfo.iana);
++ printf("FW File Board Id : %u\n",firmInfo.boardId);
++ printf("FW File IANA number : %u\n",firmInfo.iana);
+ printf("File Size : %lu bytes\n",firmInfo.fileSize);
+ printf("Firmware Version : %d.%d%d SDR %d\n",firmInfo.versMajor,
+ firmInfo.versMinor, firmInfo.versSubMinor, firmInfo.sdrRev);
++++++ increase_possible_fw_file_size.patch ++++++
--- /var/tmp/diff_new_pack.r1CQqi/_old 2013-03-08 21:13:54.000000000 +0100
+++ /var/tmp/diff_new_pack.r1CQqi/_new 2013-03-08 21:13:54.000000000 +0100
@@ -1,168 +1,34 @@
-Increase possible file size for FW upgrades and avoid segfaults if still too big
-
-Also close a file descriptor which gets opened, but never closed, compare with:
-https://bugzilla.novell.com/show_bug.cgi?id=534909
-
-Signed-off-by: Thomas Renninger
-
----
- lib/ipmi_fwum.c | 86 ++++++++++++++++++++++++++++++--------------------------
- 1 file changed, 47 insertions(+), 39 deletions(-)
-
-Index: ipmitool-1.8.11/lib/ipmi_fwum.c
-===================================================================
---- ipmitool-1.8.11.orig/lib/ipmi_fwum.c
-+++ ipmitool-1.8.11/lib/ipmi_fwum.c
-@@ -141,7 +141,8 @@ typedef struct sKFWUM_SaveFirmwareInfo
-
- 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 @@ static tKFWUM_Status KfwumSetupBuffersFr
- 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 @@ static tKFWUM_Status KfwumSetupBuffersFr
- {
- KfwumShowProgress((const unsigned char *)"Reading Firmware from File", 100, 100);
- }
-+ fclose(pFileHandle);
- }
- return(status);
- }
-@@ -986,9 +994,9 @@ static tKFWUM_Status KfwumManualRollback
- return status;
- }
-
--#ifdef PRAGMA_PACK
--#pramga pack(1)
--#endif
-+#ifdef PRAGMA_PACK
-+#pramga pack(1)
-+#endif
- struct KfwumStartFirmwareDownloadReq{
- unsigned char lengthLSB;
- unsigned char lengthMid;
-@@ -996,20 +1004,20 @@ struct KfwumStartFirmwareDownloadReq{
- unsigned char paddingLSB;
- unsigned char paddingMSB;
- unsigned char useSequence;
--} ATTRIBUTE_PACKING;
--#ifdef PRAGMA_PACK
--#pramga pack(0)
--#endif
--
--#ifdef PRAGMA_PACK
--#pramga pack(1)
--#endif
-+} ATTRIBUTE_PACKING;
-+#ifdef PRAGMA_PACK
-+#pramga pack(0)
-+#endif
-+
-+#ifdef PRAGMA_PACK
-+#pramga pack(1)
-+#endif
- struct KfwumStartFirmwareDownloadResp {
- unsigned char bank;
--} ATTRIBUTE_PACKING;
--#ifdef PRAGMA_PACK
--#pramga pack(0)
--#endif
-+} ATTRIBUTE_PACKING;
-+#ifdef PRAGMA_PACK
-+#pramga pack(0)
-+#endif
-
- static tKFWUM_Status KfwumStartFirmwareImage(struct ipmi_intf * intf,
- unsigned long length,unsigned short padding)
-@@ -1065,9 +1073,9 @@ static tKFWUM_Status KfwumStartFirmwareI
- return status;
- }
-
--#ifdef PRAGMA_PACK
--#pramga pack(1)
--#endif
-+#ifdef PRAGMA_PACK
-+#pramga pack(1)
-+#endif
- struct KfwumSaveFirmwareAddressReq
- {
- unsigned char addressLSB;
-@@ -1075,22 +1083,22 @@ struct KfwumSaveFirmwareAddressReq
- unsigned char addressMSB;
- unsigned char numBytes;
- unsigned char txBuf[KFWUM_SMALL_BUFFER-KFWUM_OLD_CMD_OVERHEAD];
--} ATTRIBUTE_PACKING;
--#ifdef PRAGMA_PACK
--#pramga pack(0)
--#endif
--
--#ifdef PRAGMA_PACK
--#pramga pack(1)
--#endif
-+} ATTRIBUTE_PACKING;
-+#ifdef PRAGMA_PACK
-+#pramga pack(0)
-+#endif
-+
-+#ifdef PRAGMA_PACK
-+#pramga pack(1)
-+#endif
- struct KfwumSaveFirmwareSequenceReq
- {
- unsigned char sequenceNumber;
- unsigned char txBuf[KFWUM_BIG_BUFFER];
--} ATTRIBUTE_PACKING;
--#ifdef PRAGMA_PACK
--#pramga pack(0)
--#endif
-+} ATTRIBUTE_PACKING;
-+#ifdef PRAGMA_PACK
-+#pramga pack(0)
-+#endif
-
-
- #define FWUM_SAVE_FIRMWARE_NO_RESPONSE_LIMIT ((unsigned char)6)
-@@ -1234,19 +1242,19 @@ static tKFWUM_Status KfwumSaveFirmwareIm
- return status;
- }
-
--#ifdef PRAGMA_PACK
--#pramga pack(1)
--#endif
-+#ifdef PRAGMA_PACK
-+#pramga pack(1)
-+#endif
- struct KfwumFinishFirmwareDownloadReq{
- unsigned char versionMaj;
- unsigned char versionMinSub;
- unsigned char versionSdr;
- unsigned char reserved;
--} ATTRIBUTE_PACKING;
--#ifdef PRAGMA_PACK
--#pramga pack(0)
--#endif
--
-+} ATTRIBUTE_PACKING;
-+#ifdef PRAGMA_PACK
-+#pramga pack(0)
-+#endif
-+
- static tKFWUM_Status KfwumFinishFirmwareImage(struct ipmi_intf * intf,
- tKFWUM_InFirmwareInfo firmInfo)
- {
+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);
+ }
++++++ ipmitool-1.8.11.tar.bz2 -> ipmitool-1.8.12.tar.bz2 ++++++
++++ 114526 lines of diff (skipped)
++++++ sdradd_close_file_handle.patch ++++++
--- /var/tmp/diff_new_pack.r1CQqi/_old 2013-03-08 21:13:55.000000000 +0100
+++ /var/tmp/diff_new_pack.r1CQqi/_new 2013-03-08 21:13:55.000000000 +0100
@@ -1,18 +1,7 @@
-Fix unclosed file handle in ipmi_sdradd.c
-
-References:
-https://bugzilla.novell.com/show_bug.cgi?id=534909
-
-Signed-off-by: Thomas Renninger
----
- lib/ipmi_sdradd.c | 1 +
- 1 file changed, 1 insertion(+)
-
-Index: ipmitool-1.8.11/lib/ipmi_sdradd.c
-===================================================================
---- ipmitool-1.8.11.orig/lib/ipmi_sdradd.c
-+++ ipmitool-1.8.11/lib/ipmi_sdradd.c
-@@ -380,6 +380,7 @@ ipmi_sdr_read_records(const char *filena
+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 @@
queue->tail->next = sdrr;
queue->tail = sdrr;
}
++++++ several_more_compile_fixes.patch ++++++
--- /var/tmp/diff_new_pack.r1CQqi/_old 2013-03-08 21:13:55.000000000 +0100
+++ /var/tmp/diff_new_pack.r1CQqi/_new 2013-03-08 21:13:55.000000000 +0100
@@ -1,45 +1,6 @@
-Fixes several compile warnings listed below
-
-ipmi_sdr.c: In function 'ipmi_sdr_print_sensor_full':
-ipmi_sdr.c:1177: warning: implicit declaration of function 'ipmi_sensor_get_sensor_reading_factors'
-
-ipmi_chassis.c:1143: warning: unused variable 'i'
-ipmi_chassis.c:717: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
-ipmi_chassis.c:720: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
-ipmi_chassis.c:724: warning: format '%08X' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
-
-================================================================================
---- ipmitool-1.8.11/lib/ipmi_chassis.c
-+++ ipmitool-1.8.11/lib/ipmi_chassis.c
-@@ -714,14 +714,14 @@
-
- printf(" Boot Initiator Info :\n");
- printf(" Channel Number : %d\n", (rsp->data[2] & 0x0f));
-- printf(" Session Id : %08Xh\n",session_id);
-+ printf(" Session Id : %08lXh\n",session_id);
- if(timestamp != 0)
- {
-- printf(" Timestamp : %08Xh, %s\n",timestamp,time_buf);
-+ printf(" Timestamp : %08lXh, %s\n",timestamp,time_buf);
- }
- else
- {
-- printf(" Timestamp : %08Xh, undefined\n",timestamp);
-+ printf(" Timestamp : %08lXh, undefined\n",timestamp);
- }
-
- }
-@@ -1140,8 +1140,6 @@
- memset(&flags[0], 0, sizeof(flags));
- token = strtok_r(argv[2] + 8, ",", &saveptr);
- while (token != NULL) {
-- int i;
--
- if (strcmp(token, "help") == 0) {
- optionError = 1;
- break;
---- ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
-+++ ipmitool-1.8.11/lib/ipmi_ekanalyzer.c
+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 @@
static int
ipmi_ek_get_file_type( char * argument )
@@ -65,7 +26,7 @@
/*Create an empty list*/
for ( list=0; listheader.len;
offset += sizeof(struct fru_picmgext_link_desc)
) {
-- /* to solve little endian /big endian problem */
-+ /* to solve little endian /big endian problem */
- unsigned long data;
- struct fru_picmgext_link_desc * d;
-
@@ -3419,7 +3415,7 @@
printf(" IPMB-0 Hub Descriptor Count: 0x%02x", record->data[offset++]);
@@ -92,80 +48,53 @@
(feature > 1) & 1,
(feature&1)?"Source":"Receiver");
printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n", family, accuracy);
-- printf("\tFRQ: %-9d - min: %-9d - max: %-9d\n",
-+ printf("\tFRQ: %-9lu - min: %-9lu - max: %-9lu\n",
+- printf("\tFRQ: %-9ld - min: %-9ld - max: %-9ld\n",
++ printf("\tFRQ: %-9lu - min: %-9ld - max: %-9ld\n",
freq, min_freq, max_freq);
}
printf("\n");
-@@ -3902,9 +3898,9 @@
- else{
- int record_count = 0;
-
-- if ( verbose == LOG_DEBUG ){
-- printf( "start multi offset = 0x%02x\n", multi_offset );
-- }
-+ if ( verbose == LOG_DEBUG )
-+ printf( "start multi offset = 0x%02lx\n", multi_offset );
-+
- /*the offset value is in multiple of 8 bytes.*/
- multi_offset = multi_offset * 8;
- fseek ( input_file, multi_offset, SEEK_SET );
---- ipmitool-1.8.11/lib/ipmi_fwum.c
-+++ ipmitool-1.8.11/lib/ipmi_fwum.c
+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);
-
+
+ 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 @@
- unsigned long lastAddress = 0;
- unsigned char sequenceNumber = 0;
- unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
-- unsigned char isLengthValid = 1;
-
- do
- {
---- ipmitool-1.8.11/lib/ipmi_hpmfwupg.c
-+++ ipmitool-1.8.11/lib/ipmi_hpmfwupg.c
-@@ -1220,7 +1220,6 @@
+ unsigned long lastAddress = 0;
+ unsigned char sequenceNumber = 0;
+ unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
+- unsigned char isLengthValid = 1;
+
+ 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 @@
*****************************************************************************/
int HpmfwupgTargetCheck(struct ipmi_intf * intf, int option)
{
- struct HpmfwupgUpgradeCtx fwupgCtx;
struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
- int rc = HPMFWUPG_SUCCESS;
+ int rc = HPMFWUPG_SUCCESS;
int componentId = 0;
-@@ -1363,7 +1362,6 @@
+@@ -1445,7 +1444,6 @@
int activate,int componentToUpload, int option)
{
int rc = HPMFWUPG_SUCCESS;
- struct HpmfwupgImageHeader imageHeader;
struct HpmfwupgUpgradeCtx fwupgCtx;
-
+
/*
-@@ -1847,8 +1845,6 @@
- unsigned char componentIdByte = 0x00;
- VERSIONINFO *pVersionInfo;
-
-- struct HpmfwupgGetComponentPropertiesCtx getCompProp;
--
- /* Save component ID on which the upload is done */
- componentIdByte = pActionRecord->components.ComponentBits.byte;
- while ((componentIdByte>>=1)!=0)
-@@ -2061,7 +2057,6 @@
- struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
- struct HpmfwupgUploadFirmwareBlockCtx uploadCmd;
- struct HpmfwupgFinishFirmwareUploadCtx finishCmd;
-- struct HpmfwupgGetComponentPropertiesCtx getCompProp;
- VERSIONINFO *pVersionInfo;
-
- unsigned char* pData, *pDataInitial;
---- ipmitool-1.8.11/lib/ipmi_isol.c
-+++ ipmitool-1.8.11/lib/ipmi_isol.c
+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
@@ -413,7 +413,6 @@
struct ipmi_rs * rsp;
struct ipmi_rq req;
@@ -174,115 +103,40 @@
memset(&req, 0, sizeof(req));
req.msg.netfn = IPMI_NETFN_ISOL;
---- ipmitool-1.8.11/lib/ipmi_picmg.c
-+++ ipmitool-1.8.11/lib/ipmi_picmg.c
-@@ -395,11 +395,11 @@
+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 @@
}
else if (d->type >= 0x06 && d->type <= 0xef)
{
-- printf("Reserved\n",d->type);
+- printf("Reserved\n");
+ printf("Reserved %d\n",d->type);
}
else if (d->type >= 0xf0 && d->type <= 0xfe)
{
-- printf("OEM GUID Definition\n",d->type);
-+ printf("OEM GUID Definition %d\n",d->type);
- }
- else
- {
-@@ -471,7 +471,6 @@
- struct ipmi_rq req;
-
- unsigned char msg_data[6];
-- struct fru_picmgext_link_desc* d;
-
- memset(&req, 0, sizeof(req));
-
-@@ -762,7 +761,7 @@
- return -1;
+@@ -1201,7 +1201,7 @@
+ oemval2str( rsp->data[3], rsp->data[4],
+ picmg_clk_accuracy_vals));
+
+- printf(" - Freq: %ld\n", freq);
++ printf(" - Freq: %lu\n", freq);
+ }
+ }
}
-
-- printf("LED Color Capabilities: ", rsp->data[1] );
-+ printf("LED Color Capabilities: ");
- for ( i=0 ; i<8 ; i++ ) {
- if ( rsp->data[1] & (0x01 << i) ) {
- printf("%s, ", led_color_str[ i ]);
-@@ -945,7 +944,6 @@
- int
- ipmi_picmg_set_power_level(struct ipmi_intf * intf, int argc, char ** argv)
- {
-- int i;
- struct ipmi_rs * rsp;
- struct ipmi_rq req;
-
-@@ -1020,7 +1018,6 @@
- int
- ipmi_picmg_clk_get(struct ipmi_intf * intf, int argc, char ** argv)
- {
-- int i;
- struct ipmi_rs * rsp;
- struct ipmi_rq req;
-
-@@ -1073,7 +1070,7 @@
- printf(" - Index: %d\n", rsp->data[2]);
- printf(" - Family: %d\n", rsp->data[3]);
- printf(" - AccLVL: %d\n", rsp->data[4]);
-- printf(" - Freq: %d\n", freq);
-+ printf(" - Freq: %lu\n", freq);
- }
-
- return 0;
-@@ -1083,7 +1080,6 @@
- int
- ipmi_picmg_clk_set(struct ipmi_intf * intf, int argc, char ** argv)
- {
-- int i;
- struct ipmi_rs * rsp;
- struct ipmi_rq req;
-
-@@ -1115,10 +1111,10 @@
- #if 1
- printf("## ID: %d\n", msg_data[1]);
- printf("## index: %d\n", msg_data[2]);
--printf("## setting: 0x02x\n", msg_data[3]);
-+printf("## setting: %0x02x\n", msg_data[3]);
+@@ -1258,7 +1258,7 @@
+ printf("## setting: 0x%02x\n", msg_data[3]);
printf("## family: %d\n", msg_data[4]);
printf("## acc: %d\n", msg_data[5]);
--printf("## freq: %d\n", freq );
+-printf("## freq: %ld\n", freq );
+printf("## freq: %lu\n", freq );
printf("## res: %d\n", msg_data[10]);
#endif
-@@ -1528,15 +1524,10 @@
- else if (!strncmp(argv[0], "clk", 3)) {
- if (argc > 1) {
- if (!strncmp(argv[1], "get", 3)) {
-- if (argc > 2) {
-- unsigned char clk_id;
-- unsigned char clk_res;
--
-+ if (argc > 2)
- rc = ipmi_picmg_clk_get(intf, argc-1, &(argv[2]));
-- }
- else {
- printf("clk get <CLK-ID> [<DEV-ID>]\n");
--
- return -1;
- }
- }
---- ipmitool-1.8.11/lib/ipmi_sdr.c
-+++ ipmitool-1.8.11/lib/ipmi_sdr.c
-@@ -47,6 +47,7 @@
- #include
- #include
- #include
-+#include
-
- #if HAVE_CONFIG_H
- # include
---- ipmitool-1.8.11/lib/ipmi_sdradd.c
-+++ ipmitool-1.8.11/lib/ipmi_sdradd.c
-@@ -325,7 +325,6 @@
+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 @@
static int
ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
{
@@ -290,13 +144,14 @@
int rc = 0;
int fd;
uint8_t binHdr[5];
---- ipmitool-1.8.11/src/ipmievd.c
-+++ ipmitool-1.8.11/src/ipmievd.c
-@@ -665,6 +665,7 @@
- }
- sleep(selwatch_timeout);
- }
-+ return 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_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
+@@ -52,6 +52,7 @@
+ #include
+ #include
+ #include
++#include
+ #if HAVE_CONFIG_H
+ # include
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org