Update ipmitool to upstream version 1.8.17

Make patchfiles portlint friendly and add new patches to aid in compilation.

Reviewed by:	zi
Differential Revision:	https://reviews.freebsd.org/D6401

9 files changed, 61 insertions, 20 deletions

diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index a58dab92bda2..475be5c3b926 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.8.15
-PORTREVISION=	1
+PORTVERSION=	1.8.17
 CATEGORIES=	sysutils
 MASTER_SITES=	SF
 
@@ -14,11 +13,13 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe tar:bzip2 gmake readline
+USE_GCC=	yes
 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-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 b6ee0260ee6a..fa5ef38d0182 100644
--- a/sysutils/ipmitool/distinfo
+++ b/sysutils/ipmitool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipmitool-1.8.15.tar.bz2) = 4acd2df5f8740fef5c032cebee0113ec4d3bbef04a6f4dbfaf7fcc7f3eb08c40
-SIZE (ipmitool-1.8.15.tar.bz2) = 747174
+SHA256 (ipmitool-1.8.17.tar.bz2) = 97fa20efd9c87111455b174858544becae7fcc03a3cb7bf5c19b09065c842d02
+SIZE (ipmitool-1.8.17.tar.bz2) = 772570
diff --git a/sysutils/ipmitool/files/patch-ipmi_intf.c b/sysutils/ipmitool/files/patch-ipmi_intf.c
deleted file mode 100644
index 864ca55811ba..000000000000
--- a/sysutils/ipmitool/files/patch-ipmi_intf.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/plugins/ipmi_intf.c.orig       2014-05-30 19:18:08.346626784 -0400
-+++ src/plugins/ipmi_intf.c    2014-05-30 19:18:43.537804678 -0400
-@@ -45,6 +45,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-ipmi_chassis.c b/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c
index 15279f269cbc..2a66550292eb 100644
--- a/sysutils/ipmitool/files/patch-ipmi_chassis.c
+++ b/sysutils/ipmitool/files/patch-lib_ipmi__chassis.c
@@ -1,6 +1,6 @@
---- lib/ipmi_chassis.c.orig	2012-10-15 07:38:19.000000000 +0000
-+++ lib/ipmi_chassis.c	2012-10-15 07:38:46.000000000 +0000
-@@ -41,6 +41,7 @@
+--- 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>
diff --git a/sysutils/ipmitool/files/patch-ipmi_pef.c b/sysutils/ipmitool/files/patch-lib_ipmi__pef.c
index fa7227877fde..87d914d90116 100644
--- a/sysutils/ipmitool/files/patch-ipmi_pef.c
+++ b/sysutils/ipmitool/files/patch-lib_ipmi__pef.c
@@ -1,6 +1,6 @@
---- lib/ipmi_pef.c.orig	2012-10-15 07:41:07.000000000 +0000
-+++ lib/ipmi_pef.c	2012-10-15 07:41:36.000000000 +0000
-@@ -39,6 +39,7 @@
+--- 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>
diff --git a/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c b/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c
new file mode 100644
index 000000000000..937317a5806e
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-src_plugins_ipmi__intf.c
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 000000000000..f1c2cd3bc1a8
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-src_plugins_open_open.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..636d95a8d526
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-src_plugins_serial_serial__basic.c
@@ -0,0 +1,10 @@
+--- 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
new file mode 100644
index 000000000000..0fbb04b10a69
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-src_plugins_serial_serial__terminal.c
@@ -0,0 +1,10 @@
+--- 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>