5 files changed, 108 insertions, 57 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 64bcfca11d57..738363733b2a 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	1.0.5
+PORTVERSION=	1.1.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
-		ftp://ftp.Awfulhak.org/pub/radius/
+		http://freeradius.portal-to-web.de/ \
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A free RADIUS server implementation
@@ -115,25 +115,40 @@ MAN5=		acct_users.5 clients.5 clients.conf.5 dictionary.5 naslist.5 \
 		radiusd.conf.5 rlm_acct_unique.5 rlm_always.5 \
 		rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \
 		rlm_detail.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \
-		rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_unix.5 users.5
-MAN8=		radiusd.8 radrelay.8 radwatch.8 rlm_ippool_tool.8
-
-DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 \
-		dictionary.acc dictionary.alcatel dictionary.alteon \
-		dictionary.altiga dictionary.aptis dictionary.ascend \
-		dictionary.bay dictionary.bristol dictionary.cisco \
-		dictionary.cisco.bbsm dictionary.cisco.vpn3000 \
-		dictionary.cisco.vpn5000 dictionary.colubris \
-		dictionary.columbia_university dictionary.compat \
-		dictionary.erx dictionary.foundry dictionary.freeradius \
-		dictionary.gandalf dictionary.garderos dictionary.gemtek \
-		dictionary.juniper dictionary.karlnet dictionary.livingston \
-		dictionary.localweb dictionary.merit dictionary.microsoft \
-		dictionary.mikrotik dictionary.navini dictionary.nomadix \
-		dictionary.propel dictionary.quintum dictionary.redback \
-		dictionary.shasta dictionary.shiva dictionary.sonicwall \
-		dictionary.trapeze dictionary.tunnel dictionary.unix \
-		dictionary.usr dictionary.valemount dictionary.versanet
+		rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 users.5
+MAN8=		radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 rlm_ippool_tool.8
+
+DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
+		dictionary.airespace dictionary.alcatel dictionary.alteon \
+		dictionary.altiga dictionary.aptis dictionary.aruba dictionary.ascend \
+		dictionary.avaya dictionary.bay dictionary.bintec dictionary.bristol \
+		dictionary.cablelabs dictionary.cabletron dictionary.cisco \
+		dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
+		dictionary.colubris dictionary.columbia_university dictionary.compat \
+		dictionary.cosine dictionary.digest dictionary.epygi \
+		dictionary.ericsson dictionary.erx dictionary.extreme \
+		dictionary.fortinet dictionary.foundry dictionary.freeradius \
+		dictionary.freeradius.internal dictionary.gandalf dictionary.garderos \
+		dictionary.gemtek dictionary.ipunplugged dictionary.issanni \
+		dictionary.itk dictionary.juniper dictionary.karlnet \
+		dictionary.livingston dictionary.localweb dictionary.lucent \
+		dictionary.merit dictionary.microsoft dictionary.mikrotik \
+		dictionary.motorola dictionary.navini dictionary.netscreen \
+		dictionary.nokia dictionary.nomadix dictionary.ntua \
+		dictionary.packeteer dictionary.propel dictionary.quintum \
+		dictionary.redback dictionary.redcreek dictionary.rfc2865 \
+		dictionary.rfc2866 dictionary.rfc2867 dictionary.rfc2868 \
+		dictionary.rfc2869 dictionary.rfc3162 dictionary.rfc3576 \
+		dictionary.rfc3580 dictionary.roaringpenguin dictionary.shasta \
+		dictionary.shiva dictionary.sonicwall dictionary.springtide \
+		dictionary.starent dictionary.t_systems_nova dictionary.telebit \
+		dictionary.trapeze dictionary.unix dictionary.usr dictionary.valemount \
+		dictionary.versanet dictionary.waverider dictionary.wispr \
+		dictionary.xedia dictionary.xylan dictionary.zyxel
+
+.if ${OSVERSION} < 500000
+BROKEN=		Does not compile
+.endif
 
 post-patch:
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 6c1cb19dc63d..89534fca7300 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,3 +1,2 @@
-MD5 (freeradius-1.0.5.tar.gz) = 00d06fc31e3b8279f6456d25401c81cb
-SHA256 (freeradius-1.0.5.tar.gz) = 4be430f8a73dd656cdbf15606992a49c12786570af51a7d204557b251353c47f
-SIZE (freeradius-1.0.5.tar.gz) = 2294225
+MD5 (freeradius-1.1.0.tar.gz) = e04ec8a07b8c8dc96e28ef7fdce261e7
+SIZE (freeradius-1.1.0.tar.gz) = 2351660
diff --git a/net/freeradius2/files/patch-raddb-Makefile b/net/freeradius2/files/patch-raddb-Makefile
index 408316428697..b8bf554bd14b 100644
--- a/net/freeradius2/files/patch-raddb-Makefile
+++ b/net/freeradius2/files/patch-raddb-Makefile
@@ -1,15 +1,6 @@
---- raddb/Makefile.orig	Thu Apr 14 21:31:54 2005
-+++ raddb/Makefile	Thu Apr 14 21:36:19 2005
-@@ -7,7 +7,7 @@
- 	  experimental.conf hints huntgroups ldap.attrmap \
- 	  mssql.conf naslist naspasswd oraclesql.conf postgresql.conf \
- 	  preproxy_users proxy.conf radiusd.conf realms snmp.conf \
--	  sql.conf users x99.conf x99passwd.sample
-+	  sql.conf users x99.conf
- 
- all:
- 
-@@ -15,26 +15,12 @@
+--- raddb/Makefile.orig	Wed Jan 25 13:01:45 2006
++++ raddb/Makefile	Wed Jan 25 13:22:54 2006
+@@ -15,26 +15,11 @@
  	$(INSTALL) -d -m 755	$(R)$(raddbdir)
  	@echo "Creating/updating files in $(R)$(raddbdir)"; \
  	for i in $(FILES); do \
