Sync from SUSE:SLFO:Main ipmitool revision 8786dcbe1276b01255aff94c2e8f42f5

This commit is contained in:
Adrian Schröter 2024-10-03 17:20:33 +02:00
parent f992793e23
commit afd59d07af
6 changed files with 1784 additions and 174 deletions

File diff suppressed because it is too large Load Diff

BIN
ipmitool-1.8.19.13.gbe11d94.obscpio (Stored with Git LFS)

Binary file not shown.

View File

@ -0,0 +1,34 @@
From 497fce4461611feb949bdb6f8cc7ea251552f02a Mon Sep 17 00:00:00 2001
From: Martin Jambor <mjambor@suse.cz>
Date: Wed, 10 Jul 2024 14:37:49 +0200
Subject: [PATCH] Fix GCC 14 initialization from incompatible pointer error
Upstream: project archived
References: boo#1225992
In file lib/ipmi_fru.c in function fru_area_print_multirec, local
variable mmh which is of type "struct fru_multirec_mgmt *" is
initialized with a type-cast to type "(struct fru_multirect_mgmt *)" -
note the t in multirect. This causes a compile error by default with
GCC 14. This patch fixes the typo to avoid the issue.
Signed-off-by: Martin Jambor <mjambor@suse.cz>
---
lib/ipmi_fru.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/ipmi_fru.c b/lib/ipmi_fru.c
index 4d1dbbb..90b2a63 100644
--- a/lib/ipmi_fru.c
+++ b/lib/ipmi_fru.c
@@ -1553,7 +1553,7 @@ fru_area_print_multirec(struct ipmi_intf * intf, struct fru_info * fru,
case FRU_RECORD_TYPE_MANAGEMENT_ACCESS:
{
struct fru_multirec_mgmt *mmh =
- (struct fru_multirect_mgmt *)
+ (struct fru_multirec_mgmt *)
&fru_data[sizeof(struct fru_multirec_header)];
size_t datalen = h->len - sizeof(*mmh);
struct {
--
2.45.2

View File

@ -1,3 +1,24 @@
-------------------------------------------------------------------
Wed Jul 10 13:07:32 UTC 2024 - Martin Jambor <mjambor@suse.com>
- Added ipmitool-fix_init_from_incompat_ptr_type.patch fixing a type
which led to assignment from incompatible pointer type which is an
error in GCC 14 [boo#1225992]
-------------------------------------------------------------------
Tue Oct 31 15:55:01 UTC 2023 - Thomas Renninger <trenn@suse.de>
- bsc#1216556 L3: ipmitool: Unsupported LAN Parameter
lookup error SLE15 SP4+
Fix regression introduced by 351dad24a26f56580ba6
lan: Add processing of get/set specific CCs:
https://github.com/ipmitool/ipmitool/pull/388
https://github.com/ipmitool/ipmitool/pull/389
Be aware: Even the pullrequest is open for a while, this patch is not
integrated in latest mainstream master branch.
A lanp-Fix-error-response-from-Unsupported-Parameter-lookup.patch.txt
M enterprise-numbers
-------------------------------------------------------------------
Mon Jul 24 10:38:53 UTC 2023 - trenn@suse.de

View File

@ -33,6 +33,8 @@ Patch3: 0003-Cleanup-and-compiler-issues-only-no-functional-chang.patch
Patch4: 0004-Adjust-SUSE-paths.patch
Patch5: 0005-HPM-x-compatibility-message-is-DEBUG-only.patch
Patch6: Fix-time-format-for-sel-list-v.patch
Patch7: lanp-Fix-error-response-from-Unsupported-Parameter-lookup.patch.txt
Patch8: ipmitool-fix_init_from_incompat_ptr_type.patch
BuildRequires: libtool
BuildRequires: openssl-devel
BuildRequires: readline-devel

View File

@ -0,0 +1,33 @@
From a61349b443c16821e4884cde5ad8c031d619631a Mon Sep 17 00:00:00 2001
From: Daniel Van Allen <dvanallen@google.com>
Date: Wed, 21 Dec 2022 14:38:47 -0500
Subject: [PATCH] lanp: Fix error response from Unsupported Parameter lookup
Return a pointer to the lan_param instead of NULL in the case when the
parameter is not supported.
Resolves ipmitool/ipmitool#388
Signed-off-by Daniel Van Allen <dvanallen@google.com>
---
lib/ipmi_lanp.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lib/ipmi_lanp.c b/lib/ipmi_lanp.c
index 16c0d9a9..49dc697f 100644
--- a/lib/ipmi_lanp.c
+++ b/lib/ipmi_lanp.c
@@ -236,8 +236,12 @@ get_lan_param_select(struct ipmi_intf *intf, uint8_t chan, int param, int select
/* We treat them as valid but empty response */
p->data = NULL;
p->data_len = 0;
- rc = p;
- /* fall through */
+ lprintf(LOG_INFO, "Get LAN Parameter '%s' command unsupported: %s",
+ p->desc,
+ specific_val2str(rsp->ccode,
+ get_lan_cc_vals,
+ completion_code_vals));
+ return p;
default:
/* other completion codes are treated as error */
lprintf(LOG_INFO, "Get LAN Parameter '%s' command failed: %s",