Update to 2.1.1

Patches mainly from adam@ with some changes by me

05 September 2008 - Version 2.1.0 has been released.

The focus of this release is features.

Feature Improvements
* Clients may now be defined dynamically, based on IP address. See raddb/sites-available/dynamic-clients.
* SNMP support is now available through an experimental Perl script. See scripts/snmp-proxy/README
* SNMP statistics are also available through Status-Server packets. See raddb/sites-available/status
* Added more Microsoft attributes from bug #568.
* The linelog module has more functionality and flexibility. See raddb/modules/linelog.
* The debugging output has been sanitized. It should be much more readable.
* Debug logs can now be turned on/off while the server is running, for a user, group, realm, etc. See the log section of raddb/radiusd.conf.
* Added support for WiMAX Forum attributes. The dynamic keys are not yet calculated. See share/dictionary.wimax
* Added session resumption for PEAP and TTLS. See raddb/eap.conf, and the cache sub-section.
* Added radmin command-line tool for administering a running server. See man radmin and raddb/sites-available/control-socket.

Bug Fixes
* Double escaping of '\\' in the users (and some other) files has been fixed. If you have '\\' in the users file, your configuration will need to be checked, and fixed!
* Parse security section of radiusd.conf. This was accidentally deleted in 2.0.5. Closes bug #566.
* Bind to interface before IP, which allows DHCP sockets to listen on "*" for multiple interfaces.
* Fix handling of giaddr in DHCP responses.
* Corrected parsing of status_check in home_server so that it works.
* Fix hints so that "Puser" works again.
* Removed length restrictions on attribute names in the dictionaries.
* Update socket code to avoid C compiler optimizations.

25 September 2008 - Version 2.1.1 has been released.

The focus of this release is stability.

Feature Improvements
* Many more options and features are available via radmin. See man radmin and raddb/sites-available/control-socket.
* Many more commands available via the control socket. Connect via radmin, and type help for more information.
* Added dictionary.networkphysics and dictionary.lancom.
* Calculate WiMAX MIP keys, and added sample WiMAX SQL tables.

Bug Fixes
* Fixed bug that made radmin not work.
* Fixed Suse && Debian package scripts.
* Fixed issues with dynamic clients.
* Fixed configure checks for -lreadline
* rlm_sqlippool no longer needs to be linked to rlm_sql.
* Add statistics for detail file listeners. This closes bug #593.
* Fixed printing of some WiMAX attributes.
* Fixed double free on exit() in rlm_attr_filter.
* Fixed build issues on Solaris.
* Fixed fast session resumption for EAP-TLS.

8 files changed, 164 insertions, 126 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index abf9d28ce41..fc59c7144d5 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/06/20 20:57:39 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2008/10/12 13:57:27 adrianp Exp $
 
 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
@@ -22,13 +22,13 @@ USE_OLD_DES_API=	YES
 
 BUILD_DEFS=		VARBASE
 PLIST_SRC=		${WRKDIR}/.PLIST_SRC
-FILES_SUBST+=		RADIUS_USER=${RADIUS_USER:Q}
-FILES_SUBST+=		RADIUS_GROUP=${RADIUS_GROUP:Q}
+FILES_SUBST+=		RADIUS_USER=${RADIUS_USER}
+FILES_SUBST+=		RADIUS_GROUP=${RADIUS_GROUP}
 PLIST_SUBST+=		RADVER=${RADVER}
 MESSAGE_SRC+=		${WRKDIR}/.MESSAGE_SRC
 MESSAGE_SUBST+=		CHOWN=${CHOWN:Q} CHMOD=${CHMOD:Q} VARBASE=${VARBASE}
-MESSAGE_SUBST+=		RADIUS_USER=${RADIUS_USER:Q} XARGS=${XARGS:Q}
-MESSAGE_SUBST+=		RADIUS_GROUP=${RADIUS_GROUP:Q} FIND=${FIND:Q}
+MESSAGE_SUBST+=		RADIUS_USER=${RADIUS_USER} XARGS=${XARGS:Q}
+MESSAGE_SUBST+=		RADIUS_GROUP=${RADIUS_GROUP} FIND=${FIND:Q}
 
 PKG_SYSCONFSUBDIR=	raddb
 RCD_SCRIPTS=		radiusd
