- Update to 1.8.1

- Workaround for a bug in readline
- Correction for crossbuilds: MACHINE_ARCH -> ARCH

PR:		ports/80787
Submitted by:	maintainer

4 files changed, 36 insertions, 12 deletions

diff --git a/sysutils/ipmitool/Makefile b/sysutils/ipmitool/Makefile
index 41f779f450e0..fefef043d49e 100644
--- a/sysutils/ipmitool/Makefile
+++ b/sysutils/ipmitool/Makefile
@@ -6,14 +6,11 @@
 #
 
 PORTNAME=	ipmitool
-PORTVERSION=	1.6.0
+PORTVERSION=	1.8.1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	ftp://ftp.riss-telecom.ru/pub/patches/
-PATCHFILES=	${DISTNAME}-fbsd1.diff
-
 MAINTAINER=	frolov@riss-telecom.ru
 COMMENT=	CLI to manage IPMI systems
 
@@ -21,17 +18,18 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 # On FreeBSD only lan and lanplus interfaces are supported at this time
 CONFIGURE_ARGS+=	--enable-intf-lan --enable-intf-lanplus \
 		--disable-intf-open --disable-intf-imb --disable-intf-lipmi
-PLIST_FILES=	bin/ipmitool bin/ipmievd
+PLIST_FILES=	bin/ipmitool sbin/ipmievd
 PLIST_DIRS=	share/${PORTNAME}
 PORTDOCS=	README AUTHORS ChangeLog COPYING
 MAN1+=		${PORTNAME}.1
 
-DATAFILES=	bmclanconf ipmi.init README collect_data.sh \
-		create_rrds.sh create_webpage_compact.sh create_webpage.sh
+DATAFILES=	bmclanconf ipmi.init.basic ipmi.init.redhat README \
+		collect_data.sh create_rrds.sh create_webpage_compact.sh \
+		create_webpage.sh
 .for f in ${DATAFILES}
 PLIST_FILES+=	share/${PORTNAME}/${f}
 .endfor
diff --git a/sysutils/ipmitool/distinfo b/sysutils/ipmitool/distinfo
index d3d0cc8d9ebf..3c8b9475dee6 100644
--- a/sysutils/ipmitool/distinfo
+++ b/sysutils/ipmitool/distinfo
@@ -1,4 +1,2 @@
-MD5 (ipmitool-1.6.0.tar.bz2) = 5f95cfc69531ee783eac5ec3939115b8
-SIZE (ipmitool-1.6.0.tar.bz2) = 358005
-MD5 (ipmitool-1.6.0-fbsd1.diff) = 12183edd1de2a6197ea9a5d19d64aa30
-SIZE (ipmitool-1.6.0-fbsd1.diff) = 5646
+MD5 (ipmitool-1.8.1.tar.bz2) = e24e00b077af2f00590cb09c4cfe5f7d
+SIZE (ipmitool-1.8.1.tar.bz2) = 387013
diff --git a/sysutils/ipmitool/files/patch-lib_ipmi__lang.c b/sysutils/ipmitool/files/patch-lib_ipmi__lang.c
new file mode 100644
index 000000000000..b6b93901d7d5
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-lib_ipmi__lang.c
@@ -0,0 +1,15 @@
+--- lib/ipmi_lanp.c.orig	Thu Mar 24 07:39:01 2005
++++ lib/ipmi_lanp.c	Tue Apr  5 09:17:30 2005
+@@ -38,11 +38,11 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <strings.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+-#include <sys/types.h>
+ #include <unistd.h>
+ #include <signal.h>
+ #include <setjmp.h>
diff --git a/sysutils/ipmitool/files/patch-src_ipmishell.c b/sysutils/ipmitool/files/patch-src_ipmishell.c
new file mode 100644
index 000000000000..5336418f7009
--- /dev/null
+++ b/sysutils/ipmitool/files/patch-src_ipmishell.c
@@ -0,0 +1,13 @@
+--- src/ipmishell.c.orig	Sat Jan  8 04:43:38 2005
++++ src/ipmishell.c	Sun Feb  6 23:47:32 2005
+@@ -114,7 +114,9 @@
+ 		rl_event_hook = rl_event_keepalive;
+ #if defined(RL_READLINE_VERSION) && RL_READLINE_VERSION >= 0x0402
+ 		/* set to 1 second */
+-		rl_set_keyboard_input_timeout(1000*1000);
++		/* There is a bug in readline 4.2 and later (at least on FreeBSD):
++		 * timeout equal or greater than 1 second causes an infinite loop. */
++		rl_set_keyboard_input_timeout(1000 * 1000 - 1);
+ #endif
+ 	}
+