@@ -35,7 +26,6 @@
 -	chmod 640 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf
 +		$(INSTALL) -m 644 $$i $(R)$(raddbdir)/$$i.sample; \
 +	done
-+	$(INSTALL) -m 644 x99passwd.sample $(R)$(raddbdir)
 +	chmod 640 $(R)$(raddbdir)/naspasswd.sample \
 +		$(R)$(raddbdir)/clients.sample \
 +		$(R)$(raddbdir)/clients.conf.sample
diff --git a/net/freeradius2/files/patch-src-modules-rlm_otp-otp-state.c b/net/freeradius2/files/patch-src-modules-rlm_otp-otp-state.c
new file mode 100644
index 000000000000..4bb9083cb16a
--- /dev/null
+++ b/net/freeradius2/files/patch-src-modules-rlm_otp-otp-state.c
@@ -0,0 +1,11 @@
+--- src/modules/rlm_otp/otp_state.c.orig	Wed Jan 25 13:35:45 2006
++++ src/modules/rlm_otp/otp_state.c	Wed Jan 25 15:02:47 2006
+@@ -35,7 +35,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <sys/socket.h>
+-#if defined(__linux__) || defined(__APPLE__)
++#if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(bsdi) || defined(__OpenBSD__)
+ #include <sys/un.h>
+ #endif
+ 
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index c57a81d2888d..f53d7e14eb11 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -3,6 +3,7 @@ bin/radclient
 bin/radeapclient
 bin/radlast
 bin/radrelay
+bin/radsqlrelay
 bin/radtest
 bin/radwho
 bin/radzap
@@ -34,7 +35,7 @@ etc/raddb/attrs.sample
 etc/raddb/clients.sample
 etc/raddb/clients.conf.sample
 etc/raddb/dictionary.sample
-%%EXPM%%etc/raddb/example.pl
+etc/raddb/example.pl
 etc/raddb/experimental.conf.sample
 etc/raddb/eap.conf.sample
 etc/raddb/hints.sample
@@ -44,6 +45,8 @@ etc/raddb/mssql.conf.sample
 etc/raddb/naslist.sample
 etc/raddb/naspasswd.sample
 etc/raddb/oraclesql.conf.sample
+etc/raddb/otp.conf.sample
+etc/raddb/otppasswd.sample.sample
 etc/raddb/postgresql.conf.sample
 etc/raddb/preproxy_users.sample
 etc/raddb/proxy.conf.sample
@@ -52,8 +55,6 @@ etc/raddb/realms.sample
 etc/raddb/snmp.conf.sample
 etc/raddb/sql.conf.sample
 etc/raddb/users.sample
-etc/raddb/x99.conf.sample
-etc/raddb/x99passwd.sample
 etc/rc.d/radiusd.sh
 lib/libeap-%%PORTVERSION%%.la
 lib/libeap-%%PORTVERSION%%.so
