Changes 2.1.6:

* radclient exits with 0 on successful (accept / ack), and 1 otherwise
  (no response / reject)
* Added support for %{sql:UPDATE ..}, and insert/delete
* Added sample "do not respond" policy
* New VSAs for Juniper from Bjorn Mork
* Include more RFC dictionaries in the default install
* More documentation for the WiMAX module
* Added "chase_referrals" and "rebind" configuration to rlm_ldap
* Don't load pre/post-proxy if proxying is disabled
* Added %{md5:...}, which returns MD5 hash in hex
* Added configurable "retry_interval" and "poll_interval" for "detail"
  listeners.
* Added "delete_mppe_keys" configuration option to rlm_wimax.
  Apparently some WiMAX clients misbehave when they see those keys.
* Added experimental rlm_ruby
* Add Tunnel attributes to ldap.attrmap
* Enable virtual servers to be reloaded on HUP
* Updated "radwatch" script to be more robust
* Added certificate compatibility notes in raddb/certs/README, for
  compatibility with different operating systems. (i.e. Windows)
* Bug Fixes

6 files changed, 31 insertions, 54 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index f91ab70ce11..57f8241715d 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/04/23 18:26:05 adam Exp $
+# $NetBSD: Makefile,v 1.6 2009/05/28 06:00:38 adam Exp $
 
 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