@@ -45,14 +45,14 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd/radacct \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 
-RADVER=			2.0.5
+RADVER=			2.1.1
 EGDIR=			${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log/radiusd
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--disable-ltdl-install
 CONFIGURE_ARGS+=	--with-ltdl-lib=${PREFIX}/lib
 CONFIGURE_ARGS+=	--with-ltdl-include=${PREFIX}/include
@@ -102,7 +102,7 @@ EGFILES=	certs/demoCA/cacert.pem certs/bootstrap certs/xpextensions \
 		sql/postgresql/counter.conf sql/postgresql/admin.sql \
 		sql/postgresql/update_radacct_group_trigger.sql policy.txt \
 		experimental.conf radiusd.conf otp.conf policy.conf \
-		preproxy_users users vmpsd.conf.in acct_users snmp.conf \
+		preproxy_users users vmpsd.conf.in acct_users \
 		ldap.attrmap clients.conf huntgroups sql.conf sqlippool.conf \
 		sites-available/inner-tunnel sites-available/example \
 		sites-available/buffered-sql sites-available/default \
@@ -150,7 +150,7 @@ post-build:
 	${CP} ${PKGDIR:Q}/MESSAGE ${WRKDIR:Q}/.MESSAGE_SRC
 
 .	if !empty(PKG_OPTIONS:Mpam)
-		${CP} ${PKGDIR:Q}/MESSAGE.pam ${WRKDIR:Q}/.MESSAGE_SRC.pam
+		${CP} ${PKGDIR}/MESSAGE.pam ${WRKDIR}/.MESSAGE_SRC.pam
 .	endif
 
 post-install:
diff --git a/net/freeradius2/PLIST b/net/freeradius2/PLIST
index 9071a198cec..b39dc482362 100644
--- a/net/freeradius2/PLIST
+++ b/net/freeradius2/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/10/12 13:57:27 adrianp Exp $
 bin/radclient
+bin/radconf2xml
 bin/radeapclient
 bin/radlast
 bin/radsniff
@@ -21,8 +22,14 @@ include/freeradius/sha1.h
 include/freeradius/token.h
 include/freeradius/udpfromto.h
 include/freeradius/vqp.h
+lib/libfreeradius-eap-${RADVER}.la
+lib/libfreeradius-eap.la
+lib/libfreeradius-radius-${RADVER}.la
+lib/libfreeradius-radius.la
 lib/rlm_acct_unique-${RADVER}.la
 lib/rlm_acct_unique.la
+lib/rlm_acctlog-${RADVER}.la
+lib/rlm_acctlog.la
 lib/rlm_always-${RADVER}.la
 lib/rlm_always.la
 lib/rlm_attr_filter-${RADVER}.la
@@ -33,10 +40,14 @@ lib/rlm_chap-${RADVER}.la
 lib/rlm_chap.la
 lib/rlm_checkval-${RADVER}.la
 lib/rlm_checkval.la
+lib/rlm_copy_packet-${RADVER}.la
+lib/rlm_copy_packet.la
 lib/rlm_detail-${RADVER}.la
 lib/rlm_detail.la
 lib/rlm_digest-${RADVER}.la
 lib/rlm_digest.la
+lib/rlm_dynamic_clients-${RADVER}.la
+lib/rlm_dynamic_clients.la
 lib/rlm_eap-${RADVER}.la
 lib/rlm_eap.la
 lib/rlm_eap_gtc-${RADVER}.la
@@ -57,12 +68,18 @@ lib/rlm_eap_ttls-${RADVER}.la
 lib/rlm_eap_ttls.la
 lib/rlm_exec-${RADVER}.la
 lib/rlm_exec.la
+lib/rlm_expiration-${RADVER}.la
+lib/rlm_expiration.la
 lib/rlm_expr-${RADVER}.la
 lib/rlm_expr.la
 lib/rlm_fastusers-${RADVER}.la
 lib/rlm_fastusers.la
 lib/rlm_files-${RADVER}.la
 lib/rlm_files.la
+lib/rlm_linelog-${RADVER}.la
+lib/rlm_linelog.la
+lib/rlm_logintime-${RADVER}.la
+lib/rlm_logintime.la
 lib/rlm_mschap-${RADVER}.la
 lib/rlm_mschap.la
 lib/rlm_otp-${RADVER}.la
@@ -71,6 +88,8 @@ lib/rlm_pap-${RADVER}.la
 lib/rlm_pap.la
 lib/rlm_passwd-${RADVER}.la
 lib/rlm_passwd.la
+lib/rlm_policy-${RADVER}.la
+lib/rlm_policy.la
 lib/rlm_preprocess-${RADVER}.la
 lib/rlm_preprocess.la
 lib/rlm_radutmp-${RADVER}.la
@@ -87,20 +106,6 @@ lib/rlm_sqlippool-${RADVER}.la
 lib/rlm_sqlippool.la
 lib/rlm_unix-${RADVER}.la
 lib/rlm_unix.la
-lib/libfreeradius-eap-${RADVER}.la
-lib/libfreeradius-eap.la
-lib/libfreeradius-radius-${RADVER}.la
-lib/libfreeradius-radius.la
-lib/rlm_acctlog-${RADVER}.la
-lib/rlm_acctlog.la
-lib/rlm_copy_packet-${RADVER}.la
-lib/rlm_copy_packet.la
-lib/rlm_expiration-${RADVER}.la
-lib/rlm_expiration.la
-lib/rlm_logintime-${RADVER}.la
-lib/rlm_logintime.la
-lib/rlm_policy-${RADVER}.la
-lib/rlm_policy.la
 man/man1/radclient.1
 man/man1/radeapclient.1
 man/man1/radlast.1
@@ -111,6 +116,7 @@ man/man5/acct_users.5
 man/man5/clients.conf.5
 man/man5/dictionary.5
 man/man5/radiusd.conf.5
+man/man5/radrelay.conf.5
 man/man5/rlm_acct_unique.5
 man/man5/rlm_always.5
 man/man5/rlm_attr_filter.5
@@ -118,43 +124,41 @@ man/man5/rlm_attr_rewrite.5
 man/man5/rlm_chap.5
 man/man5/rlm_counter.5
 man/man5/rlm_detail.5
+man/man5/rlm_digest.5
 man/man5/rlm_expr.5
 man/man5/rlm_files.5
 man/man5/rlm_mschap.5
 man/man5/rlm_pap.5
 man/man5/rlm_passwd.5
+man/man5/rlm_policy.5
 man/man5/rlm_realm.5
 man/man5/rlm_sql.5
 man/man5/rlm_sql_log.5
 man/man5/rlm_unix.5
-man/man5/radrelay.conf.5
-man/man5/rlm_digest.5
-man/man5/rlm_policy.5
 man/man5/unlang.5
 man/man5/users.5
 man/man8/radiusd.8
+man/man8/radmin.8
 man/man8/radrelay.8
 man/man8/radsqlrelay.8
 man/man8/radwatch.8
 sbin/checkrad
 sbin/radiusd
+sbin/radmin
 sbin/radwatch
 sbin/rc.radiusd
 share/doc/freeradius/Acct-Type
+share/doc/freeradius/Autz-Type
 share/doc/freeradius/CYGWIN
 share/doc/freeradius/ChangeLog
-share/doc/freeradius/Post-Auth-Type
-share/doc/freeradius/Session-Type
-share/doc/freeradius/ldap_howto.txt
-share/doc/freeradius/misc-nas
-share/doc/freeradius/release-method.txt
-share/doc/freeradius/Autz-Type
 share/doc/freeradius/DIFFS
 share/doc/freeradius/MACOSX
 share/doc/freeradius/OS2
-share/doc/freeradius/RADIUS-SQL.schema
+share/doc/freeradius/Post-Auth-Type
 share/doc/freeradius/RADIUS-LDAP-eDirectory
+share/doc/freeradius/RADIUS-SQL.schema
 share/doc/freeradius/README
+share/doc/freeradius/Session-Type
 share/doc/freeradius/Simultaneous-Use
 share/doc/freeradius/aaa.txt
 share/doc/freeradius/ascend
@@ -167,12 +171,15 @@ share/doc/freeradius/examples/iplanet.ldif
 share/doc/freeradius/examples/iplanet.schema
 share/doc/freeradius/examples/openldap.schema
 share/doc/freeradius/examples/postgresql_update_radacct_group_trigger.sql
+share/doc/freeradius/ldap_howto.txt
 share/doc/freeradius/load-balance.txt
+share/doc/freeradius/misc-nas
 share/doc/freeradius/module_interface
 share/doc/freeradius/mssql
 share/doc/freeradius/performance-testing
 share/doc/freeradius/processing_users_file
 share/doc/freeradius/proxy
+share/doc/freeradius/release-method.txt
 share/doc/freeradius/rfc/attributes.html
 share/doc/freeradius/rfc/draft-kamath-pppext-eap-mschapv2-00.txt
 share/doc/freeradius/rfc/draft-sterman-aaa-sip-00.txt
@@ -184,9 +191,11 @@ share/doc/freeradius/rfc/rfc1448.txt
 share/doc/freeradius/rfc/rfc1901.txt
 share/doc/freeradius/rfc/rfc1905.txt
 share/doc/freeradius/rfc/rfc2243.txt
+share/doc/freeradius/rfc/rfc2284.txt
 share/doc/freeradius/rfc/rfc2289.txt
 share/doc/freeradius/rfc/rfc2433.txt
 share/doc/freeradius/rfc/rfc2548.txt
+share/doc/freeradius/rfc/rfc2607.txt
 share/doc/freeradius/rfc/rfc2618.txt
 share/doc/freeradius/rfc/rfc2619.txt
 share/doc/freeradius/rfc/rfc2620.txt
@@ -206,9 +215,28 @@ share/doc/freeradius/rfc/rfc3575.txt
 share/doc/freeradius/rfc/rfc3576.txt
 share/doc/freeradius/rfc/rfc3579.txt
 share/doc/freeradius/rfc/rfc3580.txt
+share/doc/freeradius/rfc/rfc3748.txt
+share/doc/freeradius/rfc/rfc4372.txt
+share/doc/freeradius/rfc/rfc4590.txt
+share/doc/freeradius/rfc/rfc4668.txt
+share/doc/freeradius/rfc/rfc4669.txt
+share/doc/freeradius/rfc/rfc4670.txt
+share/doc/freeradius/rfc/rfc4671.txt
+share/doc/freeradius/rfc/rfc4672.txt
+share/doc/freeradius/rfc/rfc4673.txt
+share/doc/freeradius/rfc/rfc4675.txt
+share/doc/freeradius/rfc/rfc4679.txt
+share/doc/freeradius/rfc/rfc4818.txt
+share/doc/freeradius/rfc/rfc4849.txt
+share/doc/freeradius/rfc/rfc5080.txt
+share/doc/freeradius/rfc/rfc5090.txt
+share/doc/freeradius/rfc/rfc5176.txt
+share/doc/freeradius/rfc/rfc5247.txt
 share/doc/freeradius/rlm_dbm
 share/doc/freeradius/rlm_eap
+share/doc/freeradius/rlm_expiration
 share/doc/freeradius/rlm_fastusers
+share/doc/freeradius/rlm_jradius
 share/doc/freeradius/rlm_krb5
 share/doc/freeradius/rlm_ldap
 share/doc/freeradius/rlm_pam
@@ -218,26 +246,22 @@ share/doc/freeradius/rlm_sim_triplets
 share/doc/freeradius/rlm_sql
 share/doc/freeradius/rlm_sqlcounter
 share/doc/freeradius/rlm_sqlippool
+share/doc/freeradius/snmp
 share/doc/freeradius/supervise-radiusd.txt
 share/doc/freeradius/tuning_guide
 share/doc/freeradius/variables.txt
-share/doc/freeradius/rfc/rfc2607.txt
-share/doc/freeradius/rfc/rfc3748.txt
-share/doc/freeradius/rfc/rfc4372.txt
-share/doc/freeradius/rfc/rfc4590.txt
-share/doc/freeradius/rfc/rfc4675.txt
-share/doc/freeradius/rfc/rfc4679.txt
-share/doc/freeradius/rfc/rfc4818.txt
-share/doc/freeradius/rfc/rfc4849.txt
-share/doc/freeradius/rfc/rfc5080.txt
-share/doc/freeradius/rfc/rfc5176.txt
-share/doc/freeradius/rlm_expiration
-share/doc/freeradius/rlm_jradius
-share/doc/freeradius/snmp
 share/examples/freeradius/acct_users
 share/examples/freeradius/attrs
+share/examples/freeradius/attrs.access_reject
+share/examples/freeradius/attrs.accounting_response
+share/examples/freeradius/attrs.pre-proxy
 share/examples/freeradius/certs/README
+share/examples/freeradius/certs/bootstrap
+share/examples/freeradius/certs/ca.cnf
+share/examples/freeradius/certs/client.cnf
 share/examples/freeradius/certs/demoCA/cacert.pem
+share/examples/freeradius/certs/server.cnf
+share/examples/freeradius/certs/xpextensions
 share/examples/freeradius/clients.conf
 share/examples/freeradius/dictionary
 share/examples/freeradius/eap.conf
@@ -247,16 +271,11 @@ share/examples/freeradius/hints
 share/examples/freeradius/huntgroups
 share/examples/freeradius/ldap.attrmap
 share/examples/freeradius/otp.conf
+share/examples/freeradius/policy.conf
+share/examples/freeradius/policy.txt
 share/examples/freeradius/preproxy_users
 share/examples/freeradius/proxy.conf
 share/examples/freeradius/radiusd.conf
-share/examples/freeradius/snmp.conf
-share/examples/freeradius/sql.conf
-share/examples/freeradius/sqlippool.conf
-share/examples/freeradius/users
-share/examples/freeradius/attrs.access_reject
-share/examples/freeradius/attrs.accounting_response
-share/examples/freeradius/attrs.pre-proxy
 share/examples/freeradius/sites-available/README
 share/examples/freeradius/sites-available/buffered-sql
 share/examples/freeradius/sites-available/copy-acct-to-home-server
@@ -268,15 +287,7 @@ share/examples/freeradius/sites-available/proxy-inner-tunnel
 share/examples/freeradius/sites-available/robust-proxy-accounting
 share/examples/freeradius/sites-available/virtual.example.com
 share/examples/freeradius/sites-available/vmps
-share/examples/freeradius/templates.conf
-share/examples/freeradius/vmpsd.conf.in
-share/examples/freeradius/certs/bootstrap
-share/examples/freeradius/certs/ca.cnf
-share/examples/freeradius/certs/client.cnf
-share/examples/freeradius/certs/server.cnf
-share/examples/freeradius/certs/xpextensions
-share/examples/freeradius/policy.conf
-share/examples/freeradius/policy.txt
+share/examples/freeradius/sql.conf
 share/examples/freeradius/sql/mssql/dialup.conf
 share/examples/freeradius/sql/mssql/schema.sql
 share/examples/freeradius/sql/mysql/admin.sql
@@ -300,6 +311,10 @@ share/examples/freeradius/sql/postgresql/nas.sql
 share/examples/freeradius/sql/postgresql/schema.sql
 share/examples/freeradius/sql/postgresql/update_radacct_group_trigger.sql
 share/examples/freeradius/sql/postgresql/voip-postpaid.conf
+share/examples/freeradius/sqlippool.conf
+share/examples/freeradius/templates.conf
+share/examples/freeradius/users
+share/examples/freeradius/vmpsd.conf.in
 share/examples/rc.d/radiusd
 share/freeradius/dictionary
 share/freeradius/dictionary.3com
@@ -311,16 +326,19 @@ share/freeradius/dictionary.alcatel
 share/freeradius/dictionary.alteon
 share/freeradius/dictionary.altiga
 share/freeradius/dictionary.alvarion
+share/freeradius/dictionary.apc
 share/freeradius/dictionary.aptis
 share/freeradius/dictionary.aruba
 share/freeradius/dictionary.ascend
 share/freeradius/dictionary.asn
 share/freeradius/dictionary.avaya
+share/freeradius/dictionary.azaire
 share/freeradius/dictionary.bay
 share/freeradius/dictionary.bintec
 share/freeradius/dictionary.bristol
 share/freeradius/dictionary.cablelabs
 share/freeradius/dictionary.cabletron
+share/freeradius/dictionary.chillispot
 share/freeradius/dictionary.cisco
 share/freeradius/dictionary.cisco.bbsm
 share/freeradius/dictionary.cisco.vpn3000
@@ -343,28 +361,39 @@ share/freeradius/dictionary.freeradius.internal
 share/freeradius/dictionary.gandalf
 share/freeradius/dictionary.garderos
 share/freeradius/dictionary.gemtek
+share/freeradius/dictionary.h3c
 share/freeradius/dictionary.hp
+share/freeradius/dictionary.huawei
 share/freeradius/dictionary.ipunplugged
 share/freeradius/dictionary.issanni
 share/freeradius/dictionary.itk
+share/freeradius/dictionary.jradius
 share/freeradius/dictionary.juniper
 share/freeradius/dictionary.karlnet
+share/freeradius/dictionary.lancom
 share/freeradius/dictionary.livingston
 share/freeradius/dictionary.localweb
 share/freeradius/dictionary.lucent
+share/freeradius/dictionary.manzara
 share/freeradius/dictionary.merit
 share/freeradius/dictionary.microsoft
 share/freeradius/dictionary.mikrotik
 share/freeradius/dictionary.motorola
 share/freeradius/dictionary.navini
 share/freeradius/dictionary.netscreen
+share/freeradius/dictionary.networkphysics
+share/freeradius/dictionary.nexans
 share/freeradius/dictionary.nokia
+share/freeradius/dictionary.nokia.conflict
 share/freeradius/dictionary.nomadix
 share/freeradius/dictionary.nortel
 share/freeradius/dictionary.ntua
+share/freeradius/dictionary.openser
 share/freeradius/dictionary.packeteer
 share/freeradius/dictionary.patton
 share/freeradius/dictionary.propel
+share/freeradius/dictionary.prosoft
+share/freeradius/dictionary.quiconnect
 share/freeradius/dictionary.quintum
 share/freeradius/dictionary.redback
 share/freeradius/dictionary.redcreek
@@ -376,69 +405,61 @@ share/freeradius/dictionary.rfc2869
 share/freeradius/dictionary.rfc3162
 share/freeradius/dictionary.rfc3576
 share/freeradius/dictionary.rfc3580
+share/freeradius/dictionary.rfc4072
 share/freeradius/dictionary.rfc4372
 share/freeradius/dictionary.rfc4675
 share/freeradius/dictionary.rfc4679
+share/freeradius/dictionary.rfc4818
+share/freeradius/dictionary.rfc4849
+share/freeradius/dictionary.rfc5090
+share/freeradius/dictionary.rfc5176
 share/freeradius/dictionary.riverstone
 share/freeradius/dictionary.roaringpenguin
 share/freeradius/dictionary.shasta
 share/freeradius/dictionary.shiva
+share/freeradius/dictionary.slipstream
 share/freeradius/dictionary.sofaware
 share/freeradius/dictionary.sonicwall
 share/freeradius/dictionary.springtide
 share/freeradius/dictionary.starent
 share/freeradius/dictionary.t_systems_nova
 share/freeradius/dictionary.telebit
+share/freeradius/dictionary.telkom
 share/freeradius/dictionary.trapeze
 share/freeradius/dictionary.tropos
 share/freeradius/dictionary.unix
 share/freeradius/dictionary.usr
+share/freeradius/dictionary.utstarcom
 share/freeradius/dictionary.valemount
 share/freeradius/dictionary.versanet
+share/freeradius/dictionary.vqp
 share/freeradius/dictionary.walabi
 share/freeradius/dictionary.waverider
+share/freeradius/dictionary.wimax
 share/freeradius/dictionary.wispr
 share/freeradius/dictionary.xedia
 share/freeradius/dictionary.xylan
 share/freeradius/dictionary.zyxel
-share/freeradius/dictionary.azaire
-share/freeradius/dictionary.chillispot
-share/freeradius/dictionary.h3c
-share/freeradius/dictionary.huawei
-share/freeradius/dictionary.jradius
-share/freeradius/dictionary.manzara
-share/freeradius/dictionary.nexans
-share/freeradius/dictionary.nokia.conflict
-share/freeradius/dictionary.openser
-share/freeradius/dictionary.prosoft
-share/freeradius/dictionary.quiconnect
-share/freeradius/dictionary.rfc4072
-share/freeradius/dictionary.rfc4818
-share/freeradius/dictionary.rfc4849
-share/freeradius/dictionary.rfc5176
-share/freeradius/dictionary.slipstream
-share/freeradius/dictionary.telkom
-share/freeradius/dictionary.vqp
+@unexec ${RMDIR} %D/etc/raddb/sql/postgresql 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb/sql/oracle 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb/sql/mysql 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb/sql/mssql 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb/sql 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb/sites-available 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb/certs/demoCA 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb/certs 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/etc/raddb 2>/dev/null || ${TRUE}
 @dirrm share/freeradius
-@dirrm share/examples/freeradius/sql/mssql
-@dirrm share/examples/freeradius/sql/mysql
-@dirrm share/examples/freeradius/sql/oracle
 @dirrm share/examples/freeradius/sql/postgresql
+@dirrm share/examples/freeradius/sql/oracle
+@dirrm share/examples/freeradius/sql/mysql
+@dirrm share/examples/freeradius/sql/mssql
 @dirrm share/examples/freeradius/sql
 @dirrm share/examples/freeradius/sites-available
 @dirrm share/examples/freeradius/certs/demoCA
 @dirrm share/examples/freeradius/certs
 @dirrm share/examples/freeradius
-@dirrm share/doc/freeradius/examples
 @dirrm share/doc/freeradius/rfc
+@dirrm share/doc/freeradius/examples
 @dirrm share/doc/freeradius
 @dirrm include/freeradius
-@unexec ${RMDIR} %D/etc/raddb/certs/demoCA 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb/certs 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb/sql/mssql 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb/sql/mysql 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb/sql/oracle 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb/sql/postgresql 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb/sql 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb/sites-available 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/raddb 2>/dev/null || ${TRUE}
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 240e1084d8d..b02f3293c30 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.2 2008/06/20 20:57:39 adrianp Exp $
+$NetBSD: distinfo,v 1.3 2008/10/12 13:57:27 adrianp Exp $
 
-SHA1 (freeradius-server-2.0.5.tar.bz2) = 001f284fa4f4e4bd8a912a4f7d1d1141f6e39736
-RMD160 (freeradius-server-2.0.5.tar.bz2) = e954541f69d8036b60f7573d967619f0b540a1b1
-Size (freeradius-server-2.0.5.tar.bz2) = 2323968 bytes
+SHA1 (freeradius-server-2.1.1.tar.bz2) = a314eb330e402d319907bacd2077b1c2906f3962
+RMD160 (freeradius-server-2.1.1.tar.bz2) = 49e6dbe43258f75f97905795bc587057b9bc662c
+Size (freeradius-server-2.1.1.tar.bz2) = 2366923 bytes
+SHA1 (patch-aa) = 90c0c676ea668e36851eeffc0f1703624d703339
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
-SHA1 (patch-ae) = 8fa500de8c24ec4a8e3bfa043ebb2fb574b0fe7e
-SHA1 (patch-ai) = 0b2142bd16666bb4c2750daa2609b84115f39da9
+SHA1 (patch-ae) = c4e77de8871ec0c4b5840f46f29286bae707dd3b
+SHA1 (patch-ai) = 3f5fb64d718252cbbae6c808abd26bea9f0dcc9d
 SHA1 (patch-aj) = ba4e08eb0f3fbe0cb18f41de9c80e14ebccc1188
-SHA1 (patch-ak) = 719be38b382d62db7d5ee8a8e56d21f926057442
-SHA1 (patch-al) = fca4d6c162cdd5f10c6955d830e77631d3602d82
+SHA1 (patch-ak) = 751aba6a3f9716279f3a87871cf7008b7a921f9a
+SHA1 (patch-al) = 05cce8da469b6d14fcba1ef3cf378c3ba4bee3a0
diff --git a/net/freeradius2/patches/patch-aa b/net/freeradius2/patches/patch-aa
new file mode 100644
index 00000000000..c9c53147413
--- /dev/null
+++ b/net/freeradius2/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2008/10/12 13:57:27 adrianp Exp $
+
+--- src/lib/log.c.orig	2008-10-11 21:31:55.000000000 +0200
++++ src/lib/log.c	2008-10-11 21:31:49.000000000 +0200
+@@ -52,10 +52,10 @@
+  *	Use pthread keys if we have pthreads.  For MAC, which should
+  *	be very fast.
+  */
++#endif
+ #ifdef HAVE_PTHREAD_H
+ #define USE_PTHREAD_FOR_TLS (1)
+ #endif
+-#endif
+ 
+ #ifndef USE_PTHREAD_FOR_TLS
+ /*
diff --git a/net/freeradius2/patches/patch-ae b/net/freeradius2/patches/patch-ae
index c2c4d6a4039..689067ec36d 100644
--- a/net/freeradius2/patches/patch-ae
+++ b/net/freeradius2/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
+$NetBSD: patch-ae,v 1.2 2008/10/12 13:57:27 adrianp Exp $
 
---- Makefile.orig	2006-06-23 05:31:58.000000000 +0100
+--- Makefile.orig	2008-09-25 10:41:26.000000000 +0200
 +++ Makefile
 @@ -11,7 +11,7 @@ include Make.inc
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  WHAT_TO_MAKE	= all
  
  all:
-@@ -42,9 +42,7 @@ export DESTDIR := $(R)
+@@ -46,9 +46,7 @@ export DESTDIR := $(R)
  install:
  	$(INSTALL) -d -m 755	$(R)$(sbindir)
  	$(INSTALL) -d -m 755	$(R)$(bindir)
diff --git a/net/freeradius2/patches/patch-ai b/net/freeradius2/patches/patch-ai
index a1b5ca76cee..e3265fd88b6 100644
--- a/net/freeradius2/patches/patch-ai
+++ b/net/freeradius2/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
+$NetBSD: patch-ai,v 1.2 2008/10/12 13:57:27 adrianp Exp $
 
---- configure.orig	2008-01-22 14:16:37.000000000 +0000
+--- configure.orig	2008-09-25 10:41:26.000000000 +0200
 +++ configure
-@@ -20341,13 +20341,13 @@ fi
+@@ -20336,13 +20336,13 @@ fi
  done
  
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20404,7 +20404,7 @@ fi
+@@ -20399,7 +20399,7 @@ fi
  echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6; }
  if test $ac_cv_lib_pthread_pthread_create = yes; then
     CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
@@ -28,7 +28,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  else
    { echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
  echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6; }
-@@ -20872,7 +20872,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
+@@ -20867,7 +20867,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -37,7 +37,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24695,7 +24695,7 @@ gethostbyaddrrstyle=""
+@@ -24678,7 +24678,7 @@ gethostbyaddrrstyle=""
  { echo "$as_me:$LINENO: checking gethostbyaddr_r() syntax" >&5
  echo $ECHO_N "checking gethostbyaddr_r() syntax... $ECHO_C" >&6; }
  case "$host" in
diff --git a/net/freeradius2/patches/patch-ak b/net/freeradius2/patches/patch-ak
index 3d7ba4b64b1..44ede58f056 100644
--- a/net/freeradius2/patches/patch-ak
+++ b/net/freeradius2/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.2 2008/06/20 20:57:39 adrianp Exp $
+$NetBSD: patch-ak,v 1.3 2008/10/12 13:57:27 adrianp Exp $
 
---- raddb/radiusd.conf.in.orig	2008-05-30 10:18:43.000000000 +0100
+--- raddb/radiusd.conf.in.orig	2008-09-25 10:41:26.000000000 +0200
 +++ raddb/radiusd.conf.in
-@@ -160,8 +160,8 @@ pidfile = ${run_dir}/radiusd.pid
+@@ -164,8 +164,8 @@ pidfile = ${run_dir}/${name}.pid
  #  It will join all groups where "user" is a member.  This can allow
  #  for some finer-grained access controls.
  #
diff --git a/net/freeradius2/patches/patch-al b/net/freeradius2/patches/patch-al
index c8781978995..3eaff250bd2 100644
--- a/net/freeradius2/patches/patch-al
+++ b/net/freeradius2/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
+$NetBSD: patch-al,v 1.2 2008/10/12 13:57:27 adrianp Exp $
 
---- src/modules/rlm_preprocess/rlm_preprocess.c.orig	2008-03-05 11:13:21.000000000 +0100
-+++ src/modules/rlm_preprocess/rlm_preprocess.c	2008-05-14 22:59:18.000000000 +0200
-@@ -130,7 +130,7 @@
+--- src/modules/rlm_preprocess/rlm_preprocess.c.orig	2008-09-25 10:41:26.000000000 +0200
++++ src/modules/rlm_preprocess/rlm_preprocess.c
+@@ -130,7 +130,7 @@ static void cisco_vsa_hack(VALUE_PAIR *v
  		/*
  		 *  No weird packing.  Ignore it.
  		 */
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  		if (!ptr) continue;
  
  		/*
-@@ -148,7 +148,7 @@
+@@ -148,7 +148,7 @@ static void cisco_vsa_hack(VALUE_PAIR *v
  			const char *p;
  			DICT_ATTR	*dattr;
  
@@ -20,7 +20,7 @@ $NetBSD: patch-al,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  			gettoken(&p, newattr, sizeof(newattr));
  
  			if (((dattr = dict_attrbyname(newattr)) != NULL) &&
-@@ -233,10 +233,10 @@
+@@ -233,10 +233,10 @@ static void rad_mangle(rlm_preprocess_t 
  		 *
  		 *	FIXME: should we handle this as a REALM ?
  		 */
@@ -33,7 +33,7 @@ $NetBSD: patch-al,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  			namepair->length = strlen(newname);
  		}
  	}