@@ -215,6 +216,11 @@ lib/rlm_ns_mta_md5-%%PORTVERSION%%.so
 lib/rlm_ns_mta_md5.a
 lib/rlm_ns_mta_md5.la
 lib/rlm_ns_mta_md5.so
+lib/rlm_otp-%%PORTVERSION%%.la
+lib/rlm_otp-%%PORTVERSION%%.so
+lib/rlm_otp.a
+lib/rlm_otp.la
+lib/rlm_otp.so
 lib/rlm_pam-%%PORTVERSION%%.la
 lib/rlm_pam-%%PORTVERSION%%.so
 lib/rlm_pam.a
@@ -230,11 +236,11 @@ lib/rlm_passwd-%%PORTVERSION%%.so
 lib/rlm_passwd.a
 lib/rlm_passwd.la
 lib/rlm_passwd.so
-%%EXPM%%lib/rlm_perl-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_perl-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_perl.a
-%%EXPM%%lib/rlm_perl.la
-%%EXPM%%lib/rlm_perl.so
+lib/rlm_perl-%%PORTVERSION%%.la
+lib/rlm_perl-%%PORTVERSION%%.so
+lib/rlm_perl.a
+lib/rlm_perl.la
+lib/rlm_perl.so
 lib/rlm_preprocess-%%PORTVERSION%%.la
 lib/rlm_preprocess-%%PORTVERSION%%.so
 lib/rlm_preprocess.a
@@ -270,11 +276,16 @@ lib/rlm_sql-%%PORTVERSION%%.so
 lib/rlm_sql.a
 lib/rlm_sql.la
 lib/rlm_sql.so
-%%EXPM%%lib/rlm_sqlcounter-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_sqlcounter-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_sqlcounter.a
-%%EXPM%%lib/rlm_sqlcounter.la
-%%EXPM%%lib/rlm_sqlcounter.so
+lib/rlm_sql_log-%%PORTVERSION%%.la
+lib/rlm_sql_log-%%PORTVERSION%%.so
+lib/rlm_sql_log.a
+lib/rlm_sql_log.la
+lib/rlm_sql_log.so
+lib/rlm_sqlcounter-%%PORTVERSION%%.la
+lib/rlm_sqlcounter-%%PORTVERSION%%.so
+lib/rlm_sqlcounter.a
+lib/rlm_sqlcounter.la
+lib/rlm_sqlcounter.so
 %%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.so
 %%MYSQL%%lib/rlm_sql_mysql.a
 %%MYSQL%%lib/rlm_sql_mysql.la
@@ -288,11 +299,6 @@ lib/rlm_unix-%%PORTVERSION%%.so
 lib/rlm_unix.a
 lib/rlm_unix.la
 lib/rlm_unix.so
-%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.la
-%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.so
-%%TOKEN%%lib/rlm_x99_token.a
-%%TOKEN%%lib/rlm_x99_token.la
-%%TOKEN%%lib/rlm_x99_token.so
 sbin/check-radiusd-config
 sbin/checkrad
 sbin/radiusd
@@ -321,6 +327,7 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/configurable_failover
 %%PORTDOCS%%%%DOCSDIR%%/duplicate-users
 %%PORTDOCS%%%%DOCSDIR%%/ldap_howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/load-balance.txt
 %%PORTDOCS%%%%DOCSDIR%%/misc-nas
 %%PORTDOCS%%%%DOCSDIR%%/module_interface
 %%PORTDOCS%%%%DOCSDIR%%/performance-testing
@@ -372,13 +379,13 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers
 %%PORTDOCS%%%%DOCSDIR%%/rlm_krb5
 %%PORTDOCS%%%%DOCSDIR%%/rlm_ldap
+%%PORTDOCS%%%%DOCSDIR%%/rlm_otp
 %%PORTDOCS%%%%DOCSDIR%%/rlm_pam
 %%PORTDOCS%%%%DOCSDIR%%/rlm_passwd
 %%PORTDOCS%%%%DOCSDIR%%/rlm_python
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sim_triplets
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sql
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
-%%PORTDOCS%%%%DOCSDIR%%/rlm_x99_token
 %%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning_guide
 %%PORTDOCS%%%%DOCSDIR%%/variables.txt
@@ -387,14 +394,18 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.3gpp
 %%DATADIR%%/dictionary.3gpp2
 %%DATADIR%%/dictionary.acc
