CVS commit: pkgsrc/sysutils/ipmitool

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed Oct 28 16:38:09 UTC 2026

Modified Files:
        pkgsrc/sysutils/ipmitool: distinfo
Added Files:
        pkgsrc/sysutils/ipmitool/patches:
            patch-include_ipmitool_ipmi__delloem.h patch-lib_ipmi__delloem.c

Log Message:
ipmitool: Build fix for Darwin/aarch64.

Pulled from the codeberg fork, we might want to just switch to this as upstream
at some point.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/sysutils/ipmitool/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/sysutils/ipmitool/patches/patch-include_ipmitool_ipmi__delloem.h \
    pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__delloem.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/ipmitool/distinfo
diff -u pkgsrc/sysutils/ipmitool/distinfo:1.14 pkgsrc/sysutils/ipmitool/distinfo:1.15
--- pkgsrc/sysutils/ipmitool/distinfo:1.14      Thu May 18 08:43:20 2023
+++ pkgsrc/sysutils/ipmitool/distinfo   Wed Oct 28 16:38:09 2026
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.14 2023/05/18 08:43:20 spz Exp $
+$NetBSD: distinfo,v 1.15 2026/10/28 16:38:09 jperkin Exp $
 
 BLAKE2s (IPMITOOL_1_8_19.tar.gz) = 445528e00b5db7d975cf049e20a46ebbe2b2e1fafa6ac5ca7f47064a8217a37a
 SHA512 (IPMITOOL_1_8_19.tar.gz) = 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3
 Size (IPMITOOL_1_8_19.tar.gz) = 641383 bytes
 SHA1 (patch-ae) = 6819a2a50d9c0a5f33e60b2f73e436ee43dbb717
 SHA1 (patch-configure.ac) = 54ffa45c8c518d2ded4c878cdbf81e9dc514bef4
+SHA1 (patch-include_ipmitool_ipmi__delloem.h) = fce85ab6a5fdf1ee230e24f8bf1b15a5b7a5ef01
+SHA1 (patch-lib_ipmi__delloem.c) = cb3fd6ddbdf9b0a6cb05478067cc29cfe2dd1ed3

Added files:

Index: pkgsrc/sysutils/ipmitool/patches/patch-include_ipmitool_ipmi__delloem.h
diff -u /dev/null pkgsrc/sysutils/ipmitool/patches/patch-include_ipmitool_ipmi__delloem.h:1.1
--- /dev/null   Wed Oct 28 16:38:09 2026
+++ pkgsrc/sysutils/ipmitool/patches/patch-include_ipmitool_ipmi__delloem.h     Wed Oct 28 16:38:09 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-include_ipmitool_ipmi__delloem.h,v 1.1 2026/10/28 16:38:09 jperkin Exp $
+
+Fix for https://github.com/ipmitool/ipmitool/issues/332 from
+https://codeberg.org/IPMITool/ipmitool/commit/206dba615d740a31e881861c86bcc8daafd9d5b1.patch
+
+--- include/ipmitool/ipmi_delloem.h.orig       2022-09-01 18:42:31.000000000 +0000
++++ include/ipmitool/ipmi_delloem.h
+@@ -343,10 +343,6 @@ typedef struct _power_headroom
+     uint16_t peakheadroom;
+ } __attribute__ ((packed)) POWER_HEADROOM;
+ 
+-struct vFlashstr {
+-      uint8_t val;
+-      const char * str;
+-};
+ typedef struct ipmi_vFlash_extended_info
+ {
+       uint8_t  vflashcompcode;
Index: pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__delloem.c
diff -u /dev/null pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__delloem.c:1.1
--- /dev/null   Wed Oct 28 16:38:09 2026
+++ pkgsrc/sysutils/ipmitool/patches/patch-lib_ipmi__delloem.c  Wed Oct 28 16:38:09 2026
@@ -0,0 +1,63 @@
+$NetBSD: patch-lib_ipmi__delloem.c,v 1.1 2026/10/28 16:38:09 jperkin Exp $
+
+Fix for https://github.com/ipmitool/ipmitool/issues/332 from
+https://codeberg.org/IPMITool/ipmitool/commit/206dba615d740a31e881861c86bcc8daafd9d5b1.patch
+
+--- lib/ipmi_delloem.c.orig    2022-09-01 18:42:31.000000000 +0000
++++ lib/ipmi_delloem.c
+@@ -115,7 +115,7 @@ char NIC_Selection_Mode_String_12g[] [50
+       "shared with failover all loms"
+ };
+ 
+-const struct vFlashstr vFlash_completion_code_vals[] = {
++const struct valstr vFlash_completion_code_vals[] = {
+       {0x00, "SUCCESS"},
+       {0x01, "NO_SD_CARD"},
+       {0x63, "UNKNOWN_ERROR"},
+@@ -232,8 +232,6 @@ static void ipmi_powermonitor_usage(void
+ /* vFlash Function prototypes */
+ static int ipmi_delloem_vFlash_main(struct ipmi_intf *intf, int argc,
+               char **argv);
+-const char *get_vFlash_compcode_str(uint8_t vflashcompcode,
+-              const struct vFlashstr *vs);
+ static int ipmi_get_sd_card_info(struct ipmi_intf *intf);
+ static int ipmi_delloem_vFlash_process(struct ipmi_intf *intf, int current_arg,
+               char **argv);
+@@ -3757,28 +3755,6 @@ ipmi_delloem_vFlash_main(struct ipmi_int
+       return rc;
+ }
+ /*
+- * Function Name:     get_vFlash_compcode_str
+- *
+- * Description:       This function maps the vFlash completion code
+- *            to a string
+- * Input : vFlash completion code and static array of codes vs strings
+- * Output: -
+- * Return: returns the mapped string
+- */
+-const char *
+-get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs)
+-{
+-      static char un_str[32];
+-      int i;
+-      for (i = 0; vs[i].str; i++) {
+-              if (vs[i].val == vflashcompcode)
+-                      return vs[i].str;
+-      }
+-      memset(un_str, 0, 32);
+-      snprintf(un_str, 32, "Unknown (0x%02X)", vflashcompcode);
+-      return un_str;
+-}
+-/*
+  * Function Name:     ipmi_get_sd_card_info
+  *
+  * Description: This function prints the vFlash Extended SD card info
+@@ -3822,7 +3798,7 @@ ipmi_get_sd_card_info(struct ipmi_intf *
+               return -1;
+       } else if (sdcardinfoblock->vflashcompcode != 0x00) {
+               lprintf(LOG_ERR, "Error in getting SD Card Extended Information (%s)",
+-                              get_vFlash_compcode_str(sdcardinfoblock->vflashcompcode,
++                              val2str(sdcardinfoblock->vflashcompcode,
+                                       vFlash_completion_code_vals));
+               return -1;
+       }