-@@ -404,9 +404,9 @@
+@@ -404,9 +404,9 @@ static int huntgroup_access(REQUEST *req
  						       &request->packet->vps,
  						       PW_HUNTGROUP_NAME,
  						       PW_TYPE_STRING);
@@ -45,19 +45,19 @@ $NetBSD: patch-al,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
  			}
  			r = RLM_MODULE_OK;
  		}
-@@ -581,7 +581,7 @@
+@@ -581,7 +581,7 @@ static int preprocess_authorize(void *in
  				  data->huntgroups)) != RLM_MODULE_OK) {
  		char buf[1024];
- 		radlog(L_AUTH, "No huntgroup access: [%s] (%s)",
+ 		radlog_request(L_AUTH, 0, request, "No huntgroup access: [%s] (%s)",
 -		       request->username ? request->username->vp_strvalue : "<NO User-Name>",
 +		       request->username ? (char *)request->username->vp_strvalue : "<NO User-Name>",
  		       auth_name(buf, sizeof(buf), request, 1));
  		return r;
  	}
-@@ -632,7 +632,7 @@
+@@ -632,7 +632,7 @@ static int preprocess_preaccounting(void
  				  data->huntgroups)) != RLM_MODULE_OK) {
  		char buf[1024];
- 		radlog(L_INFO, "No huntgroup access: [%s] (%s)",
+ 		radlog_request(L_INFO, 0, request, "No huntgroup access: [%s] (%s)",
 -		       request->username ? request->username->vp_strvalue : "<NO User-Name>",
 +		       request->username ? (char *)request->username->vp_strvalue : "<NO User-Name>",
  		       auth_name(buf, sizeof(buf), request, 1));