svn commit: r431876 - in head/sysutils/ipmitool: . files

[Ryan Steinmetz]

Author: zi
Date: Thu Jan 19 14:06:37 2017
New Revision: 431876
URL: https://svnweb.freebsd.org/changeset/ports/431876

Log:
  - Update to 1.8.18
  - Update 'sel list' output in periodic script
  
  PR:		214230, 210068, 209335, 209446
  Submitted by:	Leonid Nevecherya

Added:
  head/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c   (contents, props changed)
Deleted:
  head/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c
  head/sysutils/ipmitool/files/patch-lib_ipmi__pef.c
  head/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c
  head/sysutils/ipmitool/files/patch-src_plugins_open_open.c
  head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c
  head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c
Modified:
  head/sysutils/ipmitool/Makefile
  head/sysutils/ipmitool/distinfo
  head/sysutils/ipmitool/files/status-ipmi.sh.in

Modified: head/sysutils/ipmitool/Makefile
==============================================================================
--- head/sysutils/ipmitool/Makefile	Thu Jan 19 13:54:54 2017	(r431875)
+++ head/sysutils/ipmitool/Makefile	Thu Jan 19 14:06:37 2017	(r431876)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.8.17
-PORTREVISION=	1
+PORTVERSION=	1.8.18
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -13,13 +12,9 @@ COMMENT=	CLI to manage IPMI systems
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		cpe tar:bzip2 gmake readline
+USES=		cpe tar:bzip2 gmake readline ssl
 CPE_VENDOR=	sun
-USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--enable-intf-lan --enable-intf-lanplus \
-		--disable-intf-imb --disable-intf-lipmi --disable-intf-bmc \
-		--disable-intf-usb
 PLIST_FILES=	bin/ipmitool man/man1/ipmitool.1.gz man/man8/ipmievd.8.gz \
 		sbin/ipmievd share/ipmitool/oem_ibm_sel_map \
 		${PERIODIC_DIR}/400.status-ipmi

Modified: head/sysutils/ipmitool/distinfo
==============================================================================
--- head/sysutils/ipmitool/distinfo	Thu Jan 19 13:54:54 2017	(r431875)
+++ head/sysutils/ipmitool/distinfo	Thu Jan 19 14:06:37 2017	(r431876)
@@ -1,2 +1,3 @@
-SHA256 (ipmitool-1.8.17.tar.bz2) = 97fa20efd9c87111455b174858544becae7fcc03a3cb7bf5c19b09065c842d02
-SIZE (ipmitool-1.8.17.tar.bz2) = 772570
+TIMESTAMP = 1478173088
+SHA256 (ipmitool-1.8.18.tar.bz2) = 0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01
+SIZE (ipmitool-1.8.18.tar.bz2) = 795278

Added: head/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c	Thu Jan 19 14:06:37 2017	(r431876)
@@ -0,0 +1,11 @@
+--- lib/ipmi_cfgp.c.orig	2016-08-21 06:59:27 UTC
++++ lib/ipmi_cfgp.c
+@@ -30,7 +30,7 @@
+  * POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#include <malloc.h>
++#include <stdlib.h>
+ #include <string.h>
+ 
+ #include <ipmitool/helper.h>

Modified: head/sysutils/ipmitool/files/status-ipmi.sh.in
==============================================================================
--- head/sysutils/ipmitool/files/status-ipmi.sh.in	Thu Jan 19 13:54:54 2017	(r431875)
+++ head/sysutils/ipmitool/files/status-ipmi.sh.in	Thu Jan 19 14:06:37 2017	(r431876)
@@ -49,7 +49,12 @@ case "${daily_status_ipmi_enable}" in
         if [ $entries -gt $last ]; then
           echo $entries > /var/db/ipmi-sel-count
           echo ""
-          $ipmitool sel list $sel_list_args
+          if [ "$sel_list_args" ]; then
+            $ipmitool sel list $sel_list_args
+          else
+            count=$(($entries-$last))
+            $ipmitool sel list last $count
+          fi
           rc=3
         fi
         ;;