ipmitool: update to 1.8.18

version 1.8.18 2016-10-08
 * Add mac2str() and str2mac() to print/parse MAC address
 * Change formatting, remove commented-out code in
   src/plugins/imb/imbapi.c
 * Export find_lan_channel() as global
 * Expose _ipmi_get_channel_info()
 * Extend buf2str to allow separator
 * Fix indentation of #define in src/plugins/imb/imbapi.c
 * Fix missing `goto out_free;` when ipmi_parse_hex() returns (-1)
 * Fix warning for buf2str argument
 * Various Bug fixes

version 1.8.17 2016-05-01
 * Add INSTALL and NEWS, mandated by autoconf
 * Added missing ipmi_sel_supermicro.h to template Makefile.am
 * Check rsp->data_len in ipmi_sel_get_info()
 * Various Bug fixes

version 1.8.16 2015-11-22
 * Add _ipmi_get_channel_access() and _ipmi_get_channel_info()
 * Add _ipmi_get_user_access() and _ipmi_set_user_access()
 * Add _ipmi_get_user_name()
 * Add _ipmi_set_channel_access() function
 * Add _ipmi_set_user_password() function
 * Add limits check in get_cmdline_macaddr()
 * Change expression in ipmi_pef_get_info() in order to silence Coverity
 * Change expression in ipmi_pef_list_policies() in order to silence Coverity
 * Code cleanup in ipmi_user_main()
 * Create ask_password() and re-use code
 * Delete dead code from ipmi_sunoem_echo()
 * Don't output pidfile before parsing command line arguments
 * Don't use tmp variable since it's not necessary in ipmi_user_test()
 * Various Bug fixes

version 1.8.15 2014-11-24
 * Various Bug fixes

version 1.8.14 2014-05-05
 * Various Bug fixes

version 1.8.13 2013-09-09
 * Various Bug fixes

version 1.8.12 released 2012-08-09
 * Added IPMB dual bridge support (no need for driver support)
 * Enable compiler warnings and resolve all compiler warning so that
   ipmitool compiles and links with no warning or error messages
 * add ipmishell line to configure
 * fail configure when no curses or readline is found
 * support sensor bridging in free interface
 * Document the ipmitool dcmi commands in the ipmitool man page
 * Document that some commands are blocked by OpenIPMI.
 * Document the -N and -R options
 * fix manpage misdocumentation on cipher suite privilige configuration
 * Add build support for Dell OEM commands
 * Add new Dell OEM commands and update man page
 * added hpm and fwum in man page
 * man page update for fwum and hpm commands
 * Added documentation for 'ime' operating mode, used to update Intel ME.
 * add new -Y option to prompt user to enter kgkey
 * Add DCMI module (Data Center Management Interface)
 * Various Bug fixes

sysutils/ipmitool/Makefile

@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2017/07/27 08:06:46 sborrill Exp $
+# $NetBSD: Makefile,v 1.19 2017/12/22 21:45:23 markd Exp $
 #
 
-DISTNAME=		ipmitool-1.8.11
+DISTNAME=		ipmitool-1.8.18
-PKGREVISION=		5
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=ipmitool/}
 
@@ -17,6 +16,8 @@ CONFIGURE_ARGS.NetBSD+=		--disable-intf-open --disable-intf-imb
 CONFIGURE_ARGS.DragonFly+=	--disable-intf-open --disable-intf-imb
 CONFIGURE_ARGS.SunOS+=		--enable-solaris-opt
 
+CFLAGS.NetBSD+=		-D_NETBSD_SOURCE
+
 # ipmitool uses rl_event_hook
 .include "../../devel/readline/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"

sysutils/ipmitool/distinfo

@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.8 2017/02/14 21:20:48 joerg Exp $
+$NetBSD: distinfo,v 1.9 2017/12/22 21:45:23 markd Exp $
 
