From f5606de245bff5e01ea174828a81856a8d8c010eae45f57c259a8ed9e4d4ed53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Fri, 4 Oct 2013 07:16:20 +0000 Subject: [PATCH] * ipmitool-bigendian.patch * old-gcc-options.patch OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=18 --- fix_file_permissions.patch | 18 +++++++++--------- fwum_enhance_output.patch | 8 ++++---- ipmitool-bigendian.patch | 24 ------------------------ ipmitool.changes | 2 ++ ipmitool.spec | 8 -------- old-gcc-options.patch | 12 ------------ sdradd_close_file_handle.patch | 8 ++++---- several_more_compile_fixes.patch | 28 ++++++++++++++-------------- 8 files changed, 33 insertions(+), 75 deletions(-) delete mode 100644 ipmitool-bigendian.patch delete mode 100644 old-gcc-options.patch diff --git a/fix_file_permissions.patch b/fix_file_permissions.patch index 55395a4..6328ed5 100644 --- a/fix_file_permissions.patch +++ b/fix_file_permissions.patch @@ -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); diff --git a/fwum_enhance_output.patch b/fwum_enhance_output.patch index f5471a0..2f06be3 100644 --- a/fwum_enhance_output.patch +++ b/fwum_enhance_output.patch @@ -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 ---- ../orig-ipmitool-1.8.13/lib/ipmi_fwum.c 2013-10-04 08:45:21.179606671 +0200 -+++ ./lib/ipmi_fwum.c 2013-10-04 08:45:33.784120931 +0200 -@@ -1659,13 +1659,15 @@ +--- ../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; } -@@ -1683,6 +1685,8 @@ +@@ -1675,6 +1677,8 @@ { printf("Target Board Id : %u\n",boardInfo.boardId); printf("Target IANA number : %u\n",boardInfo.iana); diff --git a/ipmitool-bigendian.patch b/ipmitool-bigendian.patch deleted file mode 100644 index eade286..0000000 --- a/ipmitool-bigendian.patch +++ /dev/null @@ -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 - #include - #include -+#include - - 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 - #include - #include -+#include - - extern int verbose; - /* diff --git a/ipmitool.changes b/ipmitool.changes index 907b2e4..2a53a72 100644 --- a/ipmitool.changes +++ b/ipmitool.changes @@ -9,6 +9,8 @@ Fri Oct 4 06:38:02 UTC 2013 - kkaempf@suse.com * 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 diff --git a/ipmitool.spec b/ipmitool.spec index 40c775a..78ac052 100644 --- a/ipmitool.spec +++ b/ipmitool.spec @@ -33,10 +33,6 @@ Patch4: sdradd_close_file_handle.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 @@ -65,10 +61,6 @@ and setting LAN configuration, and chassis power control. %patch6 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 -%if 0%{?suse_version} < 1140 -%patch11 -p1 -%endif %build touch INSTALL NEWS diff --git a/old-gcc-options.patch b/old-gcc-options.patch deleted file mode 100644 index 22f5cd7..0000000 --- a/old-gcc-options.patch +++ /dev/null @@ -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" diff --git a/sdradd_close_file_handle.patch b/sdradd_close_file_handle.patch index 2256abd..9b8d9b4 100644 --- a/sdradd_close_file_handle.patch +++ b/sdradd_close_file_handle.patch @@ -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; } diff --git a/several_more_compile_fixes.patch b/several_more_compile_fixes.patch index 97c4e6e..0f28bd4 100644 --- a/several_more_compile_fixes.patch +++ b/several_more_compile_fixes.patch @@ -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 --- ../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 @@ static int 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"); 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 -+++ ./lib/ipmi_fwum.c 2013-10-04 08:50:53.625171693 +0200 -@@ -1310,7 +1310,6 @@ +--- ../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; @@ -48,9 +48,9 @@ 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 ../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 -+++ ./lib/ipmi_hpmfwupg.c 2013-10-04 08:50:53.625171693 +0200 -@@ -1321,7 +1321,6 @@ +--- ../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) { @@ -58,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; -@@ -1505,7 +1504,6 @@ +@@ -1507,7 +1506,6 @@ int activate,int componentToUpload, int option) { 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 --- ../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 @@ struct ipmi_rs * rsp; 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; 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 08:50:53.625171693 +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) @@ -108,9 +108,9 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache #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 ---- ../orig-ipmitool-1.8.13/lib/ipmi_sdradd.c 2013-07-08 11:55:29.000000000 +0200 -+++ ./lib/ipmi_sdradd.c 2013-10-04 08:50:53.625171693 +0200 -@@ -575,7 +575,6 @@ +--- ../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) { @@ -120,7 +120,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache 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 --- ../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 @@ #include #include