Changes 2.1.9:

Feature improvements
* Add radmin command "stats detail <file>" to see what
  is going on inside of a detail file reader.
* Added documentation for CoA.  See raddb/sites-available/coa
* Add sub-option support for Option 82.  See dictionary.dhcp
* Add "server" field to default SQL NAS table, and documented it.

Bug fixes
* Reset "received ping" counter for Status-Server checks.  In some
  corner cases it was not getting reset.
* Handle large VMPS attributes.
* Count accounting responses from a home server in SNMP / statistics
  code.
* Set EAP-Session-Resumed = Yes, not "No" when session is resumed.
* radmin packet counter statistics are now unsigned, for numbers
  2^31..2^32.  After that they roll over to zero.
* Be more careful about expanding data in PAP and MS-CHAP modules.
  This prevents login failures when passwords contain '{'.
* Clean up zombie children if there were many "exec" modules being
  run for one packet, all with "wait = no".
* re-open log file after HUP.
* Fix "no response to proxied packet" complaint for Coa / Disconnect
  packets.  It shouldn't ignore replies to packets it sent.
* Calculate IPv6 netmasks correctly.
* Fix SQL module to re-open sockets if they unexpectedly close.
* Track scope for IPv6 addresses.  This lets us use link-local
  addresses properly.
* Updated Makefiles to no longer use the shell for recursing into
  subdirs.  "make -j 2" should now work.
* Updated raddb/sql/mysql/ippool.conf to use "= NULL".
* Updated Makefiles so that "make reconfig" no longer uses the shell
  for recursing into subdirs, and re-builds all "configure" files.
* Used above method to regenerate all configure scripts.
* Updated SQL module to allow "server" field of "nas" table
  to be blank: "".  This means the same as it being NULL.
* Fixed regex realm example.  Create Realm attribute with value
  of realm from User-Name, not from regex.
* If processing a DHCP Discover returns "fail / reject", ignore
  the packet rather than sending a NAK.
* Allow '%' to be escaped in sqlcounter module.
* Fix typo internal hash table.
* For PEAP and TTLS, the tunneled reply is added to the reply,
  rather than integrated via the operators.  This allows multiple
  VSAs to be added, where they would previously be discarded.
* Make request number unsigned.  This changes nothing other than
  the debug output when the server receives more than 2^31 packets.
* Don't block when reading child output in 'exec wait'.  This means
  that blocked children get killed, instead of blocking the server.
* Enabled building without any proxy functionality
* radclient now prefers IPv4, to match the default server config.
* Print useful error when a realm regex is invalid
* relaxed rules for preprocess module "with_cisco_vsa_hack".  The
  attributes can now be integer, ipaddr, etc.  (i.e. non-string)
* Allow rlm_ldap to build if ldap_set_rebind_proc() has only
  2 arguments.
* Update configure script for rlm_python to avoid dynamic linking
  problems on some platforms.
* Do suid to "user" when running in debug mode as root
* Make "allow_core_dumps" work in more situations.
* In detail file reader, treat bad records as EOF.
  This allows it to continue working when the disk is full.
* Fix Oracle default accounting queries to work when there are no
  gigawords attributes.  Other databases already had the fix.
* Fix rlm_sql to show when it opens and closes sockets.  It already
  says when it cannot connect, so it should say when it can connect.
* "chmod -x" for a few C source files.
* Pull update spec files, etc. from RedHat into the redhat/ directory.
* Allow spaces when parsing integer values.  This helps people who
  put "too much" into an SQL value field.

5 files changed, 22 insertions, 21 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 19c34909776..f8f0df2ca7c 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2010/05/29 11:47:37 obache Exp $
+# $NetBSD: Makefile,v 1.13 2010/07/20 08:41:21 adam Exp $
 
 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