-SHA1 (ipmitool-1.8.11.tar.gz) = 4cb6ff3736fd3e166abc5303d6373672327a5db1
+SHA1 (ipmitool-1.8.18.tar.gz) = b85b7d01a3b8296227505ee0ad078134fc2c81ff
-RMD160 (ipmitool-1.8.11.tar.gz) = 189b2232bcd148bc89c610dfae73c6f12f42fb36
+RMD160 (ipmitool-1.8.18.tar.gz) = d1426f799b76f26aa98357c0c36fa68f3fa3c883
-SHA512 (ipmitool-1.8.11.tar.gz) = 48093790baf2532887ac87de9b55fbe38f46f271b84e6152e6b0ba11170b29aad78dfcd42036389750edbedff325476b8366b3ea1401b97148b8bc8c1bd71e4b
+SHA512 (ipmitool-1.8.18.tar.gz) = 274d424fff079f7628c0f9fe06580937cb9717c809a71b2f5ef97266c6b6c89983b662fbb1f090e2f94861f1799677c8fc6536013828a8a5e6cb239af53e45ab
-Size (ipmitool-1.8.11.tar.gz) = 769964 bytes
+Size (ipmitool-1.8.18.tar.gz) = 995313 bytes
-SHA1 (patch-ad) = 3941c5ea9286137e58ae6fb62aea6daff390ffa1
+SHA1 (patch-ad) = 4af586b36f1744d263c66ed28aa17a9f9840a415
 SHA1 (patch-ae) = 67828b62b46a30b204dd436681c5ecac39bb29b3
-SHA1 (patch-lib_ipmi__hpmfwupg.c) = e00723a892ad0427d61ecfd6648ff51c338326bc
+SHA1 (patch-src_plugins_lanplus_lanplus__crypt__impl.c) = 8aaa1c6328bd6c0559ae9863cad671cdd32ab514
-SHA1 (patch-src_plugins_lan_lan.c) = 0866b9a996b27e408605fb64ff507cc123875e59
-SHA1 (patch-src_plugins_lanplus_lanplus.c) = d4be54639dd5cf883cf06fa454930e14eda271f6

sysutils/ipmitool/patches/patch-ad

@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.2 2007/01/10 14:27:47 martti Exp $
+$NetBSD: patch-ad,v 1.3 2017/12/22 21:45:23 markd Exp $
 
---- contrib/Makefile.in.orig	2006-05-15 17:10:50.000000000 +0000
+--- contrib/Makefile.in.orig	2016-10-08 08:11:34.000000000 +0000
-+++ contrib/Makefile.in	2007-01-10 15:34:13.000000000 +0000
++++ contrib/Makefile.in
-@@ -48,7 +48,7 @@
+@@ -90,7 +90,7 @@ am__make_running_with_option = \
- srcdir = @srcdir@
+   test $$has_opt = yes
- top_srcdir = @top_srcdir@
+ am__make_dryrun = (target_option=n; $(am__make_running_with_option))
- VPATH = @srcdir@
+ am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 -pkgdatadir = $(datadir)/@PACKAGE@
 +pkgdatadir = $(datadir)/examples/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkglibexecdir = $(libexecdir)/@PACKAGE@

sysutils/ipmitool/patches/patch-lib_ipmi__hpmfwupg.c

