4 files changed, 10 insertions, 39 deletions

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 3a8a98eb148b..c2fc03eb5ba1 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeradius
-DISTVERSION=	3.0.6
-PORTREVISION=	2
+DISTVERSION=	3.0.7
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
diff --git a/net/freeradius3/distinfo b/net/freeradius3/distinfo
index 7d9fa3ca2eae..70881f853bfc 100644
--- a/net/freeradius3/distinfo
+++ b/net/freeradius3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeradius-server-3.0.6.tar.bz2) = f9898b19564e7bf859396a9bdf492f72b918844b4916f1b46c56dfcd9e8dafcd
-SIZE (freeradius-server-3.0.6.tar.bz2) = 2870327
+SHA256 (freeradius-server-3.0.7.tar.bz2) = 56251904344db9379129879f1bb97ff68639d3c63948db9273c337b34a5d851a
+SIZE (freeradius-server-3.0.7.tar.bz2) = 2923352
diff --git a/net/freeradius3/files/patch-src__lib__event.c b/net/freeradius3/files/patch-src__lib__event.c
deleted file mode 100644
index 4901806c5d8e..000000000000
--- a/net/freeradius3/files/patch-src__lib__event.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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 */
- 	}
diff --git a/net/freeradius3/pkg-plist b/net/freeradius3/pkg-plist
index 3ae19e05c9a2..7e8d583232b1 100644
--- a/net/freeradius3/pkg-plist
+++ b/net/freeradius3/pkg-plist
@@ -12,6 +12,7 @@ bin/radsqlrelay
 bin/radtest
 bin/radwho
 bin/radzap
+bin/rbmonkey
 bin/rlm_ippool_tool
 bin/smbencrypt
 include/freeradius/attributes.h
@@ -244,6 +245,9 @@ include/freeradius/udpfromto.h
 %%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.a
 %%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.la
 %%SQLITE3%%%%LIBDIR%%/rlm_sql_sqlite.so
+%%LIBDIR%%/rlm_test.a
+%%LIBDIR%%/rlm_test.la
+%%LIBDIR%%/rlm_test.so
 %%LIBDIR%%/rlm_unix.a
 %%LIBDIR%%/rlm_unix.la
 %%LIBDIR%%/rlm_unix.so
@@ -780,6 +784,7 @@ sbin/radmin
 %%DATADIR%%/dictionary.packeteer
 %%DATADIR%%/dictionary.paloalto
 %%DATADIR%%/dictionary.patton
+%%DATADIR%%/dictionary.perle
 %%DATADIR%%/dictionary.propel
 %%DATADIR%%/dictionary.prosoft
 %%DATADIR%%/dictionary.proxim
@@ -821,6 +826,7 @@ sbin/radmin
 %%DATADIR%%/dictionary.riverstone
 %%DATADIR%%/dictionary.roaringpenguin
 %%DATADIR%%/dictionary.ruckus
+%%DATADIR%%/dictionary.ruggedcom
 %%DATADIR%%/dictionary.sg
 %%DATADIR%%/dictionary.shasta
 %%DATADIR%%/dictionary.shiva
@@ -838,6 +844,7 @@ sbin/radmin
 %%DATADIR%%/dictionary.telkom
 %%DATADIR%%/dictionary.terena
 %%DATADIR%%/dictionary.trapeze
+%%DATADIR%%/dictionary.travelping
 %%DATADIR%%/dictionary.tropos
 %%DATADIR%%/dictionary.ukerna
 %%DATADIR%%/dictionary.unix