ipmitool - update from 1.8.18 to 1.8.19 (r151038)

build/ipmitool/build.sh

@@ -21,12 +21,12 @@
 # CDDL HEADER END }}}
 #
 # Copyright 2011-2012 OmniTI Computer Consulting, Inc.  All rights reserved.
-# Copyright 2019 OmniOS Community Edition (OmniOSce) Association.
+# Copyright 2022 OmniOS Community Edition (OmniOSce) Association.
 
 . ../../lib/functions.sh
 
 PROG=ipmitool
-VER=1.8.18
+VER=1.8.19
 PKG=system/management/ipmitool
 SUMMARY="IPMI management tool"
 DESC="A utility for managing and configuring devices that support the "
@@ -35,6 +35,9 @@ DESC+="Intelligent Platform Management Interface"
 BUILD_DEPENDS_IPS="driver/ipmi developer/build/libtool"
 
 set_arch 64
+
+set_builddir $PROG-${PROG^^}_${VER//./_}
+
 CONFIGURE_OPTS_64+=" --bindir=/usr/sbin --sbindir=/usr/lib"
 CONFIGURE_OPTS+="
     --mandir=/usr/share/man
@@ -43,8 +46,10 @@ CONFIGURE_OPTS+="
     --enable-solaris-opt
 "
 
+CPPFLAGS+=" -D_PATH_RUN='\"/var/run/\"'"
+
 init
-download_source $PROG $PROG $VER
+download_source $PROG ${PROG^^}_${VER//./_}
 patch_source
 run_autoreconf -fi
 prep_build

build/ipmitool/patches/7052161.patch

@@ -3,7 +3,7 @@ Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
 diff -wpruN '--exclude=*.orig' a~/lib/ipmi_fru.c a/lib/ipmi_fru.c
 --- a~/lib/ipmi_fru.c	1970-01-01 00:00:00
 +++ a/lib/ipmi_fru.c	1970-01-01 00:00:00
-@@ -1332,11 +1332,19 @@ fru_area_print_multirec(struct ipmi_intf
+@@ -1376,11 +1376,19 @@ fru_area_print_multirec(struct ipmi_intf
  				peak_hold_up_time);
  			if (ps->combined_capacity == 0)
  				printf ("  Combined capacity          : not specified\n");

build/ipmitool/patches/configure.patch

@@ -1,7 +1,7 @@
 diff -wpruN '--exclude=*.orig' a~/configure.ac a/configure.ac
 --- a~/configure.ac	1970-01-01 00:00:00
 +++ a/configure.ac	1970-01-01 00:00:00
-@@ -78,7 +78,7 @@ solaris*)
+@@ -100,7 +100,7 @@ solaris*)
  	# disable the linux-specific interfaces
  	xenable_intf_bmc=yes
  	xenable_intf_imb=no

build/ipmitool/patches/fix-MAX.patch

@@ -1,7 +1,7 @@
 diff -wpruN '--exclude=*.orig' a~/lib/ipmi_hpmfwupg.c a/lib/ipmi_hpmfwupg.c
 --- a~/lib/ipmi_hpmfwupg.c	1970-01-01 00:00:00
 +++ a/lib/ipmi_hpmfwupg.c	1970-01-01 00:00:00
-@@ -46,6 +46,7 @@
+@@ -43,6 +43,7 @@
  #include <stdio.h>
  #include <time.h>
  #include <sys/param.h>

build/ipmitool/patches/iana-pen.patch

@@ -0,0 +1,19 @@
+
+This was fixed upstream in
+
+    https://github.com/ipmitool/ipmitool/commit/1edb0e27e44196d1ebe449aba0b9be
+
+but has not yet made it into a release.
+
+diff -wpruN '--exclude=*.orig' a~/Makefile.am a/Makefile.am
+--- a~/Makefile.am	1970-01-01 00:00:00
++++ a/Makefile.am	1970-01-01 00:00:00
+@@ -41,7 +41,7 @@ MAINTAINERCLEANFILES = Makefile.in acloc
+ 	$(distdir).tar.gz $(distdir).tar.bz2
+
+ SUBDIRS = lib src include doc contrib control
+-IANA_PEN = http://www.iana.org/assignments/enterprise-numbers
++IANA_PEN = https://www.iana.org/assignments/enterprise-numbers.txt
+
+ dist-hook:
+ 	cp control/ipmitool.spec $(distdir)

build/ipmitool/patches/ipmievd.local4.patch

@@ -3,7 +3,7 @@ Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved
 diff -wpruN '--exclude=*.orig' a~/lib/log.c a/lib/log.c
 --- a~/lib/log.c	1970-01-01 00:00:00
 +++ a/lib/log.c	1970-01-01 00:00:00
-@@ -123,7 +123,7 @@ void log_init(const char * name, int isd
+@@ -120,7 +120,7 @@ void log_init(const char * name, int isd
  	logpriv->level = verbose + LOG_NOTICE;
 
  	if (logpriv->daemon)

build/ipmitool/patches/series

@@ -3,6 +3,4 @@ configure.patch
 ipmievd.local4.patch
 v6-noaddr16.patch
 fix-MAX.patch
-POSIX.patch
-openssl11.patch
-multiple_symbols.patch
+iana-pen.patch

build/ipmitool/patches/v6-noaddr16.patch

@@ -1,7 +1,7 @@
 diff -wpruN '--exclude=*.orig' a~/src/plugins/ipmi_intf.c a/src/plugins/ipmi_intf.c
 --- a~/src/plugins/ipmi_intf.c	1970-01-01 00:00:00
 +++ a/src/plugins/ipmi_intf.c	1970-01-01 00:00:00
-@@ -429,8 +429,11 @@ ipmi_intf_socket_connect(struct ipmi_int
+@@ -455,8 +455,11 @@ ipmi_intf_socket_connect(struct ipmi_int
  								tmp6->sin6_scope_id);
  						}
 
@@ -13,7 +13,7 @@ diff -wpruN '--exclude=*.orig' a~/src/plugins/ipmi_intf.c a/src/plugins/ipmi_int
  						} else {
  							/*
  							 * No scope information in interface address information
-@@ -444,6 +447,7 @@ ipmi_intf_socket_connect(struct ipmi_int
+@@ -470,6 +473,7 @@ ipmi_intf_socket_connect(struct ipmi_int
  								addr6->sin6_scope_id = ntohs(tmp6->sin6_addr.s6_addr[1]);
  							}
  						}