From 1a799b1ab07ae51db21492b6388c5f613091d225c1530a5b252baeb385d610b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.com>
Date: Wed, 7 May 2014 06:28:05 +0000
Subject: [PATCH] - Update to 1.4.2   o In ipmi-oem, support Supermicro
 get-power-supply-status and     get-pmbus-power-supply-status commands.   o
 Support 'ipmiping' workaround in ipmipower.   o Minor documentation updates.

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/freeipmi?expand=0&rev=47
---
 freeipmi-1.4.1.tar.gz |  3 ---
 freeipmi-1.4.2.patch  | 19 +++++++++++++++++++
 freeipmi-1.4.2.tar.gz |  3 +++
 freeipmi.changes      |  9 +++++++++
 freeipmi.spec         |  5 ++++-
 5 files changed, 35 insertions(+), 4 deletions(-)
 delete mode 100644 freeipmi-1.4.1.tar.gz
 create mode 100644 freeipmi-1.4.2.patch
 create mode 100644 freeipmi-1.4.2.tar.gz

diff --git a/freeipmi-1.4.1.tar.gz b/freeipmi-1.4.1.tar.gz
deleted file mode 100644
index 14f6313..0000000
--- a/freeipmi-1.4.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6ad19d92dbe6f56aebe366adb1cc8fedda67f8d325e47b84073d56f0824f9e2
-size 3085238
diff --git a/freeipmi-1.4.2.patch b/freeipmi-1.4.2.patch
new file mode 100644
index 0000000..c9d2504
--- /dev/null
+++ b/freeipmi-1.4.2.patch
@@ -0,0 +1,19 @@
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-freeipmi-1.4.2/ipmipower/ipmipower_ping.c ./ipmipower/ipmipower_ping.c
+--- ../orig-freeipmi-1.4.2/ipmipower/ipmipower_ping.c	2014-03-20 00:02:25.000000000 +0100
++++ ./ipmipower/ipmipower_ping.c	2014-05-07 08:23:35.006832873 +0200
+@@ -405,6 +405,7 @@
+ 		  exit (EXIT_FAILURE);
+ 		}
+ 
++#ifndef NDEBUG
+ 	      if (cmd_args.rmcpdump)
+ 		{
+ 		  char hdrbuf[DEBUG_UTIL_HDR_BUFLEN];
+@@ -429,6 +430,7 @@
+ 					    tmpl_cmd_get_channel_authentication_capabilities_rs) < 0)
+ 		    IPMIPOWER_DEBUG (("ipmi_dump_lan_packet: %s", strerror (errno)));
+ 		}
++#endif /* NDEBUG */
+ 
+ 	      if ((checksum_ret = ipmi_lan_check_packet_checksum (buf, len)) < 0)
+ 		{
diff --git a/freeipmi-1.4.2.tar.gz b/freeipmi-1.4.2.tar.gz
new file mode 100644
index 0000000..171172a
--- /dev/null
+++ b/freeipmi-1.4.2.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35cd0f1de3fdf8d7477f3080d3852ec402f8bcb1644adc6531e3f7b7bd7d670c
+size 3089147
diff --git a/freeipmi.changes b/freeipmi.changes
index e9ac4f2..c0dcd39 100644
--- a/freeipmi.changes
+++ b/freeipmi.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed May  7 06:17:51 UTC 2014 - kkaempf@suse.com
+
+- Update to 1.4.2
+  o In ipmi-oem, support Supermicro get-power-supply-status and
+    get-pmbus-power-supply-status commands.
+  o Support 'ipmiping' workaround in ipmipower.
+  o Minor documentation updates.
+
 -------------------------------------------------------------------
 Tue Mar  4 12:20:07 UTC 2014 - kkaempf@suse.com
 
diff --git a/freeipmi.spec b/freeipmi.spec
index 6b7691f..da78b89 100644
--- a/freeipmi.spec
+++ b/freeipmi.spec
@@ -18,7 +18,7 @@
 
 
 %define name freeipmi
-%define version 1.4.1
+%define version 1.4.2
 %define srcversion %{version}
 %if %{?_with_debug:1}%{!?_with_debug:0}
 %define release 1.debug%{?dist}
@@ -36,6 +36,8 @@ Source0:        http://ftp.gnu.org/gnu/freeipmi/%{name}-%{srcversion}.tar.gz
 Source1:        bmc-watchdog.service
 Source2:        ipmidetectd.service
 Source3:        ipmiseld.service
+# PATCH-FIX-UPSTREAM: fix compile without debug, kkaempf@suse.de
+Patch:          %{name}-%{version}.patch
 Summary:        FreeIPMI
 License:        GPL-3.0+
 Group:          System/Management
@@ -113,6 +115,7 @@ This service detects and monitors IPMI nodes.
 
 %prep
 %setup -q -n %{name}-%{srcversion}
+%patch -p1
 
 %build
 %if 0%{?suse_version} >= 1110