[packages/ipmitool] Rel 7; fix build

[arekm]

commit 3124a2c8d9e512e8e9c8fd4ec5bd539dbd3236db
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Oct 11 11:59:45 2021 +0000

    Rel 7; fix build

 fno-common.patch | 22 ++++++++++++++++++++++
 ipmitool.spec    |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/ipmitool.spec b/ipmitool.spec
index 6091f4c..f933ab8 100644
--- a/ipmitool.spec
+++ b/ipmitool.spec
@@ -2,7 +2,7 @@ Summary:	Simple command-line interface to systems that support the IPMI
 Summary(pl.UTF-8):	Prosty interfejs do systemów obsługujących IPMI działający z linii poleceń
 Name:		ipmitool
 Version:	1.8.18
-Release:	6
+Release:	7
 License:	BSD
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/ipmitool/%{name}-%{version}.tar.gz
@@ -10,6 +10,7 @@ Source0:	http://downloads.sourceforge.net/ipmitool/%{name}-%{version}.tar.gz
 Source1:	%{name}-ipmievd.init
 Source2:	%{name}-ipmievd.sysconfig
 Patch0:		openssl.patch
+Patch1:		fno-common.patch
 URL:		https://github.com/ipmitool/ipmitool
 BuildRequires:	autoconf >= 2.62
 BuildRequires:	automake
@@ -58,6 +59,7 @@ wysyłane do SEL i loguje wiadomości do sysloga.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize} --ltdl
diff --git a/fno-common.patch b/fno-common.patch
new file mode 100644
index 0000000..5ca5549
--- /dev/null
+++ b/fno-common.patch
@@ -0,0 +1,22 @@
+--- a/include/ipmitool/ipmi_hpmfwupg.h
++++ b/include/ipmitool/ipmi_hpmfwupg.h
+@@ -800,8 +800,6 @@
+ 	char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+ 
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+-
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
+ #define IMAGE_VER (0x04)
+--- a/lib/ipmi_hpmfwupg.c
++++ b/lib/ipmi_hpmfwupg.c
+@@ -52,6 +52,8 @@
+ # include <config.h>
+ #endif
+ 
++static VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++
+ /* From src/plugins/ipmi_intf.c: */
+ uint16_t
+ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ipmitool.git/commitdiff/3124a2c8d9e512e8e9c8fd4ec5bd539dbd3236db