Changes 2.1.10:

* Install the "radcrypt" program.
* Enable radclient to send requests containing MS-CHAPv1 Send packets with:
  MS-CHAP-Password = "password". It will be automatically converted to the
  correct MS-CHAP attributes.
* Added "-t" command-line option to radtest. You can use "-t pap", "-t chap",
  "-t mschap", or "-t eap-md5". The default is "-t pap"
* Make the "inner-tunnel" virtual server listen on 127.0.0.1:18120 This change
  and the previous one makes PEAP testing much easier.
* Added more documentation and examples for the "passwd" module.
* Added dictionaries for RFC 5607 and RFC 5904.
* Added note in proxy.conf that we recommend setting
  "require_message_authenticator = yes" for all home servers.
* Added example of second "files" configuration, with documentation.
  This shows how and where to use two instances of a module.
* Updated radsniff to have it write pcap files, too. See '-w'.
* Print out large WARNING message if we send an Access-Challenge for EAP, and
  receive no follow-up messages from the client.
* Added Cached-Session-Policy for EAP session resumption. See raddb/eap.conf.
* Added support for TLS-Cert-* attributes. For details, see
  raddb/sites-available/default, "post-auth" section.
* Added sample raddb/modules/{opendirectory,dynamic_clients}
* Updated Cisco and Huawei, HP, Redback, and ERX dictionaries.
* Added RFCs 5607, 5904, and 5997.
* For EAP-TLS, client certificates can now be validated using an external
  command. See eap.conf, "validate" subsection of "tls".
* Made rlm_pap aware of {nthash} prefix, for compatibility with legacy RADIUS
  systems.
* Add Module-Failure-Message for mschap module (ntlm_auth)
* Made rlm_sql_sqlite database configurable. Use "filename" in sql{} section.
* Added %{tolower: ...string ... }, which returns the lowercase version of the
  string. Also added %{toupper: ... } for uppercase.
* Bug fixes.

4 files changed, 57 insertions, 29 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index f8f0df2ca7c..74895c8bac3 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/07/20 08:41:21 adam Exp $
+# $NetBSD: Makefile,v 1.14 2010/10/29 15:59:00 adam Exp $
 
 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
@@ -21,7 +21,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-BUILD_DEFS=		VARBASE
+BUILD_DEFS+=		VARBASE
 FILES_SUBST+=		RADIUS_USER=${RADIUS_USER}
 FILES_SUBST+=		RADIUS_GROUP=${RADIUS_GROUP}
 PLIST_SUBST+=		RADVER=${RADVER}
@@ -37,7 +37,7 @@ RADIUS_GROUP?=		radius
 PKG_GROUPS=		${RADIUS_USER}
 PKG_USERS=		${RADIUS_USER}:${RADIUS_GROUP}
 PKG_GROUPS_VARS+=	RADIUS_GROUP
-PKG_USERS_VARS+=	RADIUS_USER
+PKG_USERS_VARS=		RADIUS_USER
 OWN_DIRS_PERMS+=	${VARBASE}/run/radiusd \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
