Date: Wed, 7 Jan 2015 23:29:14 +0000 (UTC) From: Ryan Steinmetz <zi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376505 - in head/net/freeradius3: . files Message-ID: <201501072329.t07NTElX077460@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zi Date: Wed Jan 7 23:29:13 2015 New Revision: 376505 URL: https://svnweb.freebsd.org/changeset/ports/376505 QAT: https://qat.redports.org/buildarchive/r376505/ Log: - Merge in upstream commit d9826c8d75b4798de1e559adb84c7cd66fc44297 to resolve kqueue issue. - Bump PORTREVISION PR: 196600 Submitted by: ncrogers@gmail.com Added: head/net/freeradius3/files/patch-src__lib__event.c (contents, props changed) Modified: head/net/freeradius3/Makefile Modified: head/net/freeradius3/Makefile ============================================================================== --- head/net/freeradius3/Makefile Wed Jan 7 22:44:04 2015 (r376504) +++ head/net/freeradius3/Makefile Wed Jan 7 23:29:13 2015 (r376505) @@ -3,6 +3,7 @@ PORTNAME= freeradius DISTVERSION= 3.0.6 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \ ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \ Added: head/net/freeradius3/files/patch-src__lib__event.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/freeradius3/files/patch-src__lib__event.c Wed Jan 7 23:29:13 2015 (r376505) @@ -0,0 +1,35 @@ +--- src/lib/event.c 2014-12-17 13:49:16.000000000 -0800 ++++ src/lib/event.c 2015-01-07 10:06:46.000000000 -0800 +@@ -630,9 +630,9 @@ + * Loop over all of the events, servicing them. + */ + for (i = 0; i < rcode; i++) { +- if (el->events[i].flags & EV_EOF) { +- fr_event_fd_t *ef = el->events[i].udata; ++ fr_event_fd_t *ef = el->events[i].udata; + ++ if (el->events[i].flags & EV_EOF) { + /* + * FIXME: delete the handler + * here, and fix process.c to not +@@ -646,14 +646,12 @@ + continue; + } + +- if (el->events[i].flags & EVFILT_READ) { +- fr_event_fd_t *ef = el->events[i].udata; +- +- ef->handler(el, ef->fd, ef->ctx); +- continue; +- } +- +- /* else it's an unhandled event, which shouldn't happen */ ++ /* ++ * Else it's our event. We only set ++ * EVFILT_READ, so it must be a read ++ * event. ++ */ ++ ef->handler(el, ef->fd, ef->ctx); + } + #endif /* HAVE_KQUEUE */ + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501072329.t07NTElX077460>