- Update to 1.8.18

- Update 'sel list' output in periodic script

PR:		214230, 210068, 209335, 209446
Submitted by:	Leonid Nevecherya

10 files changed, 22 insertions, 79 deletions

diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index b16a5e23f4c1..ab05ac54a534 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -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
diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo
index fa5ef38d0182..035ab9fc286a 100644
--- a/sysutils/ipmitool/distinfo
+++ b/sysutils/ipmitool/distinfo
@@ -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
diff --git a/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c b/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c
new file mode 100644
index 000000000000..342fe28d9d45
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-lib_ipmi__cfgp.c
@@ -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>
diff --git a/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c b/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c
deleted file mode 100644
index 2a66550292eb..000000000000
--- a/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c
+++ /dev/null
@@ -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;
- 
diff --git a/sysutils/ipmitool/files/patch-lib_ipmi__pef.c b/sysutils/ipmitool/files/patch-lib_ipmi__pef.c
deleted file mode 100644
index 87d914d90116..000000000000
--- a/sysutils/ipmitool/files/patch-lib_ipmi__pef.c
+++ /dev/null
@@ -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;
- /*
diff --git a/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c b/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c
deleted file mode 100644
index 937317a5806e..000000000000
--- a/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c
+++ /dev/null
@@ -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
- 
- 
diff --git a/sysutils/ipmitool/files/patch-src_plugins_open_open.c b/sysutils/ipmitool/files/patch-src_plugins_open_open.c
deleted file mode 100644
index f1c2cd3bc1a8..000000000000
--- a/sysutils/ipmitool/files/patch-src_plugins_open_open.c
+++ /dev/null
@@ -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>
diff --git a/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c b/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c
deleted file mode 100644
index 636d95a8d526..000000000000
--- a/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c
+++ /dev/null
@@ -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>
diff --git a/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c b/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c
deleted file mode 100644
index 0fbb04b10a69..000000000000
--- a/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c
+++ /dev/null
@@ -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>
diff --git a/sysutils/ipmitool/files/status-ipmi.sh.in b/sysutils/ipmitool/files/status-ipmi.sh.in
index 06b2239865b7..51fd00d0cd4d 100644
--- a/sysutils/ipmitool/files/status-ipmi.sh.in
+++ b/sysutils/ipmitool/files/status-ipmi.sh.in
@@ -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
         ;;