@@ -45,7 +45,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd/radacct \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 
-RADVER=			2.1.9
+RADVER=			2.1.10
 EGDIR=			${DESTDIR}${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
@@ -55,8 +55,8 @@ CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--quiet
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log/radiusd
-CONFIGURE_ARGS+=	--with-ltdl-lib=${PREFIX}/lib
-CONFIGURE_ARGS+=	--with-ltdl-include=${PREFIX}/include
+CONFIGURE_ARGS+=	--with-system-libltdl
+CONFIGURE_ARGS+=	--with-system-libtool
 CONFIGURE_ARGS+=	--without-rlm_python
 CONFIGURE_ARGS+=	--without-rlm_smb
 CONFIGURE_ARGS+=	--without-rlm_sql_oracle
@@ -65,7 +65,7 @@ MAKE_ENV+=		R=${DESTDIR}
 
 REPLACE_PERL=		scripts/radsqlrelay
 
-SUBST_CLASSES=		make
+SUBST_CLASSES+=		make
 SUBST_STAGE.make=	post-patch
 SUBST_FILES.make=	src/modules/rlm_sql/drivers/rlm_sql_postgresql/Makefile.in
 SUBST_SED.make+=	-e "s|RLM_SQL_LIBS	=|RLM_SQL_LIBS	= \
diff --git a/net/freeradius2/PLIST b/net/freeradius2/PLIST
index 5618ebf2b52..d75dac5dd72 100644
--- a/net/freeradius2/PLIST
+++ b/net/freeradius2/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.10 2010/07/20 08:41:21 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/10/29 15:59:00 adam Exp $
 bin/radclient
 bin/radconf2xml
+bin/radcrypt
 bin/radeapclient
 bin/radlast
 bin/radsniff
@@ -191,12 +192,13 @@ 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/Acct-Type.rst
+share/doc/freeradius/Autz-Type.rst
+share/doc/freeradius/CYGWIN.rst
 share/doc/freeradius/ChangeLog
-share/doc/freeradius/DIFFS
+share/doc/freeradius/DIFFS.rst
 share/doc/freeradius/MACOSX
+share/doc/freeradius/Makefile.sphinx
 share/doc/freeradius/OS2
 share/doc/freeradius/Post-Auth-Type
 share/doc/freeradius/RADIUS-LDAP-eDirectory
@@ -204,26 +206,27 @@ 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/aaa.rst
 share/doc/freeradius/ascend
 share/doc/freeradius/bay
 share/doc/freeradius/bugs
-share/doc/freeradius/cisco
-share/doc/freeradius/coding-methods.txt
-share/doc/freeradius/configurable_failover
+share/doc/freeradius/cisco.rst
+share/doc/freeradius/coding-methods.rst
+share/doc/freeradius/configurable_failover.rst
 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/index.rst
+share/doc/freeradius/ldap_howto.rst
+share/doc/freeradius/load-balance.rst
+share/doc/freeradius/misc-nas.rst
+share/doc/freeradius/module_interface.rst
 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/processing_users_file.rst
+share/doc/freeradius/proxy.rst
+share/doc/freeradius/release-method.rst
 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
@@ -254,6 +257,7 @@ share/doc/freeradius/rfc/rfc2868.txt
 share/doc/freeradius/rfc/rfc2869.txt
 share/doc/freeradius/rfc/rfc2882.txt
 share/doc/freeradius/rfc/rfc2924.txt
+share/doc/freeradius/rfc/rfc3079.txt
 share/doc/freeradius/rfc/rfc3162.txt
 share/doc/freeradius/rfc/rfc3575.txt
 share/doc/freeradius/rfc/rfc3576.txt
@@ -278,6 +282,9 @@ share/doc/freeradius/rfc/rfc5176.txt
 share/doc/freeradius/rfc/rfc5247.txt
 share/doc/freeradius/rfc/rfc5281.txt
 share/doc/freeradius/rfc/rfc5580.txt
+share/doc/freeradius/rfc/rfc5607.txt
+share/doc/freeradius/rfc/rfc5904.txt
+share/doc/freeradius/rfc/rfc5997.txt
 share/doc/freeradius/rlm_dbm
 share/doc/freeradius/rlm_eap
 share/doc/freeradius/rlm_expiration
@@ -293,9 +300,9 @@ 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/supervise-radiusd.rst
 share/doc/freeradius/tuning_guide
-share/doc/freeradius/variables.txt
+share/doc/freeradius/variables.rst
 share/examples/freeradius/acct_users
 share/examples/freeradius/attrs
 share/examples/freeradius/attrs.access_reject
@@ -481,6 +488,7 @@ share/freeradius/dictionary.merit
 share/freeradius/dictionary.microsoft
 share/freeradius/dictionary.mikrotik
 share/freeradius/dictionary.motorola
+share/freeradius/dictionary.motorola.wimax
 share/freeradius/dictionary.navini
 share/freeradius/dictionary.netscreen
 share/freeradius/dictionary.networkphysics
@@ -509,6 +517,7 @@ share/freeradius/dictionary.rfc3576
 share/freeradius/dictionary.rfc3580
 share/freeradius/dictionary.rfc4072
 share/freeradius/dictionary.rfc4372
+share/freeradius/dictionary.rfc4603
 share/freeradius/dictionary.rfc4675
 share/freeradius/dictionary.rfc4679
 share/freeradius/dictionary.rfc4818
@@ -516,6 +525,8 @@ share/freeradius/dictionary.rfc4849
 share/freeradius/dictionary.rfc5090
 share/freeradius/dictionary.rfc5176
 share/freeradius/dictionary.rfc5580
+share/freeradius/dictionary.rfc5607
+share/freeradius/dictionary.rfc5904
 share/freeradius/dictionary.riverstone
 share/freeradius/dictionary.roaringpenguin
 share/freeradius/dictionary.shasta
@@ -540,6 +551,7 @@ share/freeradius/dictionary.walabi
 share/freeradius/dictionary.waverider
 share/freeradius/dictionary.wichorus
 share/freeradius/dictionary.wimax
+share/freeradius/dictionary.wimax.wichorus
 share/freeradius/dictionary.wispr
 share/freeradius/dictionary.xedia
 share/freeradius/dictionary.xylan
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index fbea1695e87..8a1e1f5ec60 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.9 2010/07/20 08:41:21 adam Exp $
+$NetBSD: distinfo,v 1.10 2010/10/29 15:59:00 adam Exp $
 
-SHA1 (freeradius-server-2.1.9.tar.bz2) = 71a7829d6c40d3345f53fcc18c65d634fd39293c
-RMD160 (freeradius-server-2.1.9.tar.bz2) = 5c51cf7483ad5c912cec7eb78342c2f7e1a1c32f
-Size (freeradius-server-2.1.9.tar.bz2) = 2524497 bytes
+SHA1 (freeradius-server-2.1.10.tar.bz2) = 3651ac3d50ec8b01ae46f9df5a50e31379c1e522
+RMD160 (freeradius-server-2.1.10.tar.bz2) = 3fc2e8bc1f0868b6af95775e5ae18561619009a6
+Size (freeradius-server-2.1.10.tar.bz2) = 2545578 bytes
 SHA1 (patch-aa) = 90c0c676ea668e36851eeffc0f1703624d703339
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
+SHA1 (patch-ac) = b8219f72d43f3bc61aef2fd7731d53dfa4e555b5
 SHA1 (patch-ae) = aa43b83ba991f510cee40cb65c3621e9d559d6dd
 SHA1 (patch-ai) = b32fcb8a71f4c4437a47352e2b235d4c15554a01
 SHA1 (patch-aj) = 865882e6e6e935276529b98616c9059c555272b9
diff --git a/net/freeradius2/patches/patch-ac b/net/freeradius2/patches/patch-ac
new file mode 100644
index 00000000000..89119a53ded
--- /dev/null
+++ b/net/freeradius2/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2010/10/29 15:59:00 adam Exp $
+
+--- src/main/modules.c.orig	2010-10-29 11:11:18.000000000 +0000
++++ src/main/modules.c
+@@ -1358,9 +1358,7 @@ int setup_modules(int reload, CONF_SECTI
+ 		 *	It's like libtool and libltdl are some kind
+ 		 *	of sick joke.
+ 		 */
+-#ifdef IE_LIBTOOL_DIE
+-#define lt__PROGRAM__LTX_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
+-#endif
++#define lt_preloaded_symbols lt_libltdl_LTX_preloaded_symbols
+ 
+ 		/*
+ 		 *	Set the default list of preloaded symbols.