cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ipmitool: -fno-common fix from upstream

Browse Source 
(and not from https://bugs.gentoo.org/706870#c14, sheesh...)
This commit is contained in:
sthen 2021-01-31 19:36:23 +00:00
parent 2f997f4bc8
commit bed121e611
3 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/ipmitool/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.26 2021/01/31 19:17:17 sthen Exp $
# $OpenBSD: Makefile,v 1.27 2021/01/31 19:36:23 sthen Exp $
COMMENT= manage and configure devices that support IPMI
V= 1.8.18
DISTNAME= ipmitool-$V
REVISION= 3
REVISION= 4
CATEGORIES= sysutils
EXTRACT_SUFX= .tar.bz2

19
sysutils/ipmitool/patches/patch-include_ipmitool_ipmi_hpmfwupg_h Normal file
View File

@ -0,0 +1,19 @@
$OpenBSD: patch-include_ipmitool_ipmi_hpmfwupg_h,v 1.1 2021/01/31 19:36:23 sthen Exp $
From c3939dac2c060651361fc71516806f9ab8c38901 Mon Sep 17 00:00:00 2001
From: Vaclav Dolezal <vdolezal@redhat.com>
Date: Thu, 23 Jan 2020 11:26:32 +0100
Subject: [PATCH] hpmfwupg: move variable definition to .c file
Index: include/ipmitool/ipmi_hpmfwupg.h
--- include/ipmitool/ipmi_hpmfwupg.h.orig
+++ include/ipmitool/ipmi_hpmfwupg.h
@@ -800,7 +800,7 @@ typedef struct _VERSIONINFO {
char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
}VERSIONINFO, *PVERSIONINFO;
-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+extern VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
#define TARGET_VER (0x01)
#define ROLLBACK_VER (0x02)

30
sysutils/ipmitool/patches/patch-lib_ipmi_hpmfwupg_c
View File

@ -1,7 +1,27 @@
$OpenBSD: patch-lib_ipmi_hpmfwupg_c,v 1.2 2016/05/07 14:18:12 sthen Exp $
--- lib/ipmi_hpmfwupg.c.orig Fri May 6 15:48:54 2016
+++ lib/ipmi_hpmfwupg.c Sat May 7 14:34:35 2016
@@ -194,8 +194,8 @@ HpmDisplayUpgrade(int skip, unsigned int totalSent,
$OpenBSD: patch-lib_ipmi_hpmfwupg_c,v 1.3 2021/01/31 19:36:23 sthen Exp $
#1:
From c3939dac2c060651361fc71516806f9ab8c38901 Mon Sep 17 00:00:00 2001
From: Vaclav Dolezal <vdolezal@redhat.com>
Date: Thu, 23 Jan 2020 11:26:32 +0100
Subject: [PATCH] hpmfwupg: move variable definition to .c file
Rest: 64-bit time_t
Index: lib/ipmi_hpmfwupg.c
--- lib/ipmi_hpmfwupg.c.orig
+++ lib/ipmi_hpmfwupg.c
@@ -58,6 +58,8 @@ ipmi_intf_get_max_request_data_size(struct ipmi_intf *
extern int verbose;
+VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+
int HpmfwupgUpgrade(struct ipmi_intf *intf, char *imageFilename,
int activate, int, int);
int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx *pFwupgCtx);
@@ -194,8 +196,8 @@ HpmDisplayUpgrade(int skip, unsigned int totalSent,
if (totalSent == displayFWLength) {
/* Display the time taken to complete the upgrade */
printf(
@ -12,7 +32,7 @@ $OpenBSD: patch-lib_ipmi_hpmfwupg_c,v 1.2 2016/05/07 14:18:12 sthen Exp $
old_percent = -1;
}
}
@@ -1285,8 +1285,8 @@ HpmFwupgActionUploadFirmware(struct HpmfwupgComponentB
@@ -1285,8 +1287,8 @@ HpmFwupgActionUploadFirmware(struct HpmfwupgComponentB
imageOffset,blockLength);
}
if (displayFWLength == totalSent) {