7 files changed, 54 insertions, 14 deletions

diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 172c3d12975a..6b92e5e11261 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeipmi
-PORTVERSION=	1.5.7
+PORTVERSION=	1.6.2
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU \
 		http://ftp.gluster.com/pub/${PORTNAME}/${PORTVERSION}/
@@ -24,9 +24,10 @@ BROKEN_powerpc64=	invokes x86 assembler
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libgcrypt.so:security/libgcrypt
 
-OPTIONS_DEFINE=	DEBUG DOCS IOPERM
+OPTIONS_DEFINE=	DEBUG DOCS IOPERM IPV6
 IOPERM_DESC=	Use i386_set_ioperm
 
+CFLAGS+=	-D_WANT_SEMUN
 CONFIGURE_ARGS=	--disable-init-scripts \
 		--sysconfdir=${ETCDIR} \
 		--with-ipmi-monitoring-sdr-cache-dir=${CACHE_DIR}/ipmimonitoringsdrcache \
@@ -36,7 +37,6 @@ CONFIGURE_ENV=	PTHREAD_LIBS=-lpthread ac_cv_path_CPP=${CPP}
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USES=		gmake libtool localbase shebangfix
-CFLAGS+=	-D_WANT_SEMUN
 
 INFO=		freeipmi-faq
 PLIST_SUB=	CACHE_DIR=${CACHE_DIR}
@@ -53,6 +53,7 @@ DEBUG_CONFIGURE_ARGS=	--enable-debug --enable-trace
 DEBUG_INSTALL_TARGET=	install
 DEBUG_INSTALL_TARGET_OFF=	install-strip
 IOPERM_CPPFLAGS=	-DUSE_IOPERM
+IPV6_CPPFLAGS=		-DIPV6
 
 post-patch:
 	@${FIND} ${WRKSRC} -name '*.man' -o -name '*.pre.in' | ${XARGS} -I % ${REINPLACE_CMD} -e '/^\.\\\"/ s|$$|"|' %
