Date: Sun, 8 May 2005 22:11:01 +0700 (NOVST) From: Dmitry Frolov <frolov@riss-telecom.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/80787: Update port: sysutils/ipmitool update to 1.8.1 and fix a bug Message-ID: <200505081511.j48FB0sw070052@nerve.riss-telecom.ru> Resent-Message-ID: <200505081520.j48FK2dp018559@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 80787
>Category: ports
>Synopsis: Update port: sysutils/ipmitool update to 1.8.1 and fix a bug
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun May 08 15:20:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Frolov
>Release: FreeBSD 5.3-BETA7 i386
>Organization:
RISS-Telecom
>Environment:
System: FreeBSD nerve.riss-telecom.ru 5.3-BETA7 FreeBSD 5.3-BETA7 #17: Thu Nov 4 15:39:39 NOVT 2004 root@nerve.riss-telecom.ru:/var/obj/usr/src/sys/NERVE i386
>Description:
Update IPMItool 1.6.0 to 1.8.1
Workaround for a bug in readline
Correction for crossbuilds: MACHINE_ARCH -> ARCH
>How-To-Repeat:
>Fix:
Patch is to be applied in ports/sysutils/ipmitool:
diff -ruN --exclude=CVS /usr/ports/sysutils/ipmitool/Makefile ./Makefile
--- /usr/ports/sysutils/ipmitool/Makefile Wed Apr 13 01:28:14 2005
+++ ./Makefile Sun May 8 21:46:55 2005
@@ -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_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 -ruN --exclude=CVS /usr/ports/sysutils/ipmitool/distinfo ./distinfo
--- /usr/ports/sysutils/ipmitool/distinfo Thu Dec 23 16:56:15 2004
+++ ./distinfo Tue Apr 12 16:35:18 2005
@@ -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 -ruN --exclude=CVS /usr/ports/sysutils/ipmitool/files/patch-lib-ipmi_lanp.c ./files/patch-lib-ipmi_lanp.c
--- /usr/ports/sysutils/ipmitool/files/patch-lib-ipmi_lanp.c Thu Jan 1 07:00:00 1970
+++ ./files/patch-lib-ipmi_lanp.c Sun May 8 21:45:12 2005
@@ -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 -ruN --exclude=CVS /usr/ports/sysutils/ipmitool/files/patch-src-ipmishell.c ./files/patch-src-ipmishell.c
--- /usr/ports/sysutils/ipmitool/files/patch-src-ipmishell.c Thu Jan 1 07:00:00 1970
+++ ./files/patch-src-ipmishell.c Sun May 8 21:50:43 2005
@@ -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
+ }
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505081511.j48FB0sw070052>