Date: Fri, 4 Sep 2015 16:25:12 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396109 - in head/sysutils/openipmi: . files Message-ID: <201509041625.t84GPCHF038240@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: junovitch Date: Fri Sep 4 16:25:11 2015 New Revision: 396109 URL: https://svnweb.freebsd.org/changeset/ports/396109 Log: sysutils/openipmi: resolve build issues with 2.0.21 - Return EAGAIN errno instead of EKEYREJECTED to fix build with SSL option [1] - Prepend -I../include to CPPFLAGS to stop build breakage from old .h files [2] - While here, add LICENSE and regen one of the original patches (portlint) PR: 202002 [1] PR: 202528 [2] Submitted by: dennis.noordsij@helsinki.fi [1] Submitted by: Anton Sayetsky <vsasjason@gmail.com> [1] Submitted by: Larry Rosenman <ler@lerctr.org> [2] Approved by: feld (mentor) Differential Revision: https://reviews.freebsd.org/D3568 Added: head/sysutils/openipmi/files/patch-lib_rakp.c (contents, props changed) Modified: head/sysutils/openipmi/Makefile head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in Modified: head/sysutils/openipmi/Makefile ============================================================================== --- head/sysutils/openipmi/Makefile Fri Sep 4 16:14:10 2015 (r396108) +++ head/sysutils/openipmi/Makefile Fri Sep 4 16:25:11 2015 (r396109) @@ -10,6 +10,8 @@ DISTNAME= OpenIPMI-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Complex IPMI management software +LICENSE= GPLv2 + LIB_DEPENDS= libpopt.so:${PORTSDIR}/devel/popt GNU_CONFIGURE= yes @@ -17,7 +19,7 @@ INSTALL_TARGET= install-strip USES= execinfo gmake libtool pathfix pkgconfig USE_LDCONFIG= yes -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I../include -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= SSL SNMP PERL PYTHON TCL TKINTER GDBM Modified: head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in ============================================================================== --- head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in Fri Sep 4 16:14:10 2015 (r396108) +++ head/sysutils/openipmi/files/patch-OpenIPMIpthread.pc.in Fri Sep 4 16:25:11 2015 (r396109) @@ -1,6 +1,6 @@ ---- OpenIPMIpthread.pc.in.orig 2005-08-17 05:56:02.000000000 +0200 -+++ OpenIPMIpthread.pc.in 2013-02-28 09:55:49.000000000 +0100 -@@ -6,6 +6,6 @@ +--- OpenIPMIpthread.pc.in.orig 2012-07-21 22:01:45 UTC ++++ OpenIPMIpthread.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ Name: OpenIPMIpthread Description: Pthread OS handler for OpenIPMI Version: @VERSION@ Added: head/sysutils/openipmi/files/patch-lib_rakp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/openipmi/files/patch-lib_rakp.c Fri Sep 4 16:25:11 2015 (r396109) @@ -0,0 +1,11 @@ +--- lib/rakp.c.orig 2015-08-19 12:52:44 UTC ++++ lib/rakp.c +@@ -482,7 +482,7 @@ + return EINVAL; + HMAC(rinfo->evp_md, p, rinfo->key_len, idata, 58+idata[57], integ_data, &ilen); + if (memcmp(data+40, integ_data, rinfo->key_len) != 0) +- return EKEYREJECTED; ++ return EAGAIN; + + /* Now generate the SIK */ + p = ipmi_rmcpp_auth_get_my_rand(info->ainfo, &plen);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509041625.t84GPCHF038240>