From owner-svn-ports-all@FreeBSD.ORG Wed Jan 7 23:29:14 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 98196C0E; Wed, 7 Jan 2015 23:29:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6B07E9E; Wed, 7 Jan 2015 23:29:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t07NTEut077463; Wed, 7 Jan 2015 23:29:14 GMT (envelope-from zi@FreeBSD.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t07NTElX077460; Wed, 7 Jan 2015 23:29:14 GMT (envelope-from zi@FreeBSD.org) Message-Id: <201501072329.t07NTElX077460@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: zi set sender to zi@FreeBSD.org using -f From: Ryan Steinmetz Date: Wed, 7 Jan 2015 23:29:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r376505 - in head/net/freeradius3: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Jan 2015 23:29:14 -0000 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 */ + }