@@ -1,22 +0,0 @@
-$NetBSD: patch-lib_ipmi__hpmfwupg.c,v 1.1 2013/03/02 17:56:13 joerg Exp $
-
---- lib/ipmi_hpmfwupg.c.orig	2013-03-01 13:04:13.000000000 +0000
-+++ lib/ipmi_hpmfwupg.c
-@@ -1233,7 +1233,7 @@ int HpmfwupgTargetCheck(struct ipmi_intf
-     if (rc != HPMFWUPG_SUCCESS)
-     {
-         lprintf(LOG_NOTICE,"Verify whether the Target board is present \n");
--        return;
-+        return HPMFWUPG_ERROR;
-     }
- 
-     rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
-@@ -3516,7 +3516,7 @@ int ipmi_hpmfwupg_main(struct ipmi_intf 
-    if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) 
-    {
-       HpmfwupgPrintUsage();
--      return;
-+      return HPMFWUPG_ERROR;
-     }
-    if ( (strcmp(argv[0], "check") == 0) )
-    {

sysutils/ipmitool/patches/patch-src_plugins_lan_lan.c

@@ -1,27 +0,0 @@
-$NetBSD: patch-src_plugins_lan_lan.c,v 1.2 2017/02/14 21:20:48 joerg Exp $
-
---- src/plugins/lan/lan.c.orig	2009-02-25 20:38:53.000000000 +0000
-+++ src/plugins/lan/lan.c
-@@ -30,11 +30,12 @@
-  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  */
- 
-+#include <sys/types.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <inttypes.h>
- #include <string.h>
--#include <sys/types.h>
-+#include <sys/time.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-@@ -1071,7 +1072,7 @@ uint8_t * ipmi_lan_build_sol_msg(struct 
- 	msg = malloc(len);
- 	if (msg == NULL) {
- 		lprintf(LOG_ERR, "ipmitool: malloc failure");
--		return;
-+		return NULL;
- 	}
- 	memset(msg, 0, len);
- 

sysutils/ipmitool/patches/patch-src_plugins_lanplus_lanplus.c

@@ -1,13 +0,0 @@
-$NetBSD: patch-src_plugins_lanplus_lanplus.c,v 1.1 2013/03/02 17:56:13 joerg Exp $
-
---- src/plugins/lanplus/lanplus.c.orig	2013-03-01 13:05:48.000000000 +0000
-+++ src/plugins/lanplus/lanplus.c
-@@ -734,7 +734,7 @@ ipmi_lan_poll_recv(struct ipmi_intf * in
-       				ipmi_req_remove_entry(rsp->payload.ipmi_response.rq_seq,
- 								rsp->payload.ipmi_response.cmd);
-                   ipmi_lan_poll_recv(intf);
--                  return;
-+                  return NULL;
- 					}
- 					else
- 					{		

sysutils/ipmitool/patches/patch-src_plugins_lanplus_lanplus__crypt__impl.c

@@ -0,0 +1,90 @@
+$NetBSD: patch-src_plugins_lanplus_lanplus__crypt__impl.c,v 1.1 2017/12/22 21:45:23 markd Exp $
+
+--- src/plugins/lanplus/lanplus_crypt_impl.c	2016-05-28 10:20:20.000000000 +0200
++++ src/plugins/lanplus/lanplus_crypt_impl.c	2017-02-21 10:50:21.634873466 +0100
+@@ -164,10 +164,10 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_EncryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 	
+ 
+ 	*bytes_written = 0;
+@@ -191,7 +191,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if(!EVP_EncryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if(!EVP_EncryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		*bytes_written = 0;
+@@ -201,7 +201,7 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if(!EVP_EncryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if(!EVP_EncryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			*bytes_written = 0;
+ 			return; /* Error */
+@@ -210,7 +210,8 @@ lanplus_encrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+ }
+@@ -239,10 +240,10 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 							uint8_t       * output,
+ 							uint32_t        * bytes_written)
+ {
+-	EVP_CIPHER_CTX ctx;
+-	EVP_CIPHER_CTX_init(&ctx);
+-	EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv);
+-	EVP_CIPHER_CTX_set_padding(&ctx, 0);
++	EVP_CIPHER_CTX *ctx = EVP_CIPHER_CTX_new();
++	EVP_CIPHER_CTX_init(ctx);
++	EVP_DecryptInit_ex(ctx, EVP_aes_128_cbc(), NULL, key, iv);
++	EVP_CIPHER_CTX_set_padding(ctx, 0);
+ 
+ 
+ 	if (verbose >= 5)
+@@ -266,7 +267,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	assert((input_length % IPMI_CRYPT_AES_CBC_128_BLOCK_SIZE) == 0);
+ 
+ 
+-	if (!EVP_DecryptUpdate(&ctx, output, (int *)bytes_written, input, input_length))
++	if (!EVP_DecryptUpdate(ctx, output, (int *)bytes_written, input, input_length))
+ 	{
+ 		/* Error */
+ 		lprintf(LOG_DEBUG, "ERROR: decrypt update failed");
+@@ -277,7 +278,7 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 	{
+ 		uint32_t tmplen;
+ 
+-		if (!EVP_DecryptFinal_ex(&ctx, output + *bytes_written, (int *)&tmplen))
++		if (!EVP_DecryptFinal_ex(ctx, output + *bytes_written, (int *)&tmplen))
+ 		{
+ 			char buffer[1000];
+ 			ERR_error_string(ERR_get_error(), buffer);
+@@ -290,7 +291,8 @@ lanplus_decrypt_aes_cbc_128(const uint8_
+ 		{
+ 			/* Success */
+ 			*bytes_written += tmplen;
+-			EVP_CIPHER_CTX_cleanup(&ctx);
++			EVP_CIPHER_CTX_cleanup(ctx);
++			EVP_CIPHER_CTX_free(ctx);
+ 		}
+ 	}
+