<pre style='margin:0'>
Dan Ports (drkp) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d207098e077a78c0d75be6af02681a64a86434f5">https://github.com/macports/macports-ports/commit/d207098e077a78c0d75be6af02681a64a86434f5</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new d207098e077 ipmitool: Update to 1.8.19
</span>d207098e077 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d207098e077a78c0d75be6af02681a64a86434f5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Mar 28 23:20:22 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> ipmitool: Update to 1.8.19
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/64636
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/67156
</span>---
sysutils/ipmitool/Portfile | 30 ++++-----
sysutils/ipmitool/files/arm64-delloem.patch | 78 ++++++++++++++++++++++++
sysutils/ipmitool/files/enterprise-numbers.patch | 43 +++++++++++++
3 files changed, 136 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ipmitool/Portfile b/sysutils/ipmitool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f035a4824da..caf40ebd994 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/ipmitool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ipmitool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,17 +5,16 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup github 1.0
PortGroup legacysupport 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://trac.macports.org/ticket/59132
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# strnlen, getline
</span> legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Using head of ipmitool until next release for openssl build fixes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup ipmitool ipmitool 11c7605c0d5423f90f399f5e830d1095089f38a1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.18.20210622
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 273ded688a39ca722d5de4a7a11497b37e9833b9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f5e7c03254e3714fd14f5780833c028a03f97fa9a9832ff95644a80969e1411a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 638260
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup ipmitool ipmitool 1_8_19 IPMITOOL_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8990ac249bfda3812716601d909c10c938df64eb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 48b010e7bcdf93e4e4b6e43c53c7f60aa6873d574cbd45a8d86fa7aaeebaff9c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 641383
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+version [string map [list _ .] ${github.version}]
</span> categories sysutils
license BSD
maintainers {dports @drkp} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +32,10 @@ long_description \
</span> information, read and set LAN configuration parameters, and perform \
remote chassis power control.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# No configure script in tarball.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.cmd ./bootstrap
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+autoreconf.args
</span>
depends_build port:autoconf \
port:automake \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -46,14 +48,12 @@ depends_lib path:lib/libssl.dylib:openssl \
</span>
github.tarball_from archive
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles arm64-delloem.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ enterprise-numbers.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --enable-intf-lanplus \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ipmishell \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-ipmishell
</span>
configure.cppflags-append -Ds6_addr16=__u6_addr.__u6_addr16
compiler.c_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "./bootstrap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ipmitool/files/arm64-delloem.patch b/sysutils/ipmitool/files/arm64-delloem.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..78dbc6380bf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ipmitool/files/arm64-delloem.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+delloem: Fix the unalign bug in arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+For computers using the arm64 of the Apple chip, the link requires strict
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+alignment of pointers in 32-bit form. Replace the struct vFlashstr to valstr.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Replace the Function get_vFlash_compcode_str to val2str.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ipmitool/ipmitool/commit/206dba615d740a31e881861c86bcc8daafd9d5b1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/ipmitool/ipmi_delloem.h.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/ipmitool/ipmi_delloem.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -343,10 +343,6 @@ typedef struct _power_headroom
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint16_t peakheadroom;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } __attribute__ ((packed)) POWER_HEADROOM;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-struct vFlashstr {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint8_t val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const char * str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef struct ipmi_vFlash_extended_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t vflashcompcode;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/ipmi_delloem.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/ipmi_delloem.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -115,7 +115,7 @@ char NIC_Selection_Mode_String_12g[] [50] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "shared with failover all loms"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const struct vFlashstr vFlash_completion_code_vals[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++const struct valstr vFlash_completion_code_vals[] = {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {0x00, "SUCCESS"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {0x01, "NO_SD_CARD"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {0x63, "UNKNOWN_ERROR"},
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -232,8 +232,6 @@ static void ipmi_powermonitor_usage(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* vFlash Function prototypes */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ipmi_delloem_vFlash_main(struct ipmi_intf *intf, int argc,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const char *get_vFlash_compcode_str(uint8_t vflashcompcode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- const struct vFlashstr *vs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ipmi_get_sd_card_info(struct ipmi_intf *intf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static int ipmi_delloem_vFlash_process(struct ipmi_intf *intf, int current_arg,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char **argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3756,28 +3754,6 @@ ipmi_delloem_vFlash_main(struct ipmi_intf * intf, int __UNUSED__(argc), char **
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = ipmi_delloem_vFlash_process(intf, current_arg, argv);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return rc;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Function Name: get_vFlash_compcode_str
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Description: This function maps the vFlash completion code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * to a string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Input : vFlash completion code and static array of codes vs strings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Output: -
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- * Return: returns the mapped string
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-const char *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-get_vFlash_compcode_str(uint8_t vflashcompcode, const struct vFlashstr *vs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static char un_str[32];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int i;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- for (i = 0; vs[i].str; i++) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (vs[i].val == vflashcompcode)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return vs[i].str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- memset(un_str, 0, 32);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- snprintf(un_str, 32, "Unknown (0x%02X)", vflashcompcode);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return un_str;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Function Name: ipmi_get_sd_card_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3822,7 +3798,7 @@ ipmi_get_sd_card_info(struct ipmi_intf * intf) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else if (sdcardinfoblock->vflashcompcode != 0x00) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lprintf(LOG_ERR, "Error in getting SD Card Extended Information (%s)",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get_vFlash_compcode_str(sdcardinfoblock->vflashcompcode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ val2str(sdcardinfoblock->vflashcompcode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ vFlash_completion_code_vals));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/ipmitool/files/enterprise-numbers.patch b/sysutils/ipmitool/files/enterprise-numbers.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3c7f162c74b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/ipmitool/files/enterprise-numbers.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,43 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix enterprise-numbers URL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+IANA has changed their URL scheme, and the content at the old URL for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+enterprise-numbers switched from text/plain to text/html.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix Makefile.am to use the new URL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/ipmitool/ipmitool/commit/1edb0e27e44196d1ebe449aba0b9be22d376bcb6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Also fix manpages (no corresponding upstream commit; repository is archived and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+no longer accepts contributions)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.am.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.am
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure configure-stamp \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(distdir).tar.gz $(distdir).tar.bz2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SUBDIRS = lib src include doc contrib control
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IANA_PEN = http://www.iana.org/assignments/enterprise-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IANA_PEN = http://www.iana.org/assignments/enterprise-numbers.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dist-hook:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cp control/ipmitool.spec $(distdir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/ipmievd.8.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/ipmievd.8.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,7 +221,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B @IANADIR@/enterprise-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-system IANA PEN registry taken from http://www.iana.org/assignments/enterprise-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++system IANA PEN registry taken from http://www.iana.org/assignments/enterprise-numbers.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B ~/@IANAUSERDIR@/enterprise-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ user's override for the system IANA PEN registry, this file if it exists is loaded instead
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/ipmitool.1.in.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/ipmitool.1.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3831,7 +3831,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .SH FILES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B @IANADIR@/enterprise-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-system IANA PEN registry taken from http://www.iana.org/assignments/enterprise-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++system IANA PEN registry taken from http://www.iana.org/assignments/enterprise-numbers.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .TP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .B ~/@IANAUSERDIR@/enterprise-numbers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ user's override for the system IANA PEN registry, this file if it exists is loaded instead
</span></pre><pre style='margin:0'>
</pre>