diff --git a/automake-1.13.patch b/automake-1.13.patch index 4bf9433..a57bb11 100644 --- a/automake-1.13.patch +++ b/automake-1.13.patch @@ -1,12 +1,13 @@ -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 @@ +Index: ipmitool-1.8.13/configure.in +=================================================================== +--- ipmitool-1.8.13.orig/configure.in ++++ ipmitool-1.8.13/configure.in +@@ -4,7 +4,7 @@ dnl AC_INIT([src/ipmitool.c]) AC_CANONICAL_SYSTEM - AM_INIT_AUTOMAKE([ipmitool], [1.8.13]) + AM_INIT_AUTOMAKE([ipmitool], [1.8.13-cvs]) -AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) ++AC_CONFIG_HEADER(config.h) AC_CONFIG_SRCDIR([src/ipmitool.c]) AC_PREREQ(2.50) AC_SUBST(ac_configure_args) diff --git a/fix_file_permissions.patch b/fix_file_permissions.patch index 6328ed5..a7e08a1 100644 --- a/fix_file_permissions.patch +++ b/fix_file_permissions.patch @@ -1,7 +1,8 @@ -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 @@ +Index: ipmitool-1.8.13/lib/helper.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/helper.c ++++ ipmitool-1.8.13/lib/helper.c +@@ -657,7 +657,6 @@ ipmi_start_daemon(struct ipmi_intf *intf #endif chdir("/"); @@ -9,10 +10,11 @@ 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 ../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 @@ +Index: ipmitool-1.8.13/src/ipmievd.c +=================================================================== +--- ipmitool-1.8.13.orig/src/ipmievd.c ++++ ipmitool-1.8.13/src/ipmievd.c +@@ -700,6 +700,7 @@ ipmievd_main(struct ipmi_event_intf * ei int i, rc; int daemon = 1; struct sigaction act; @@ -20,7 +22,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); -@@ -761,8 +762,9 @@ +@@ -761,8 +762,9 @@ ipmievd_main(struct ipmi_event_intf * ei ipmi_start_daemon(eintf->intf); diff --git a/fwum_enhance_output.patch b/fwum_enhance_output.patch index 2f06be3..f4b918e 100644 --- a/fwum_enhance_output.patch +++ b/fwum_enhance_output.patch @@ -1,30 +1,32 @@ -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) - { -- 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; - } - -@@ -1675,6 +1677,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); +Index: ipmitool-1.8.13/lib/ipmi_fwum.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/ipmi_fwum.c ++++ ipmitool-1.8.13/lib/ipmi_fwum.c +@@ -1102,12 +1102,14 @@ ipmi_kfwum_checkfwcompat(tKFWUM_BoardInf + int compatible = 0; + if (boardInfo.iana != firmInfo.iana) { + lprintf(LOG_ERR, +- "Board IANA does not match firmware IANA."); ++ "Board IANA [%u] does not match firmware IANA [%u]\n", ++ boardInfo.iana, firmInfo.iana); + compatible = (-1); + } + if (boardInfo.boardId != firmInfo.boardId) { + lprintf(LOG_ERR, +- "Board IANA does not match firmware IANA."); ++ "Board ID [%u] does not match firmware board ID [%u]\n", ++ boardInfo.boardId, firmInfo.boardId); + compatible = (-1); + } + if (compatible != 0) { +@@ -1125,6 +1127,10 @@ printf_kfwum_info(tKFWUM_BoardInfo board + 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, diff --git a/ipmitool-1.8.10-implicit-fortify-decl.patch b/ipmitool-1.8.10-implicit-fortify-decl.patch index f9889ae..ccce7b4 100644 --- a/ipmitool-1.8.10-implicit-fortify-decl.patch +++ b/ipmitool-1.8.10-implicit-fortify-decl.patch @@ -6,8 +6,8 @@ forwardported from 1.8.10 to 1.8.11. Index: lib/ipmi_sdradd.c =================================================================== ---- lib/ipmi_sdradd.c.orig 2007-07-11 16:27:46.000000000 +0200 -+++ lib/ipmi_sdradd.c 2008-10-14 17:51:50.000000000 +0200 +--- lib/ipmi_sdradd.c.orig ++++ lib/ipmi_sdradd.c @@ -38,6 +38,7 @@ #include #include @@ -18,21 +18,21 @@ Index: lib/ipmi_sdradd.c #include Index: lib/ipmi_hpmfwupg.c =================================================================== ---- lib/ipmi_hpmfwupg.c.orig 2008-10-14 17:50:09.000000000 +0200 -+++ lib/ipmi_hpmfwupg.c 2008-10-14 18:06:44.000000000 +0200 +--- lib/ipmi_hpmfwupg.c.orig ++++ lib/ipmi_hpmfwupg.c @@ -40,6 +40,8 @@ #include "../src/plugins/lan/md5.h" #include #include +#include +#include + #include #if HAVE_CONFIG_H - #include Index: configure.in =================================================================== ---- configure.in.orig 2008-08-07 20:26:08.000000000 +0200 -+++ configure.in 2008-10-14 18:12:43.000000000 +0200 +--- configure.in.orig ++++ configure.in @@ -25,6 +25,7 @@ AC_CHECK_HEADERS([sys/byteorder.h bytesw AC_C_CONST AC_C_INLINE diff --git a/ipmitool-1.8.13.tar.bz2 b/ipmitool-1.8.13.tar.bz2 index 7444628..1ff7cf9 100644 --- a/ipmitool-1.8.13.tar.bz2 +++ b/ipmitool-1.8.13.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:530bea8685a647a2ca58f40a1b317d529056f00129ad770e376a5b8a7faa8575 -size 717294 +oid sha256:5e7b1bef1ed66f26217daa0b318d6e576ba45a69b2b9d54931c1646a2d81591a +size 423062 diff --git a/ipmitool.changes b/ipmitool.changes index 2a53a72..7adf2b7 100644 --- a/ipmitool.changes +++ b/ipmitool.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Feb 13 23:27:01 UTC 2014 - trenn@suse.de + +- Added 3 services: + 1) exchange-bmc-os-info - fate#315999 + Shows SLES string as OS in the service processor info + 2) bmc-snmp-proxy - fate#316000 + Exports sel (BMC Error log) via snmpd + 3) ipmievd - fate#316002 + Logs sel to syslog +1. and 2. are very Dell specific and should not get enabled by default +3. got converted to a native systemd service. Still needs autoconf + adjusting to get send mainline +1. and 2. have somewhat bigger Init V init scripts and time was not + enough to convert them. Therefore they were added via insserv + and friends as well + ------------------------------------------------------------------- Fri Oct 4 06:38:02 UTC 2013 - kkaempf@suse.com diff --git a/ipmitool.spec b/ipmitool.spec index 78ac052..2a1e1e8 100644 --- a/ipmitool.spec +++ b/ipmitool.spec @@ -20,6 +20,9 @@ Name: ipmitool BuildRequires: libtool BuildRequires: openssl-devel BuildRequires: readline-devel +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd +%endif Url: http://ipmitool.sourceforge.net/ Summary: Utility for IPMI Control License: BSD-3-Clause @@ -27,13 +30,21 @@ Group: System/Management Version: 1.8.13 Release: 0 Source: http://heanet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 +Source1: ipmievd.service +Source2: ipmievd.sysconf +Patch0: ipmitool_update_to_git_head_31_01_2014_b0aad15d67007c74b.patch Patch1: ipmitool-1.8.10-implicit-fortify-decl.patch Patch3: fwum_enhance_output.patch Patch4: sdradd_close_file_handle.patch Patch6: fix_file_permissions.patch Patch8: several_more_compile_fixes.patch Patch9: automake-1.13.patch +Patch10: ipmitool_adjust_suse.paths BuildRoot: %{_tmppath}/%{name}-%{version}-build +# bmc-snmp-proxy needs /usr/sbin/snmpd +Requires: net-snmp +# ToDo: Convert old init scripts to systemd with next submit iteration +%{?systemd_requires} %description This package contains a utility for interfacing with devices that @@ -55,12 +66,14 @@ and setting LAN configuration, and chassis power control. %prep %setup -q +%patch0 -p2 %patch1 -p0 %patch3 -p1 %patch4 -p1 %patch6 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -p1 %build touch INSTALL NEWS @@ -71,16 +84,55 @@ autoreconf -fiv %install make DESTDIR=$RPM_BUILD_ROOT install rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/ipmitool +# exchange-bmc-os-info service + +install -D -m 0755 contrib/exchange-bmc-os-info.init.redhat "$RPM_BUILD_ROOT\ +"/%{_sbindir}/exchange-bmc-os-info +install -D -m 0644 contrib/exchange-bmc-os-info.service.redhat "$RPM_BUILD_ROOT"/usr/lib/systemd/system/exchange-bmc-os-info.service +install -D -m 0644 contrib/exchange-bmc-os-info.sysconf "$RPM_BUILD_ROOT"/%{_sysconfdir}/exchange-bmc-os-info +#ln -s /etc/init.d/exchange-bmc-os-info $RPM_BUILD_ROOT/%{_sbindir}/rcexchange-bmc-os-info + +# ipmievd service +install -D -m 644 %{S:1} "$RPM_BUILD_ROOT"/usr/lib/systemd/system/ipmievd.service +install -D -m 644 %{S:2} "$RPM_BUILD_ROOT"/%{_sysconfdir}/ipmievd +#ln -s %{_sbindir}/ipmievd $RPM_BUILD_ROOT/%{_sbindir}/ipmievd + +# bmc-snmp-proxy +install -D -m 755 contrib/bmc-snmp-proxy "$RPM_BUILD_ROOT"/%{_sbindir}/bmc-snmp-proxy +install -D -m 644 contrib/bmc-snmp-proxy.service "$RPM_BUILD_ROOT"/usr/lib/systemd/system/bmc-snmp-proxy.service +install -D -m 755 contrib/bmc-snmp-proxy.sysconf "$RPM_BUILD_ROOT"/%{_sysconfdir}/bmc-snmp-proxy +#ln -s /etc/init.d/bmc-snmp-proxy $RPM_BUILD_ROOT/%{_sbindir}/rcbmc-snmp-proxy %clean rm -rf $RPM_BUILD_ROOT +%pre +%service_add_pre bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service + +%post +%service_add_post bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service + +%preun +%service_del_preun bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service + +%postun +%service_del_postun bmc-snmp-proxy.service exchange-bmc-os-info.service ipmievd.service + %files -%defattr(-,root,root) +%defattr(644,root,root) %doc AUTHORS COPYING README -%{_bindir}/* -%{_sbindir}/* %{_datadir}/ipmitool +%attr(755,root,root) %{_bindir}/ipmitool +%attr(755,root,root) %{_sbindir}/ipmievd +%attr(755,root,root) %{_sbindir}/exchange-bmc-os-info +%attr(755,root,root) %{_sbindir}/bmc-snmp-proxy +%config(noreplace) %{_sysconfdir}/exchange-bmc-os-info +%config(noreplace) %{_sysconfdir}/bmc-snmp-proxy +%config(noreplace) %{_sysconfdir}/ipmievd +%{_prefix}/lib/systemd/system/exchange-bmc-os-info.service +%{_prefix}/lib/systemd/system/ipmievd.service +%{_prefix}/lib/systemd/system/bmc-snmp-proxy.service + #%{_datadir}/doc/packages/ipmitool/* %doc %{_mandir}/man1/* %doc %{_mandir}/man8/* diff --git a/several_more_compile_fixes.patch b/several_more_compile_fixes.patch index 0f28bd4..7cdf567 100644 --- a/several_more_compile_fixes.patch +++ b/several_more_compile_fixes.patch @@ -1,7 +1,8 @@ -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 @@ +Index: ipmitool-1.8.13/lib/ipmi_ekanalyzer.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/ipmi_ekanalyzer.c ++++ ipmitool-1.8.13/lib/ipmi_ekanalyzer.c +@@ -397,7 +397,6 @@ ipmi_ekanalyzer_usage( void ) static int ipmi_ek_get_file_type( char * argument ) { @@ -9,7 +10,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 ){ -@@ -3378,7 +3377,7 @@ +@@ -3383,7 +3382,7 @@ ipmi_ek_display_board_p2p_record( struct offset += sizeof(struct fru_picmgext_guid); } @@ -18,7 +19,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) ) { -@@ -3547,7 +3546,7 @@ +@@ -3552,7 +3551,7 @@ ipmi_ek_display_radial_ipmb0_record( str printf(" IPMB-0 Hub Descriptor Count: 0x%02x", record->data[offset++]); if (record->data[offset] > 0){ @@ -27,7 +28,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++]); -@@ -3990,7 +3989,7 @@ +@@ -3995,7 +3994,7 @@ ipmi_ek_display_clock_config_record( str (feature > 1) & 1, (feature&1)?"Source":"Receiver"); printf("\tFamily: 0x%02x - AccLVL: 0x%02x\n", family, accuracy); @@ -36,40 +37,23 @@ 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 ../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; -- 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 ../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) - { -- struct HpmfwupgUpgradeCtx fwupgCtx; - struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd; - int rc = HPMFWUPG_SUCCESS; - int componentId = 0; -@@ -1507,7 +1506,6 @@ - int activate,int componentToUpload, int option) - { - int rc = HPMFWUPG_SUCCESS; -- struct HpmfwupgImageHeader imageHeader; - struct HpmfwupgUpgradeCtx fwupgCtx; - - /* -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 @@ +Index: ipmitool-1.8.13/lib/ipmi_fwum.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/ipmi_fwum.c ++++ ipmitool-1.8.13/lib/ipmi_fwum.c +@@ -861,7 +861,6 @@ KfwumUploadFirmware(struct ipmi_intf *in + unsigned long lastAddress = 0; + unsigned char sequenceNumber = 0; + unsigned char retry = FWUM_MAX_UPLOAD_RETRY; +- unsigned char isLengthValid = 1; + do { + writeSize = save_fw_nfo.bufferSize - save_fw_nfo.overheadSize; + /* Reach the end */ +Index: ipmitool-1.8.13/lib/ipmi_isol.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/ipmi_isol.c ++++ ipmitool-1.8.13/lib/ipmi_isol.c +@@ -413,7 +413,6 @@ ipmi_isol_deactivate(struct ipmi_intf * struct ipmi_rs * rsp; struct ipmi_rq req; uint8_t data[6]; @@ -77,10 +61,11 @@ 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 ../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 @@ +Index: ipmitool-1.8.13/lib/ipmi_picmg.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/ipmi_picmg.c ++++ ipmitool-1.8.13/lib/ipmi_picmg.c +@@ -878,7 +878,7 @@ ipmi_picmg_portstate_get(struct ipmi_int } else if (d->type >= 0x06 && d->type <= 0xef) { @@ -89,7 +74,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) { -@@ -1690,7 +1690,7 @@ +@@ -1690,7 +1690,7 @@ ipmi_picmg_clk_get(struct ipmi_intf * in oemval2str( rsp->data[3], rsp->data[4], picmg_clk_accuracy_vals)); @@ -98,7 +83,7 @@ diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache } } } -@@ -1751,7 +1751,7 @@ +@@ -1751,7 +1751,7 @@ printf("## index: %d\n", msg_data[2]); printf("## setting: 0x%02x\n", msg_data[3]); printf("## family: %d\n", msg_data[4]); printf("## acc: %d\n", msg_data[5]); @@ -107,10 +92,11 @@ 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 ../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 @@ +Index: ipmitool-1.8.13/lib/ipmi_sdradd.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/ipmi_sdradd.c ++++ ipmitool-1.8.13/lib/ipmi_sdradd.c +@@ -576,7 +576,6 @@ ipmi_sdr_add_from_list(struct ipmi_intf static int ipmi_sdr_read_records(const char *filename, struct sdrr_queue *queue) { @@ -118,9 +104,10 @@ 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 ../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 +Index: ipmitool-1.8.13/lib/ipmi_sdr.c +=================================================================== +--- ipmitool-1.8.13.orig/lib/ipmi_sdr.c ++++ ipmitool-1.8.13/lib/ipmi_sdr.c @@ -52,6 +52,7 @@ #include #include