diff options
author | VinÃcius Zavam <egypcio@FreeBSD.org> | 2019-01-05 13:47:15 +0000 |
---|---|---|
committer | VinÃcius Zavam <egypcio@FreeBSD.org> | 2019-01-05 13:47:15 +0000 |
commit | 670b63692fae0e99ce787cc68f9ef75f0791efbe (patch) | |
tree | e33271e9e6bd1fdcb679072bb655e889030c2657 /sysutils/openipmi | |
parent | 250a74b0ba3528170adef8d0f239c6de9b74a69d (diff) | |
download | ports-670b63692fae0e99ce787cc68f9ef75f0791efbe.tar.gz ports-670b63692fae0e99ce787cc68f9ef75f0791efbe.zip |
sysutils/openipmi: update 2.0.25_1 to 2.0.26
Makefile
silent portlint; reorder GNU_CONFIGURE and INSTALL_TARGET;
readline.so (devel/readline) is now part of LIB_DEPENDS;
USES got readline added to the list; sorted.
post-patch
13.10. Verbose Build Logs;
reinplaced editline/readline.h (served by base's libedit).
files/patch-unix_selector.c
we do not provide EPOLL_PWAIT, so fdc->saved_events = 0 is never used.
Approved by: araujo (mentor)
Differential Revision: https://reviews.freebsd.org/D18667
Notes
Notes:
svn path=/head/; revision=489336
Diffstat (limited to 'sysutils/openipmi')
-rw-r--r-- | sysutils/openipmi/Makefile | 17 | ||||
-rw-r--r-- | sysutils/openipmi/distinfo | 6 | ||||
-rw-r--r-- | sysutils/openipmi/files/patch-unix_selector.c | 16 |
3 files changed, 29 insertions, 10 deletions
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile index 76137ee13866..88acbded2f36 100644 --- a/sysutils/openipmi/Makefile +++ b/sysutils/openipmi/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openipmi -PORTVERSION= 2.0.25 -PORTREVISION= 1 +PORTVERSION= 2.0.26 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library DISTNAME= OpenIPMI-${PORTVERSION} @@ -16,10 +15,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libpopt.so:devel/popt +USES= gmake libtool localbase:ldflags ncurses pathfix \ + pkgconfig readline +USE_LDCONFIG= yes + GNU_CONFIGURE= yes INSTALL_TARGET= install-strip -USES= gmake libtool ncurses pathfix pkgconfig localbase:ldflags -USE_LDCONFIG= yes OPTIONS_DEFINE= SSL SNMP PERL PYTHON TCL TKINTER GDBM OPTIONS_RADIO= GLIB @@ -127,16 +128,18 @@ PLIST_SUB+= GLIB="@comment " .endif post-patch: - @${REINPLACE_CMD} '/libOpenIPMIutils_la_LIBADD =/s/$$/ -lexecinfo/' \ + ${REINPLACE_CMD} '/libOpenIPMIutils_la_LIBADD =/s/$$/ -lexecinfo/' \ ${WRKSRC}/utils/Makefile.in - @${REINPLACE_CMD} 's|malloc.h|stdlib.h|' \ + ${REINPLACE_CMD} 's|malloc.h|stdlib.h|' \ ${WRKSRC}/lanserv/sdrcomp/sdrcomp.c \ ${WRKSRC}/lanserv/extcmd.c \ ${WRKSRC}/lanserv/bmc_app.c \ ${WRKSRC}/lanserv/bmc_storage.c \ ${WRKSRC}/lanserv/bmc_picmg.c \ ${WRKSRC}/lanserv/bmc_sensor.c - @${REINPLACE_CMD} 's|-ldl||' \ + ${REINPLACE_CMD} 's|-ldl||' \ ${WRKSRC}/lanserv/Makefile.in + ${REINPLACE_CMD} 's|editline/readline.h|edit/readline/readline.h|' \ + ${WRKSRC}/sample/ipmi_serial_bmc_emu.c .include <bsd.port.mk> diff --git a/sysutils/openipmi/distinfo b/sysutils/openipmi/distinfo index c7e184caa98d..b958cce57f91 100644 --- a/sysutils/openipmi/distinfo +++ b/sysutils/openipmi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1532529450 -SHA256 (OpenIPMI-2.0.25.tar.gz) = f0f1a0ec732409930b7a31a6daa6cf39b585f52059b62a5f092b7ece21aa75a5 -SIZE (OpenIPMI-2.0.25.tar.gz) = 3212723 +TIMESTAMP = 1545989050 +SHA256 (OpenIPMI-2.0.26.tar.gz) = 83986368c30a1158303435ad5a2b1bd3c6a39664b46d10fc0b8f9d2a78e2f524 +SIZE (OpenIPMI-2.0.26.tar.gz) = 3124706 diff --git a/sysutils/openipmi/files/patch-unix_selector.c b/sysutils/openipmi/files/patch-unix_selector.c new file mode 100644 index 000000000000..3e54a962f806 --- /dev/null +++ b/sysutils/openipmi/files/patch-unix_selector.c @@ -0,0 +1,16 @@ +--- unix/selector.c.orig 2018-12-28 13:36:00 UTC ++++ unix/selector.c +@@ -459,7 +459,13 @@ i_sel_clear_fd_handler(struct selector_s + fdc->state = NULL; + + sel_update_epoll(sel, fd, EPOLL_CTL_DEL, 0); ++ /* We do not set HAVE_EPOLL_PWAIT, so 'fd_control_s' will never ++ * have 'saved_events', and sel_update_epoll() will always return 1. ++ * ++ * See lines 340 (HAVE_EPOLL_PWAIT), and 369 (no HAVE_EPOLL_PWAIT). ++ * + fdc->saved_events = 0; ++ */ + } + + init_fd(fdc); |