Index: head/sysutils/openipmi/Makefile =================================================================== --- head/sysutils/openipmi/Makefile (revision 553184) +++ head/sysutils/openipmi/Makefile (revision 553185) @@ -1,138 +1,138 @@ # Created by: Alex Deiter # $FreeBSD$ PORTNAME= openipmi -PORTVERSION= 2.0.28 +PORTVERSION= 2.0.29 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library DISTNAME= OpenIPMI-${PORTVERSION} MAINTAINER= egypcio@FreeBSD.org COMMENT= Complex IPMI management software LICENSE= GPLv2 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 OPTIONS_DEFINE= GDBM GLIB20 PERL PYTHON SNMP SSL TCL TKINTER TKINTER_IMPLIES= PYTHON SSL_DESC= IPMI 2.0 RMCP+ encryption and authentication SNMP_DESC= SNMP trap support for the sample programs PERL_DESC= Perl interface for OpenIPMI library PYTHON_DESC= Python interface for OpenIPMI library TCL_DESC= TCL interface for OpenIPMI library TKINTER_DESC= GUI for OpenIPMI, written in Python GDBM_DESC= Local SDR caching on startup GLIB20_DESC= Simply OS handler for glib 2.0 .include .if exists(${LOCALBASE}/lib/libgdbm.so.3) PORT_OPTIONS+= GDBM .endif .if ${PORT_OPTIONS:MSNMP} PORT_OPTIONS+= SSL LIB_DEPENDS+= libnetsnmp.so:net-mgmt/net-snmp CONFIGURE_ARGS+= --with-ucdsnmp=${LOCALBASE} .else CONFIGURE_ARGS+= --with-ucdsnmp=no .endif .if ${PORT_OPTIONS:MSSL} USES+= ssl CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE} .else CONFIGURE_ARGS+= --with-openssl=no .endif .if ${PORT_OPTIONS:MTKINTER} USES+= shebangfix SHEBANG_FILES= swig/python/openipmigui.py BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter@${PY_FLAVOR} \ ${LOCALBASE}/lib/Tix8.4.3/Tix.tcl:x11-toolkits/tix CONFIGURE_ARGS+= --with-tkinter PLIST_SUB+= TKINTER="" .else CONFIGURE_ARGS+= --with-tkinter=no PLIST_SUB+= TKINTER="@comment " .endif .if ${PORT_OPTIONS:MPERL} WITH_SWIG= yes USES+= perl5 CONFIGURE_ARGS+= --with-perl ac_cv_path_perlprog=${PERL} LDFLAGS+= -L${SITE_ARCH} LIBS+= -L${SITE_ARCH} PLIST_SUB+= OIPMIPERL="" EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-swig_perl_Makefile.in .else CONFIGURE_ARGS+= --with-perl=no PLIST_SUB+= OIPMIPERL="@comment " .endif .if ${PORT_OPTIONS:MPYTHON} USES+= python USE_PYTHON= py3kplist CONFIGURE_ARGS+= --with-python --with-swig CONFIGURE_ENV+= ac_cv_path_pythonprog=${PYTHON_CMD} BUILD_DEPENDS+= swig:devel/swig PLIST_SUB+= OIPMIPYTHON="" .else CONFIGURE_ARGS+= --with-python=no --with-swig=no PLIST_SUB+= OIPMIPYTHON="@comment " .endif .if ${PORT_OPTIONS:MTCL} USES+= tcl CONFIGURE_ARGS+= --with-tcl \ --with-tclcflags=-I${TCL_INCLUDEDIR} \ --with-tcllibs=-ltcl${TCL_SHLIB_VER} PLIST_SUB+= TCL="" .else CONFIGURE_ARGS+= --with-tcl=no PLIST_SUB+= TCL="@comment " .endif .if ${PORT_OPTIONS:MGDBM} LIB_DEPENDS+= libgdbm.so:databases/gdbm .endif .if ${PORT_OPTIONS:MGLIB20} USES+= gnome USE_GNOME+= glib20 CONFIGURE_ARGS+= --with-glib --with-glibver=2.0 PLIST_SUB+= GLIB="" .else PLIST_SUB+= GLIB="@comment " .endif post-patch: ${REINPLACE_CMD} '/libOpenIPMIutils_la_LIBADD =/s/$$/ -lexecinfo/' \ ${WRKSRC}/utils/Makefile.in ${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||' \ ${WRKSRC}/lanserv/Makefile.in ${REINPLACE_CMD} 's|editline/readline.h|edit/readline/readline.h|' \ ${WRKSRC}/sample/ipmi_serial_bmc_emu.c do-install-PYTHON-on: @${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} && \ ${PYTHON_CMD} -O -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR} .include Index: head/sysutils/openipmi/distinfo =================================================================== --- head/sysutils/openipmi/distinfo (revision 553184) +++ head/sysutils/openipmi/distinfo (revision 553185) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578057982 -SHA256 (OpenIPMI-2.0.28.tar.gz) = 8e8b1de2a9a041b419133ecb21f956e999841cf2e759e973eeba9a36f8b40996 -SIZE (OpenIPMI-2.0.28.tar.gz) = 3118911 +TIMESTAMP = 1603534455 +SHA256 (OpenIPMI-2.0.29.tar.gz) = 2244124579afb14e569f34393e9ac61e658a28b6ffa8e5c0d2c1c12a8ce695cd +SIZE (OpenIPMI-2.0.29.tar.gz) = 3119530 Index: head/sysutils/openipmi/files/patch-unix_selector.c =================================================================== --- head/sysutils/openipmi/files/patch-unix_selector.c (revision 553184) +++ head/sysutils/openipmi/files/patch-unix_selector.c (revision 553185) @@ -1,16 +1,14 @@ ---- unix/selector.c.orig 2018-12-28 13:36:00 UTC +--- unix/selector.c.orig 2020-10-24 10:59:38 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; +@@ -1030,7 +1030,10 @@ process_fds(struct selector_s *sel, + &tmp_except_set, + &ts, &sigmask); + if (err < 0) { +- if (errno == EBADF || errno == EBADFD) ++ /* We do not have EBADFD, as it is Solaris and Linux specific; ++ * if (errno == EBADF || errno == EBADFD) + */ - } - - init_fd(fdc); ++ if (errno == EBADF) + /* We raced, just retry it. */ + goto retry; + goto out;