@@ -43,7 +43,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd/radacct \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 
-RADVER=			2.1.4
+RADVER=			2.1.6
 EGDIR=			${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
@@ -139,10 +139,6 @@ SUBST_SED.make+=	-e 's|@ldap_ldflags@|@ldap_ldflags@ \
 			${PTHREAD_LDFLAGS:M*:Q} ${PTHREAD_LIBS:M*:Q}|g'
 .endif
 
-# fix for wrong version number in freeradius-2.1.4
-post-patch:
-	${ECHO} ${RADVER} > ${WRKSRC}/VERSION
-
 post-build:
 	${CP} ${PKGDIR}/MESSAGE ${WRKDIR}/.MESSAGE_SRC
 .if !empty(PKG_OPTIONS:Mpam)
diff --git a/net/freeradius2/PLIST b/net/freeradius2/PLIST
index b6488cdcabf..c9927df0ab5 100644
--- a/net/freeradius2/PLIST
+++ b/net/freeradius2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/04/23 18:26:05 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2009/05/28 06:00:38 adam Exp $
 bin/radclient
 bin/radconf2xml
 bin/radeapclient
@@ -12,18 +12,34 @@ ${PLIST.dbm}bin/rlm_dbm_cat
 ${PLIST.dbm}bin/rlm_dbm_parser
 bin/rlm_ippool_tool
 bin/smbencrypt
+include/freeradius/autoconf.h
+include/freeradius/conf.h
+include/freeradius/conffile.h
+include/freeradius/detail.h
+include/freeradius/dhcp.h
+include/freeradius/event.h
 include/freeradius/hash.h
+include/freeradius/heap.h
 include/freeradius/ident.h
 include/freeradius/libradius.h
 include/freeradius/md4.h
 include/freeradius/md5.h
 include/freeradius/missing.h
+include/freeradius/modcall.h
+include/freeradius/modules.h
 include/freeradius/packet.h
+include/freeradius/rad_assert.h
 include/freeradius/radius.h
+include/freeradius/radiusd.h
 include/freeradius/radpaths.h
+include/freeradius/radutmp.h
+include/freeradius/realms.h
 include/freeradius/sha1.h
+include/freeradius/stats.h
+include/freeradius/sysutmp.h
 include/freeradius/token.h
 include/freeradius/udpfromto.h
+include/freeradius/vmps.h
 include/freeradius/vqp.h
 lib/libfreeradius-eap-${RADVER}.la
 lib/libfreeradius-eap.la
@@ -441,6 +457,7 @@ share/freeradius/dictionary.gemtek
 share/freeradius/dictionary.h3c
 share/freeradius/dictionary.hp
 share/freeradius/dictionary.huawei
+share/freeradius/dictionary.infonet
 share/freeradius/dictionary.ipunplugged
 share/freeradius/dictionary.issanni
 share/freeradius/dictionary.itk
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 73fff3788d4..32337c9ac0a 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,14 +1,12 @@
-$NetBSD: distinfo,v 1.5 2009/04/23 18:26:05 adam Exp $
+$NetBSD: distinfo,v 1.6 2009/05/28 06:00:38 adam Exp $
 
-SHA1 (freeradius-server-2.1.4.tar.bz2) = 2e0172d9e0c72cba5e61259aaf15da67230f1882
-RMD160 (freeradius-server-2.1.4.tar.bz2) = 83b41b421e61720e50bc3e6c390e4f489d26e646
-Size (freeradius-server-2.1.4.tar.bz2) = 2405962 bytes
+SHA1 (freeradius-server-2.1.6.tar.bz2) = 1d3cbc6a5bee3c0513e697d6206591a44e8a3415
+RMD160 (freeradius-server-2.1.6.tar.bz2) = f25404d864df11ce8cb94d8664bc72e30d31c153
+Size (freeradius-server-2.1.6.tar.bz2) = 2512340 bytes
 SHA1 (patch-aa) = 90c0c676ea668e36851eeffc0f1703624d703339
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
-SHA1 (patch-ac) = 5be3ed42b1e627cd6b71bbeabcbaa34edadb025d
-SHA1 (patch-ad) = 9ff2eac2ea117117a06d09ab1dfddd881351df81
 SHA1 (patch-ae) = c4e77de8871ec0c4b5840f46f29286bae707dd3b
-SHA1 (patch-ai) = 1a36e12cf70eec637341a15741f9a626ab4ae804
+SHA1 (patch-ai) = 877a567fc4a2bffc2f12f1822c354b8c186c3cce
 SHA1 (patch-aj) = ba4e08eb0f3fbe0cb18f41de9c80e14ebccc1188
 SHA1 (patch-ak) = 751aba6a3f9716279f3a87871cf7008b7a921f9a
 SHA1 (patch-al) = 05cce8da469b6d14fcba1ef3cf378c3ba4bee3a0
diff --git a/net/freeradius2/patches/patch-ac b/net/freeradius2/patches/patch-ac
deleted file mode 100644
index 149c5b4d123..00000000000
--- a/net/freeradius2/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/04/23 18:27:28 adam Exp $
-
---- scripts/raddebug.orig	2009-04-04 08:51:30.000000000 +0200
-+++ scripts/raddebug
-@@ -41,14 +41,14 @@ do
-   case $OPTION in
-   c)	condition="$OPTARG"
- 	;;
--  d)    [ "$extra" == "" ] || usage
-+  d)    [ "$extra" = "" ] || usage
- 	extra="-d $OPTARG"
- 	;;
-   i)	condition="(Packet-Src-IP-Address == $OPTARG)"
- 	;;
-   I)	condition="(Packet-Src-IPv6-Address == $OPTARG)"
- 	;;
--  f)	[ "$extra" == "" ] || usage
-+  f)	[ "$extra" = "" ] || usage
- 	extra="-f $OPTARG"
- 	;;
-   t)	timeout="$OPTARG"
diff --git a/net/freeradius2/patches/patch-ad b/net/freeradius2/patches/patch-ad
deleted file mode 100644
index 117273d06b4..00000000000
--- a/net/freeradius2/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/04/23 18:27:28 adam Exp $
-
---- raddb/certs/bootstrap.orig	2009-04-04 08:53:44.000000000 +0200
-+++ raddb/certs/bootstrap
-@@ -17,7 +17,7 @@ make all
- #
- #  If that worked, exit.  Otherwise, run the commands manually.
- #
--if [ "$?" == "0" ]
-+if [ "$?" = "0" ]
- then
-   exit 0
- fi
diff --git a/net/freeradius2/patches/patch-ai b/net/freeradius2/patches/patch-ai
index 41df3e9f008..1ec761d66a1 100644
--- a/net/freeradius2/patches/patch-ai
+++ b/net/freeradius2/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2009/04/23 18:26:05 adam Exp $
+$NetBSD: patch-ai,v 1.4 2009/05/28 06:00:38 adam Exp $
 
---- configure.orig	2009-03-11 03:26:50.000000000 +0100
+--- configure.orig	2009-05-18 13:13:55.000000000 +0200
 +++ configure
-@@ -20336,13 +20336,13 @@ fi
+@@ -20921,13 +20921,13 @@ fi
  done
  
  
@@ -19,7 +19,7 @@ $NetBSD: patch-ai,v 1.3 2009/04/23 18:26:05 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20399,7 +20399,7 @@ fi
+@@ -20984,7 +20984,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.3 2009/04/23 18:26:05 adam 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; }
-@@ -20867,7 +20867,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
+@@ -21452,7 +21452,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.3 2009/04/23 18:26:05 adam Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24684,7 +24684,7 @@ gethostbyaddrrstyle=""
+@@ -25269,7 +25269,7 @@ gethostbyaddrrstyle=""
  { echo "$as_me:$LINENO: checking gethostbyaddr_r() syntax" >&5
  echo $ECHO_N "checking gethostbyaddr_r() syntax... $ECHO_C" >&6; }
  case "$host" in