Index: head/sysutils/ipmitool/Makefile
===================================================================
--- head/sysutils/ipmitool/Makefile	(revision 431875)
+++ head/sysutils/ipmitool/Makefile	(revision 431876)
@@ -1,64 +1,59 @@
 # Created by: Dmitry Frolov <frol@nov.net>
 # $FreeBSD$
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.8.17
-PORTREVISION=	1
+PORTVERSION=	1.8.18
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
 MAINTAINER=	zi@FreeBSD.org
 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
 SUB_FILES=	status-ipmi.sh
 PORTDOCS=	AUTHORS COPYING ChangeLog README
 
 PERIODIC_DIR=	etc/periodic/daily
 
 OPTIONS_DEFINE=	FREEIPMI DOCS
 FREEIPMI_DESC=	Enable support for freeipmi
 
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 .if defined(WITH_DEBUG)
 CFLAGS+=	-ggdb -Wall
 .endif
 
 .if exists(/usr/include/sys/ipmi.h)
 CONFIGURE_ARGS+=	--enable-intf-open
 .else
 CONFIGURE_ARGS+=	--disable-intf-open
 .endif
 
 DOCS_EXTRA_PATCHES_OFF=	${PATCHDIR}/extra-patch-Makefile.in
 
 FREEIPMI_LIB_DEPENDS=	libfreeipmi.so:sysutils/freeipmi
 FREEIPMI_CPPFLAGS=	-I${LOCALBASE}/include
 FREEIPMI_LDFLAGS=	-L${LOCALBASE}/lib
 FREEIPMI_CONFIGURE_ENABLE=	intf-free
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/${PERIODIC_DIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/status-ipmi.sh ${STAGEDIR}${PREFIX}/${PERIODIC_DIR}/400.status-ipmi
 
 .include <bsd.port.pre.mk>
 
 .if ${SSL_DEFAULT:Mopenssl-devel}
 BROKEN=		Does not build with openssl-devel
 .endif
 
 .include <bsd.port.post.mk>
Index: head/sysutils/ipmitool/distinfo
===================================================================
--- head/sysutils/ipmitool/distinfo	(revision 431875)
+++ head/sysutils/ipmitool/distinfo	(revision 431876)
@@ -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
Index: head/sysutils/ipmitool/files/patch-lib_ipmi__pef.c
===================================================================
--- head/sysutils/ipmitool/files/patch-lib_ipmi__pef.c	(revision 431875)
+++ head/sysutils/ipmitool/files/patch-lib_ipmi__pef.c	(nonexistent)
@@ -1,10 +0,0 @@
---- lib/ipmi_pef.c.orig	2016-05-06 14:48:54 UTC
-+++ lib/ipmi_pef.c
-@@ -40,6 +40,7 @@
- #include <ipmitool/ipmi.h>
- #include <ipmitool/ipmi_intf.h>
- #include <ipmitool/ipmi_pef.h>
-+#include <ipmitool/bswap.h>
- 
- extern int verbose;
- /*

Property changes on: head/sysutils/ipmitool/files/patch-lib_ipmi__pef.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c
===================================================================
--- head/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c	(revision 431875)
+++ head/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c	(nonexistent)
@@ -1,18 +0,0 @@
---- src/plugins/ipmi_intf.c.orig	2016-05-06 14:48:54 UTC
-+++ src/plugins/ipmi_intf.c
-@@ -32,6 +32,7 @@
- #define _XOPEN_SOURCE 700
- #define _GNU_SOURCE 1
- #define _DARWIN_C_SOURCE 1
-+#define __BSD_VISIBLE 1
- 
- #include <stdio.h>
- #include <stdlib.h>
-@@ -48,6 +49,7 @@
- #include <ifaddrs.h>
- #include <unistd.h>
- #include <netdb.h>
-+#define s6_addr16 __u6_addr.__u6_addr16
- #endif
- 
- 

Property changes on: head/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/ipmitool/files/patch-src_plugins_open_open.c
===================================================================
--- head/sysutils/ipmitool/files/patch-src_plugins_open_open.c	(revision 431875)
+++ head/sysutils/ipmitool/files/patch-src_plugins_open_open.c	(nonexistent)
@@ -1,11 +0,0 @@
---- src/plugins/open/open.c.orig	2016-05-06 14:48:54 UTC
-+++ src/plugins/open/open.c
-@@ -29,8 +29,6 @@
-  * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
-  * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  */
--#define _POSIX_SOURCE
--
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>

Property changes on: head/sysutils/ipmitool/files/patch-src_plugins_open_open.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c
===================================================================
--- head/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c	(revision 431875)
+++ head/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c	(nonexistent)
@@ -1,10 +0,0 @@
---- lib/ipmi_chassis.c.orig	2016-05-06 14:48:54 UTC
-+++ lib/ipmi_chassis.c
-@@ -44,6 +44,7 @@
- #include <ipmitool/ipmi_intf.h>
- #include <ipmitool/ipmi_strings.h>
- #include <ipmitool/ipmi_chassis.h>
-+#include <ipmitool/bswap.h>
- 
- extern int verbose;
- 

Property changes on: head/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c
===================================================================
--- head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c	(revision 431875)
+++ head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c	(nonexistent)
@@ -1,10 +0,0 @@
---- src/plugins/serial/serial_basic.c.orig	2016-05-06 14:48:54 UTC
-+++ src/plugins/serial/serial_basic.c
-@@ -33,7 +33,6 @@
- 
- /* Serial Interface, Basic Mode plugin. */
- 
--#include <alloca.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <time.h>

Property changes on: head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c
===================================================================
--- head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c	(revision 431875)
+++ head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c	(nonexistent)
@@ -1,10 +0,0 @@
---- src/plugins/serial/serial_terminal.c.orig	2016-05-06 14:48:54 UTC
-+++ src/plugins/serial/serial_terminal.c
-@@ -33,7 +33,6 @@
- 
- /* Serial Interface, Terminal Mode plugin. */
- 
--#include <alloca.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <unistd.h>

Property changes on: head/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c
===================================================================
--- head/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c	(nonexistent)
+++ head/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c	(revision 431876)
@@ -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>

Property changes on: head/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/sysutils/ipmitool/files/status-ipmi.sh.in
===================================================================
--- head/sysutils/ipmitool/files/status-ipmi.sh.in	(revision 431875)
+++ head/sysutils/ipmitool/files/status-ipmi.sh.in	(revision 431876)
@@ -1,61 +1,66 @@
 #!/bin/sh
 #
 # Check status of IPMI sensors and System Event Log
 #
 
 # If there is a global system configuration file, suck it in.
 #
 if [ -r /etc/defaults/periodic.conf ]
 then
     . /etc/defaults/periodic.conf
     source_periodic_confs
 fi
 
 sdr_list_args=${daily_status_ipmi_sdr_list_args:-}
 sel_list_args=${daily_status_ipmi_sel_list_args:-}
 sel_cap_warn_pct=${daily_status_ipmi_sel_cap_warn_pct:-80}
 
 ipmitool=%%PREFIX%%/bin/ipmitool
 
 rc=0
 
 case "${daily_status_ipmi_enable}" in
     [Yy][Ee][Ss])
         if [ ! -x $ipmitool ]; then
           echo "\$daily_status_ipmi_enable is set but ${ipmitool}" \
                "isn't executable"
           exit 2
         fi
 
         echo ""
         echo "Checking IPMI sensors:"
 
         $ipmitool sdr list $sdr_list_args && rc=1 || rc=3
 
         echo ""
         echo "Checking IPMI System Event Log:"
 
         info=`$ipmitool sel info` || exit 3
         used=$(echo "${info}" | awk '/Percent Used/{print 0 + $4}')
         entries=$(echo "${info}" | awk '/Entries/{print 0 + $3}')
 
         if [ $used -gt $sel_cap_warn_pct ]; then
            echo "  SEL is at ${used}% capacity"
            rc=3
         fi
 
         last=`cat /var/db/ipmi-sel-count 2>/dev/null || echo 0`
 
         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
         ;;
     *)
         rc=0
         ;;
 esac
 
 exit $rc