@@ -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.8
+RADVER=			2.1.9
 EGDIR=			${DESTDIR}${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
@@ -61,7 +61,7 @@ CONFIGURE_ARGS+=	--without-rlm_python
 CONFIGURE_ARGS+=	--without-rlm_smb
 CONFIGURE_ARGS+=	--without-rlm_sql_oracle
 CONFIGURE_ARGS+=	--without-rlm_sql_unixodbc
-MAKE_ENV+=		R=${DESTDIR:Q}
+MAKE_ENV+=		R=${DESTDIR}
 
 REPLACE_PERL=		scripts/radsqlrelay
 
diff --git a/net/freeradius2/PLIST b/net/freeradius2/PLIST
index 7001927ebbf..5618ebf2b52 100644
--- a/net/freeradius2/PLIST
+++ b/net/freeradius2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2010/05/23 17:28:44 tron Exp $
+@comment $NetBSD: PLIST,v 1.10 2010/07/20 08:41:21 adam Exp $
 bin/radclient
 bin/radconf2xml
 bin/radeapclient
@@ -538,6 +538,7 @@ share/freeradius/dictionary.versanet
 share/freeradius/dictionary.vqp
 share/freeradius/dictionary.walabi
 share/freeradius/dictionary.waverider
+share/freeradius/dictionary.wichorus
 share/freeradius/dictionary.wimax
 share/freeradius/dictionary.wispr
 share/freeradius/dictionary.xedia
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index bd02e0c0df0..fbea1695e87 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.8 2010/05/23 17:28:44 tron Exp $
+$NetBSD: distinfo,v 1.9 2010/07/20 08:41:21 adam Exp $
 
-SHA1 (freeradius-server-2.1.8.tar.bz2) = f01a8add62b790033cc861d55dc0d09a4678beac
-RMD160 (freeradius-server-2.1.8.tar.bz2) = 9ad8e19eda1b7da89fde3d0e345a0cc6b13eba88
-Size (freeradius-server-2.1.8.tar.bz2) = 2544696 bytes
+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 (patch-aa) = 90c0c676ea668e36851eeffc0f1703624d703339
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
 SHA1 (patch-ae) = aa43b83ba991f510cee40cb65c3621e9d559d6dd
 SHA1 (patch-ai) = b32fcb8a71f4c4437a47352e2b235d4c15554a01
-SHA1 (patch-aj) = ba4e08eb0f3fbe0cb18f41de9c80e14ebccc1188
+SHA1 (patch-aj) = 865882e6e6e935276529b98616c9059c555272b9
 SHA1 (patch-ak) = 751aba6a3f9716279f3a87871cf7008b7a921f9a
-SHA1 (patch-al) = 05cce8da469b6d14fcba1ef3cf378c3ba4bee3a0
+SHA1 (patch-al) = 6d68e3e2d7dd50675f142be974b277da0f664c8b
diff --git a/net/freeradius2/patches/patch-aj b/net/freeradius2/patches/patch-aj
index 0a3fbe460d9..2a5b60697b9 100644
--- a/net/freeradius2/patches/patch-aj
+++ b/net/freeradius2/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2008/05/15 19:43:47 adrianp Exp $
+$NetBSD: patch-aj,v 1.2 2010/07/20 08:41:21 adam Exp $
 
---- Make.inc.in.orig	2008-05-14 23:18:20.000000000 +0200
-+++ Make.inc.in	2008-05-14 23:18:50.000000000 +0200
-@@ -45,6 +45,7 @@
+--- Make.inc.in.orig	2010-05-24 05:40:58.000000000 +0000
++++ Make.inc.in
+@@ -46,6 +46,7 @@ INSTALLSTRIP	= @INSTALLSTRIP@
  LCRYPT		= @CRYPTLIB@
  LIBS		= @LIBS@
  LDFLAGS		= @LDFLAGS@
diff --git a/net/freeradius2/patches/patch-al b/net/freeradius2/patches/patch-al
index 3eaff250bd2..5388c37ca39 100644
--- a/net/freeradius2/patches/patch-al
+++ b/net/freeradius2/patches/patch-al
@@ -1,6 +1,6 @@
-$NetBSD: patch-al,v 1.2 2008/10/12 13:57:27 adrianp Exp $
+$NetBSD: patch-al,v 1.3 2010/07/20 08:41:21 adam Exp $
 
---- src/modules/rlm_preprocess/rlm_preprocess.c.orig	2008-09-25 10:41:26.000000000 +0200
+--- src/modules/rlm_preprocess/rlm_preprocess.c.orig	2010-05-24 05:40:58.000000000 +0000
 +++ src/modules/rlm_preprocess/rlm_preprocess.c
 @@ -130,7 +130,7 @@ static void cisco_vsa_hack(VALUE_PAIR *v
  		/*
@@ -19,8 +19,8 @@ $NetBSD: patch-al,v 1.2 2008/10/12 13:57:27 adrianp Exp $
 +			p = (char *)vp->vp_strvalue;
  			gettoken(&p, newattr, sizeof(newattr));
  
- 			if (((dattr = dict_attrbyname(newattr)) != NULL) &&
-@@ -233,10 +233,10 @@ static void rad_mangle(rlm_preprocess_t 
+ 			if ((dattr = dict_attrbyname(newattr)) != NULL) {
+@@ -232,10 +232,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.2 2008/10/12 13:57:27 adrianp Exp $
  			namepair->length = strlen(newname);
  		}
  	}
-@@ -404,9 +404,9 @@ static int huntgroup_access(REQUEST *req
+@@ -403,9 +403,9 @@ static int huntgroup_access(REQUEST *req
  						       &request->packet->vps,
  						       PW_HUNTGROUP_NAME,
  						       PW_TYPE_STRING);
@@ -45,7 +45,7 @@ $NetBSD: patch-al,v 1.2 2008/10/12 13:57:27 adrianp Exp $
  			}
  			r = RLM_MODULE_OK;
  		}
-@@ -581,7 +581,7 @@ static int preprocess_authorize(void *in
+@@ -580,7 +580,7 @@ static int preprocess_authorize(void *in
  				  data->huntgroups)) != RLM_MODULE_OK) {
  		char buf[1024];
  		radlog_request(L_AUTH, 0, request, "No huntgroup access: [%s] (%s)",
@@ -54,7 +54,7 @@ $NetBSD: patch-al,v 1.2 2008/10/12 13:57:27 adrianp Exp $
  		       auth_name(buf, sizeof(buf), request, 1));
  		return r;
  	}
-@@ -632,7 +632,7 @@ static int preprocess_preaccounting(void
+@@ -631,7 +631,7 @@ static int preprocess_preaccounting(void
  				  data->huntgroups)) != RLM_MODULE_OK) {
  		char buf[1024];
  		radlog_request(L_INFO, 0, request, "No huntgroup access: [%s] (%s)",