+%%DATADIR%%/dictionary.airespace
 %%DATADIR%%/dictionary.alcatel
 %%DATADIR%%/dictionary.alteon
 %%DATADIR%%/dictionary.altiga
 %%DATADIR%%/dictionary.aptis
+%%DATADIR%%/dictionary.aruba
 %%DATADIR%%/dictionary.ascend
+%%DATADIR%%/dictionary.avaya
 %%DATADIR%%/dictionary.bay
 %%DATADIR%%/dictionary.bintec
 %%DATADIR%%/dictionary.bristol
+%%DATADIR%%/dictionary.cablelabs
 %%DATADIR%%/dictionary.cabletron
 %%DATADIR%%/dictionary.cisco
 %%DATADIR%%/dictionary.cisco.bbsm
@@ -403,42 +414,67 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.colubris
 %%DATADIR%%/dictionary.columbia_university
 %%DATADIR%%/dictionary.compat
+%%DATADIR%%/dictionary.cosine
+%%DATADIR%%/dictionary.digest
+%%DATADIR%%/dictionary.epygi
+%%DATADIR%%/dictionary.ericsson
 %%DATADIR%%/dictionary.erx
 %%DATADIR%%/dictionary.extreme
+%%DATADIR%%/dictionary.fortinet
 %%DATADIR%%/dictionary.foundry
 %%DATADIR%%/dictionary.freeradius
+%%DATADIR%%/dictionary.freeradius.internal
 %%DATADIR%%/dictionary.gandalf
 %%DATADIR%%/dictionary.garderos
 %%DATADIR%%/dictionary.gemtek
+%%DATADIR%%/dictionary.ipunplugged
+%%DATADIR%%/dictionary.issanni
 %%DATADIR%%/dictionary.itk
 %%DATADIR%%/dictionary.juniper
 %%DATADIR%%/dictionary.karlnet
 %%DATADIR%%/dictionary.livingston
 %%DATADIR%%/dictionary.localweb
+%%DATADIR%%/dictionary.lucent
 %%DATADIR%%/dictionary.merit
 %%DATADIR%%/dictionary.microsoft
 %%DATADIR%%/dictionary.mikrotik
+%%DATADIR%%/dictionary.motorola
 %%DATADIR%%/dictionary.navini
 %%DATADIR%%/dictionary.netscreen
 %%DATADIR%%/dictionary.nokia
 %%DATADIR%%/dictionary.nomadix
+%%DATADIR%%/dictionary.ntua
+%%DATADIR%%/dictionary.packeteer
 %%DATADIR%%/dictionary.propel
 %%DATADIR%%/dictionary.quintum
 %%DATADIR%%/dictionary.redback
 %%DATADIR%%/dictionary.redcreek
+%%DATADIR%%/dictionary.rfc2865
+%%DATADIR%%/dictionary.rfc2866
+%%DATADIR%%/dictionary.rfc2867
+%%DATADIR%%/dictionary.rfc2868
+%%DATADIR%%/dictionary.rfc2869
+%%DATADIR%%/dictionary.rfc3162
+%%DATADIR%%/dictionary.rfc3576
+%%DATADIR%%/dictionary.rfc3580
+%%DATADIR%%/dictionary.roaringpenguin
 %%DATADIR%%/dictionary.shasta
 %%DATADIR%%/dictionary.shiva
 %%DATADIR%%/dictionary.sonicwall
 %%DATADIR%%/dictionary.springtide
+%%DATADIR%%/dictionary.starent
+%%DATADIR%%/dictionary.t_systems_nova
 %%DATADIR%%/dictionary.telebit
 %%DATADIR%%/dictionary.trapeze
-%%DATADIR%%/dictionary.tunnel
 %%DATADIR%%/dictionary.unix
 %%DATADIR%%/dictionary.usr
 %%DATADIR%%/dictionary.valemount
 %%DATADIR%%/dictionary.versanet
+%%DATADIR%%/dictionary.waverider
 %%DATADIR%%/dictionary.wispr
 %%DATADIR%%/dictionary.xedia
+%%DATADIR%%/dictionary.xylan
+%%DATADIR%%/dictionary.zyxel
 %%MYSQL%%%%EXAMPLESDIR%%/db_mysql.sql
 %%PGSQL%%%%EXAMPLESDIR%%/db_postgresql.sql
 @dirrm %%DATADIR%%