From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 2 03:00:03 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 284351065673 for ; Tue, 2 Sep 2008 03:00:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id EEED88FC24 for ; Tue, 2 Sep 2008 03:00:02 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m823021i058194 for ; Tue, 2 Sep 2008 03:00:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m82302jR058193; Tue, 2 Sep 2008 03:00:02 GMT (envelope-from gnats) Resent-Date: Tue, 2 Sep 2008 03:00:02 GMT Resent-Message-Id: <200809020300.m82302jR058193@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Frolov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D067106564A for ; Tue, 2 Sep 2008 02:50:07 +0000 (UTC) (envelope-from frol@mercury.riss-telecom.ru) Received: from mercury.riss-telecom.ru (mercury.riss-telecom.ru [80.66.66.3]) by mx1.freebsd.org (Postfix) with ESMTP id 3FF388FC21 for ; Tue, 2 Sep 2008 02:50:02 +0000 (UTC) (envelope-from frol@mercury.riss-telecom.ru) Received: from mercury.riss-telecom.ru (localhost [127.0.0.1]) by mercury.riss-telecom.ru (8.13.8/8.13.8) with ESMTP id m822BVvd088289; Tue, 2 Sep 2008 09:11:31 +0700 (NOVST) (envelope-from frol@mercury.riss-telecom.ru) Received: (from frol@localhost) by mercury.riss-telecom.ru (8.13.8/8.13.8/Submit) id m822BU7N088288; Tue, 2 Sep 2008 09:11:30 +0700 (NOVST) (envelope-from frol) Message-Id: <200809020211.m822BU7N088288@mercury.riss-telecom.ru> Date: Tue, 2 Sep 2008 09:11:30 +0700 (NOVST) From: Dmitry Frolov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/127036: Update port: sysutils/ipmitool update to 1.8.10 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Dmitry Frolov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 02 Sep 2008 03:00:03 -0000 >Number: 127036 >Category: ports >Synopsis: Update port: sysutils/ipmitool update to 1.8.10 >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: Tue Sep 02 03:00:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dmitry Frolov >Release: FreeBSD 6.2-PRERELEASE amd64 >Organization: RISS-Telecom >Environment: System: FreeBSD *******.riss-telecom.ru 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #1: Mon Sep 25 18:02:20 NOVST 2006 root@*******.riss-telecom.ru:/usr/obj/usr/src/sys/MERCURY amd64 >Description: - Update to 1.8.10 - Respect NOPORTDOCS >How-To-Repeat: >Fix: diff -u -ruN /usr/ports/sysutils/ipmitool/Makefile ./Makefile --- /usr/ports/sysutils/ipmitool/Makefile Fri Aug 22 04:05:50 2008 +++ ./Makefile Tue Sep 2 09:06:35 2008 @@ -6,7 +6,7 @@ # PORTNAME= ipmitool -PORTVERSION= 1.8.9 +PORTVERSION= 1.8.10 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -47,19 +47,18 @@ .if defined(WITH_FREEIPMI) || \ (exists(${LOCALBASE}/include/freeipmi/freeipmi.h) && \ !defined(WITHOUT_FREEIPMI)) -# Support for FreeIPMI 0.4.x and 0.5.x API -EXTRA_PATCHES+= ${FILESDIR}/freeipmi-support.patch -USE_AUTOTOOLS+= autoconf:262 libtool:15 aclocal:19 automake:19 -# libtool15 installs it's aclocal macros into ${LOCALBASE}/share/aclocal -ACLOCAL_ARGS+= --acdir=${ACLOCAL_DIR} -I ${LOCALBASE}/share/aclocal -# Make automake quiet about missing NEWS and ChangeLog files -AUTOMAKE_ARGS+= --foreign LIB_DEPENDS+= freeipmi:${PORTSDIR}/sysutils/freeipmi CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --enable-intf-free .else CONFIGURE_ARGS+= --disable-intf-free +.endif + +.if defined(NOPORTDOCS) +EXTRA_PATCHES+= ${FILESDIR}/extra-noportdocs.patch +.else +PORTDOCS= * .endif .include diff -u -ruN /usr/ports/sysutils/ipmitool/distinfo ./distinfo --- /usr/ports/sysutils/ipmitool/distinfo Wed Jul 25 15:51:57 2007 +++ ./distinfo Sat Aug 9 10:49:24 2008 @@ -1,3 +1,3 @@ -MD5 (ipmitool-1.8.9.tar.bz2) = af3d63b17a22744fb77b8c0ceb104b72 -SHA256 (ipmitool-1.8.9.tar.bz2) = 174e9ebacc9a63a0758a196532d1d1bc9ba8a3cb150fd66fbc50c5bc746a4845 -SIZE (ipmitool-1.8.9.tar.bz2) = 513004 +MD5 (ipmitool-1.8.10.tar.bz2) = ead658c27b21192c8fb3376a63963203 +SHA256 (ipmitool-1.8.10.tar.bz2) = 01e9b622d0a04159fb4072a63cfc8b23bc01b5afd2972287b437aafd3e4df5c9 +SIZE (ipmitool-1.8.10.tar.bz2) = 566266 diff -u -ruN /usr/ports/sysutils/ipmitool/files/extra-noportdocs.patch ./files/extra-noportdocs.patch --- /usr/ports/sysutils/ipmitool/files/extra-noportdocs.patch Thu Jan 1 07:00:00 1970 +++ ./files/extra-noportdocs.patch Sun Aug 10 11:13:14 2008 @@ -0,0 +1,11 @@ +--- Makefile.in.orig Fri Aug 8 04:33:51 2008 ++++ Makefile.in Sun Aug 10 11:12:54 2008 +@@ -688,8 +688,6 @@ + cp control/ipmitool.spec $(distdir) + + install-data-local: +- mkdir -p $(DESTDIR)$(DOCDIR) +- $(INSTALL_DATA) $(DOCLIST) $(DESTDIR)$(DOCDIR) + + uninstall-local: + -rm -rf $(DESTDIR)$(DOCDIR) diff -u -ruN /usr/ports/sysutils/ipmitool/files/freeipmi-support.patch ./files/freeipmi-support.patch --- /usr/ports/sysutils/ipmitool/files/freeipmi-support.patch Sat Dec 15 23:50:35 2007 +++ ./files/freeipmi-support.patch Thu Jan 1 07:00:00 1970 @@ -1,189 +0,0 @@ -diff -u -ruN ../ipmitool-1.8.9/configure.in ./configure.in ---- ../ipmitool-1.8.9/configure.in Wed Mar 7 04:15:35 2007 -+++ ./configure.in Sat Dec 15 19:22:10 2007 -@@ -239,7 +239,7 @@ - fi - if test "x$enable_intf_free" = "xyes"; then - dnl Determine if you got the right FreeIPMI version -- AC_MSG_CHECKING([for good libfreeipmi version]) -+ AC_MSG_CHECKING([for libfreeipmi version 0.3.0]) - AC_TRY_COMPILE([ - #include /* For size_t */ - #include /* For NULL */ -@@ -253,13 +253,65 @@ - 0, - NULL, - 0); -- ], ac_free_version_good=yes,ac_free_version_good=no) -- AC_MSG_RESULT($ac_free_version_good) -- if test "x$ac_free_version_good" = "xyes"; then -+ ], ac_free_version_0_3_0=yes,ac_free_version_0_3_0=no) -+ AC_MSG_RESULT($ac_free_version_0_3_0) -+ AC_MSG_CHECKING([for libfreeipmi version 0.4.0]) -+ AC_TRY_COMPILE([ -+#include /* For size_t */ -+#include /* For NULL */ -+#include -+#include -+ ], [ -+ ipmi_device_t dev = NULL; -+ int rv; -+ dev = ipmi_device_create(); -+ rv = ipmi_open_inband(dev, -+ IPMI_DEVICE_KCS, -+ 0, -+ 0, -+ 0, -+ NULL, -+ 0); -+ ], ac_free_version_0_4_0=yes,ac_free_version_0_4_0=no) -+ AC_MSG_RESULT($ac_free_version_0_4_0) -+ -+ AC_MSG_CHECKING([for libfreeipmi version 0.5.0]) -+ AC_TRY_COMPILE([ -+#include /* For size_t */ -+#include /* For NULL */ -+#include -+#include -+ ], [ -+ ipmi_device_t dev = NULL; -+ int rv; -+ dev = ipmi_device_create(); -+ rv = ipmi_open_inband(dev, -+ IPMI_DEVICE_KCS, -+ 0, -+ 0, -+ 0, -+ NULL, -+ 0, -+ 0); -+ ], ac_free_version_0_5_0=yes,ac_free_version_0_5_0=no) -+ AC_MSG_RESULT($ac_free_version_0_5_0) -+ -+ if test "x$ac_free_version_0_3_0" = "xyes" \ -+ || test "x$ac_free_version_0_4_0" = "xyes" \ -+ || test "x$ac_free_version_0_5_0" = "xyes"; then - AC_DEFINE(IPMI_INTF_FREE, [1], [Define to 1 to enable FreeIPMI interface.]) - AC_SUBST(INTF_FREE, [free]) - AC_SUBST(INTF_FREE_LIB, [libintf_free.la]) - IPMITOOL_INTF_LIB="$IPMITOOL_INTF_LIB free/libintf_free.la" -+ if test "x$ac_free_version_0_3_0" = "xyes"; then -+ AC_DEFINE(IPMI_INTF_FREE_VERSION_0_3_0, [1], [Define to 1 for FreeIPMI 0.3.0.]) -+ fi -+ if test "x$ac_free_version_0_4_0" = "xyes"; then -+ AC_DEFINE(IPMI_INTF_FREE_VERSION_0_4_0, [1], [Define to 1 for FreeIPMI 0.4.0.]) -+ fi -+ if test "x$ac_free_version_0_5_0" = "xyes"; then -+ AC_DEFINE(IPMI_INTF_FREE_VERSION_0_5_0, [1], [Define to 1 for FreeIPMI 0.5.0.]) -+ fi - else - enable_intf_free=no - fi -diff -u -ruN ../ipmitool-1.8.9/src/plugins/free/free.c ./src/plugins/free/free.c ---- ../ipmitool-1.8.9/src/plugins/free/free.c Fri Feb 23 00:17:46 2007 -+++ ./src/plugins/free/free.c Sat Dec 15 19:22:10 2007 -@@ -58,6 +58,7 @@ - return -1; - } - -+#if IPMI_INTF_FREE_VERSION_0_3_0 - if (!(dev = ipmi_open_inband (IPMI_DEVICE_KCS, - 0, - 0, -@@ -74,19 +75,80 @@ - goto cleanup; - } - } -+#elif IPMI_INTF_FREE_VERSION_0_4_0 -+ if (!(dev = ipmi_device_create())) { -+ perror("ipmi_open_inband()"); -+ goto cleanup; -+ } -+ if (ipmi_open_inband (dev, -+ IPMI_DEVICE_KCS, -+ 0, -+ 0, -+ 0, -+ NULL, -+ IPMI_FLAGS_DEFAULT) < 0) { -+ if (ipmi_open_inband (dev, -+ IPMI_DEVICE_SSIF, -+ 0, -+ 0, -+ 0, -+ NULL, -+ IPMI_FLAGS_DEFAULT) < 0) { -+ fprintf(stderr, -+ "ipmi_open_inband(): %s\n", -+ ipmi_device_strerror(ipmi_device_errnum(dev))); -+ goto cleanup; -+ } -+ } -+#elif IPMI_INTF_FREE_VERSION_0_5_0 -+ if (!(dev = ipmi_device_create())) { -+ perror("ipmi_open_inband()"); -+ goto cleanup; -+ } -+ if (ipmi_open_inband (dev, -+ IPMI_DEVICE_KCS, -+ 0, -+ 0, -+ 0, -+ NULL, -+ 0, -+ IPMI_FLAGS_DEFAULT) < 0) { -+ if (ipmi_open_inband (dev, -+ IPMI_DEVICE_SSIF, -+ 0, -+ 0, -+ 0, -+ NULL, -+ 0, -+ IPMI_FLAGS_DEFAULT) < 0) { -+ fprintf(stderr, -+ "ipmi_open_inband(): %s\n", -+ ipmi_device_strerror(ipmi_device_errnum(dev))); -+ goto cleanup; -+ } -+ } -+#endif - - intf->opened = 1; - return 0; - cleanup: -- if (dev) -+ if (dev) { - ipmi_close_device(dev); -+#if IPMI_INTF_FREE_VERSION_0_4_0 -+ ipmi_device_destroy(dev); -+#endif -+ } - return -1; - } - - static void ipmi_free_close(struct ipmi_intf * intf) - { -- if (dev) -+ if (dev) { - ipmi_close_device(dev); -+#if IPMI_INTF_FREE_VERSION_0_4_0 -+ ipmi_device_destroy(dev); -+#endif -+ } - intf->opened = 0; - } - -@@ -132,7 +194,13 @@ - req->msg.data_len + 1, - rs_buf, - rs_buf_len)) < 0) { -+#if IPMI_INTF_FREE_VERSION_0_3_0 - perror("ipmi_cmd_raw"); -+#elif IPMI_INTF_FREE_VERSION_0_4_0 -+ fprintf(stderr, -+ "ipmi_cmd_raw: %s\n", -+ ipmi_device_strerror(ipmi_device_errnum(dev))); -+#endif - return NULL; - } - >Release-Note: >Audit-Trail: >Unformatted: