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

* ipmitool-bigendian.patch

Browse Source 
* old-gcc-options.patch

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=18
This commit is contained in:
Klaus Kämpf 2013-10-04 07:16:20 +00:00 committed by Git OBS Bridge
parent 16f3002554
commit f5606de245
8 changed files with 33 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

8
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 ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c ./lib/ipmi_fwum.c 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 08:45:21.179606671 +0200 --- ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c 2013-08-23 21:02:34.000000000 +0200
+++ ./lib/ipmi_fwum.c 2013-10-04 08:45:33.784120931 +0200 +++ ./lib/ipmi_fwum.c 2013-10-04 09:07:13.153233777 +0200
@@ -1659,13 +1659,15 @@ @@ -1651,13 +1651,15 @@
if(boardInfo.iana != firmInfo.iana) 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; status = KFWUM_STATUS_ERROR;
} }
@@ -1683,6 +1685,8 @@ @@ -1675,6 +1677,8 @@
{ {
printf("Target Board Id : %u\n",boardInfo.boardId); printf("Target Board Id : %u\n",boardInfo.boardId);
printf("Target IANA number : %u\n",boardInfo.iana); printf("Target IANA number : %u\n",boardInfo.iana);

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;
/*

2
ipmitool.changes
View File

@ -9,6 +9,8 @@ Fri Oct 4 06:38:02 UTC 2013 - kkaempf@suse.com
* compile-fixes.patch * compile-fixes.patch
* ekanalyzer_fix_wrong_type_comparison.patch * ekanalyzer_fix_wrong_type_comparison.patch
* increase_possible_fw_file_size.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 Tue Jul 16 13:36:07 UTC 2013 - tchvatal@suse.com

8
ipmitool.spec
View File

@ -33,10 +33,6 @@ Patch4: sdradd_close_file_handle.patch
Patch6: fix_file_permissions.patch Patch6: fix_file_permissions.patch
Patch8: several_more_compile_fixes.patch Patch8: several_more_compile_fixes.patch
Patch9: automake-1.13.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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -65,10 +61,6 @@ and setting LAN configuration, and chassis power control.
%patch6 -p1 %patch6 -p1
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1
%if 0%{?suse_version} < 1140
%patch11 -p1
%endif
%build %build
touch INSTALL NEWS 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 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.12/lib/ipmi_sdradd.c 2010-04-23 22:00:41.000000000 +0200 --- ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c 2013-10-04 09:06:38.279805998 +0200
+++ ./lib/ipmi_sdradd.c 2013-02-28 13:44:59.044084023 +0100 +++ ./lib/ipmi_sdradd.c 2013-10-04 09:08:04.979355617 +0200
@@ -628,6 +629,7 @@ @@ -634,6 +634,7 @@
queue->tail->next = sdrr; queue->tail->next = sdrr;
queue->tail = sdrr; queue->tail = sdrr;
} }

28
several_more_compile_fixes.patch
View File

@ -1,6 +1,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 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 --- ../orig-ipmitool-1.8.13/lib/ipmi_ekanalyzer.c 2013-08-23 21:02:34.000000000 +0200
+++ ./lib/ipmi_ekanalyzer.c 2013-10-04 08:50:53.625171693 +0200 +++ ./lib/ipmi_ekanalyzer.c 2013-10-04 09:11:10.594954861 +0200
@@ -397,7 +397,6 @@ @@ -397,7 +397,6 @@
static int static int
ipmi_ek_get_file_type( char * argument ) ipmi_ek_get_file_type( char * argument )
@ -37,9 +37,9 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
} }
printf("\n"); printf("\n");
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 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 08:46:21.654074059 +0200 --- ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c 2013-10-04 09:07:54.914943566 +0200
+++ ./lib/ipmi_fwum.c 2013-10-04 08:50:53.625171693 +0200 +++ ./lib/ipmi_fwum.c 2013-10-04 09:11:10.594954861 +0200
@@ -1310,7 +1310,6 @@ @@ -1302,7 +1302,6 @@
unsigned long lastAddress = 0; unsigned long lastAddress = 0;
unsigned char sequenceNumber = 0; unsigned char sequenceNumber = 0;
unsigned char retry = FWUM_MAX_UPLOAD_RETRY; unsigned char retry = FWUM_MAX_UPLOAD_RETRY;
@ -48,9 +48,9 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
do do
{ {
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 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-08-15 17:50:48.000000000 +0200 --- ../orig-ipmitool-1.8.13/lib/ipmi_hpmfwupg.c 2013-10-04 09:06:38.711823686 +0200
+++ ./lib/ipmi_hpmfwupg.c 2013-10-04 08:50:53.625171693 +0200 +++ ./lib/ipmi_hpmfwupg.c 2013-10-04 09:11:10.594954861 +0200
@@ -1321,7 +1321,6 @@ @@ -1323,7 +1323,6 @@
*****************************************************************************/ *****************************************************************************/
int HpmfwupgTargetCheck(struct ipmi_intf * intf, int option) int HpmfwupgTargetCheck(struct ipmi_intf * intf, int option)
{ {
@ -58,7 +58,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd; struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
int rc = HPMFWUPG_SUCCESS; int rc = HPMFWUPG_SUCCESS;
int componentId = 0; int componentId = 0;
@@ -1505,7 +1504,6 @@ @@ -1507,7 +1506,6 @@
int activate,int componentToUpload, int option) int activate,int componentToUpload, int option)
{ {
int rc = HPMFWUPG_SUCCESS; int rc = HPMFWUPG_SUCCESS;
@ -68,7 +68,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
/* /*
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 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 --- ../orig-ipmitool-1.8.13/lib/ipmi_isol.c 2013-01-16 13:29:21.000000000 +0100
+++ ./lib/ipmi_isol.c 2013-10-04 08:50:53.625171693 +0200 +++ ./lib/ipmi_isol.c 2013-10-04 09:11:10.594954861 +0200
@@ -413,7 +413,6 @@ @@ -413,7 +413,6 @@
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
struct ipmi_rq req; struct ipmi_rq req;
@ -79,7 +79,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
req.msg.netfn = IPMI_NETFN_ISOL; 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 ../orig-ipmitool-1.8.13/lib/ipmi_picmg.c ./lib/ipmi_picmg.c 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 --- ../orig-ipmitool-1.8.13/lib/ipmi_picmg.c 2013-05-18 08:31:02.000000000 +0200
+++ ./lib/ipmi_picmg.c 2013-10-04 08:50:53.625171693 +0200 +++ ./lib/ipmi_picmg.c 2013-10-04 09:11:10.598955025 +0200
@@ -878,7 +878,7 @@ @@ -878,7 +878,7 @@
} }
else if (d->type >= 0x06 && d->type <= 0xef) else if (d->type >= 0x06 && d->type <= 0xef)
@ -108,9 +108,9 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
#endif #endif
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 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-07-08 11:55:29.000000000 +0200 --- ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c 2013-10-04 09:10:35.533519436 +0200
+++ ./lib/ipmi_sdradd.c 2013-10-04 08:50:53.625171693 +0200 +++ ./lib/ipmi_sdradd.c 2013-10-04 09:11:10.598955025 +0200
@@ -575,7 +575,6 @@ @@ -576,7 +576,6 @@
static int static int
ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue) ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue)
{ {
@ -120,7 +120,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache
uint8_t binHdr[5]; uint8_t binHdr[5];
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 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 --- ../orig-ipmitool-1.8.13/lib/ipmi_sdr.c 2013-08-23 21:02:34.000000000 +0200
+++ ./lib/ipmi_sdr.c 2013-10-04 08:50:53.629171856 +0200 +++ ./lib/ipmi_sdr.c 2013-10-04 09:11:10.598955025 +0200
@@ -52,6 +52,7 @@ @@ -52,6 +52,7 @@
#include <ipmitool/ipmi_entity.h> #include <ipmitool/ipmi_entity.h>
#include <ipmitool/ipmi_constants.h> #include <ipmitool/ipmi_constants.h>