diff options
| -rw-r--r-- | sysutils/openipmi/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/openipmi/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/openipmi/files/patch-unix_selector.c | 26 |
3 files changed, 16 insertions, 18 deletions
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile index 75fed09801ea..9d3c35b389a1 100644 --- a/sysutils/openipmi/Makefile +++ b/sysutils/openipmi/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= openipmi -PORTVERSION= 2.0.28 +PORTVERSION= 2.0.29 CATEGORIES= sysutils MASTER_SITES= SF/${PORTNAME}/OpenIPMI%202.0%20Library DISTNAME= OpenIPMI-${PORTVERSION} diff --git a/sysutils/openipmi/distinfo b/sysutils/openipmi/distinfo index d22caad9266b..bba5f8f367b9 100644 --- a/sysutils/openipmi/distinfo +++ b/sysutils/openipmi/distinfo @@ -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 diff --git a/sysutils/openipmi/files/patch-unix_selector.c b/sysutils/openipmi/files/patch-unix_selector.c index 3e54a962f806..0e6cec37b7d6 100644 --- a/sysutils/openipmi/files/patch-unix_selector.c +++ b/sysutils/openipmi/files/patch-unix_selector.c @@ -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; |