diff --git a/sysutils/freeipmi/distinfo b/sysutils/freeipmi/distinfo
index 0eb051d923df..d6af100942f1 100644
--- a/sysutils/freeipmi/distinfo
+++ b/sysutils/freeipmi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1502974017
-SHA256 (freeipmi-1.5.7.tar.gz) = b46c9432e8649b87d4646bbf4da32f7e9039796fc256f4b229c94c3ac7d0bde5
-SIZE (freeipmi-1.5.7.tar.gz) = 3321187
+TIMESTAMP = 1525792177
+SHA256 (freeipmi-1.6.2.tar.gz) = 31513324591bf8d79d7cdeb39ecfac45e0ea7f6a5905a625a4a906fb8270124a
+SIZE (freeipmi-1.6.2.tar.gz) = 3399236
diff --git a/sysutils/freeipmi/files/patch-common-miscutil-network.c b/sysutils/freeipmi/files/patch-common-miscutil-network.c
new file mode 100644
index 000000000000..6bdb9df7489e
--- /dev/null
+++ b/sysutils/freeipmi/files/patch-common-miscutil-network.c
@@ -0,0 +1,11 @@
+--- common/miscutil/network.c.orig	2018-02-02 22:03:31 UTC
++++ common/miscutil/network.c
+@@ -39,6 +39,8 @@
+ #include <errno.h>
+ #include <unistd.h>
+ #include <arpa/inet.h>
++#include <netinet/in.h>
++#include <sys/socket.h>
+ #include <limits.h>             /* MAXHOSTNAMELEN */
+ #ifdef HAVE_NETDB_H
+ #include <netdb.h>              /* MAXHOSTNAMELEN Solaris */
diff --git a/sysutils/freeipmi/files/patch-ipmidetectd-ipmidetectd.c b/sysutils/freeipmi/files/patch-ipmidetectd-ipmidetectd.c
new file mode 100644
index 000000000000..26cce9e2f749
--- /dev/null
+++ b/sysutils/freeipmi/files/patch-ipmidetectd-ipmidetectd.c
@@ -0,0 +1,16 @@
+--- ipmidetectd/ipmidetectd.c.orig	2018-03-09 20:42:26 UTC
++++ ipmidetectd/ipmidetectd.c
+@@ -263,12 +263,7 @@ _nodes_setup (void)
+       ai_hints.ai_flags = (AI_V4MAPPED | AI_ADDRCONFIG);
+ 
+       if ((ret = getaddrinfo (host_ptr, port_str, &ai_hints, &ai_res)))
+-        {
+-          if (ret == EAI_NODATA)
+-            err_exit ("Invalid hostname: %s", host_ptr);
+-          else
+-            err_exit ("getaddrinfo %s: %s", host_ptr, gai_strerror (ret));
+-        }
++        err_exit ("getaddrinfo %s: %s", host_ptr, gai_strerror (ret));
+ 
+       /* Try all of the different answers we got, until we succeed. */
+       for (ai = ai_res; ai != NULL; ai = ai->ai_next)
diff --git a/sysutils/freeipmi/files/patch-ipmipower-ipmipower_connection.c b/sysutils/freeipmi/files/patch-ipmipower-ipmipower_connection.c
new file mode 100644
index 000000000000..bc9faf51ef41
--- /dev/null
+++ b/sysutils/freeipmi/files/patch-ipmipower-ipmipower_connection.c
@@ -0,0 +1,12 @@
+--- ipmipower/ipmipower_connection.c.orig	2018-02-02 22:03:33 UTC
++++ ipmipower/ipmipower_connection.c
+@@ -297,8 +297,7 @@ _connection_setup (struct ipmipower_conn
+ 
+   if ((ret = getaddrinfo (ic->hostname, port_str, &ai_hints, &ai_res)))
+     {
+-      if (ret == EAI_NODATA
+-	  || ret == EAI_NONAME)
++      if (ret == EAI_NONAME)
+         ipmipower_output (IPMIPOWER_MSG_TYPE_HOSTNAME_INVALID, ic->hostname, NULL);
+       else
+         {
diff --git a/sysutils/freeipmi/files/patch-man-Makefile.in b/sysutils/freeipmi/files/patch-man-Makefile.in
index 7cd7613c624d..e72771ace5ee 100644
--- a/sysutils/freeipmi/files/patch-man-Makefile.in
+++ b/sysutils/freeipmi/files/patch-man-Makefile.in
@@ -1,11 +1,11 @@
---- man/Makefile.in.orig	2015-01-07 18:23:47 UTC
+--- man/Makefile.in.orig	2018-02-02 22:15:32 UTC
 +++ man/Makefile.in
-@@ -885,7 +885,7 @@ uninstall-man: uninstall-man3 uninstall-
+@@ -989,7 +989,7 @@ uninstall-man: uninstall-man3 uninstall-
  
  
  $(MANS_CPP): $(MANS_CPP:%=%.pre)
--	$(CPP) -nostdinc -w -C -P -I$(top_srcdir)/man $@.pre  $@
-+	$(CPP) -nostdinc -w -C -I$(top_srcdir)/man $@.pre | grep -v '^#' > $@
+-	$(CPP_FOR_BUILD) -nostdinc -w -C -P -I$(top_srcdir)/man $@.pre $@
++	$(CPP_FOR_BUILD) -nostdinc -w -C -I$(top_srcdir)/man $@.pre | grep -v '^#' > $@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index cf94c03f8979..1b24b0a50ba8 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -254,19 +254,19 @@ include/ipmidetect.h
 lib/libfreeipmi.a
 lib/libfreeipmi.so
 lib/libfreeipmi.so.17
-lib/libfreeipmi.so.17.1.4
+lib/libfreeipmi.so.17.2.1
 lib/libipmiconsole.a
 lib/libipmiconsole.so
 lib/libipmiconsole.so.2
-lib/libipmiconsole.so.2.3.4
+lib/libipmiconsole.so.2.3.5
 lib/libipmidetect.a
 lib/libipmidetect.so
 lib/libipmidetect.so.0
-lib/libipmidetect.so.0.0.0
+lib/libipmidetect.so.0.0.1
 lib/libipmimonitoring.a
 lib/libipmimonitoring.so
 lib/libipmimonitoring.so.6
-lib/libipmimonitoring.so.6.0.6
+lib/libipmimonitoring.so.6.0.7
 libdata/pkgconfig/libfreeipmi.pc
 libdata/pkgconfig/libipmiconsole.pc
 libdata/pkgconfig/libipmidetect.pc