Update to 1.1.7

Feature Improvements
* Updated LDAP documentation.
* Added note on DH parameters in eap.conf, and debugging messages which complain if DH is used, but not configured properly.
* Updated the Mikrotik dictionary. Added a note that the sample dictionary they supply is broken.
* Output more information on blocked threads, which should help narrow down which modules is causing the problem.
* Added more eDirectory support.
* rlm_ldap now prints out attributes in the standard format
* Enabled server-side handling of procedures in MySQL

Bug Fixes
* Added NT-Hash support for mschap_xlat.
* Corrected documentation to point to correct location of files.
* Checks for more recent FreeBSD versions.
* uses -DLDAP_DEPRECATED to avoid OpenLDAP crashes.
* Use correct value for authentication name in rlm_mschap.
* Fix over-ride for usernames when use_tunneled_reply = yes.

4 files changed, 23 insertions, 21 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 971df8b7575..f0750cd4a43 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2007/07/04 20:54:48 jlam Exp $
+# $NetBSD: Makefile,v 1.61 2007/09/18 22:15:07 adrianp Exp $
 
 DISTNAME=	freeradius-${RADVER}
 CATEGORIES=	net
@@ -42,7 +42,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd/radacct \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 
-RADVER=			1.1.6
+RADVER=			1.1.7
 EGDIR=			${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 361d56f150d..22536f9e53b 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2007/04/14 10:16:48 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.23 2007/09/18 22:15:07 adrianp Exp $
 bin/radclient
 bin/radeapclient
 bin/radlast
@@ -76,6 +76,8 @@ lib/rlm_sql_log-${RADVER}.la
 lib/rlm_sql_log.la
 lib/rlm_sqlcounter-${RADVER}.la
 lib/rlm_sqlcounter.la
+lib/rlm_sqlippool-${RADVER}.la
+lib/rlm_sqlippool.la
 lib/rlm_unix-${RADVER}.la
 lib/rlm_unix.la
 man/man1/radclient.1
@@ -147,6 +149,7 @@ share/doc/freeradius/examples/mysql.sql
 share/doc/freeradius/examples/openldap.schema
 share/doc/freeradius/examples/oracle.sql
 share/doc/freeradius/examples/postgresql.sql
+share/doc/freeradius/examples/postgresql.sql.extra
 share/doc/freeradius/load-balance.txt
 share/doc/freeradius/module_interface
 share/doc/freeradius/mssql
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 82092e4422e..e511270beda 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.26 2007/04/14 10:16:48 adrianp Exp $
+$NetBSD: distinfo,v 1.27 2007/09/18 22:15:07 adrianp Exp $
 
-SHA1 (freeradius-1.1.6.tar.gz) = a40ff6412824daf221bd6e717db253cf32562735
-RMD160 (freeradius-1.1.6.tar.gz) = ed82342938d3845c4e6938b5c4f3117e2397367b
-Size (freeradius-1.1.6.tar.gz) = 3175652 bytes
+SHA1 (freeradius-1.1.7.tar.gz) = 4e8515f82260478ef881ed7b87b7ca258e19ccba
+RMD160 (freeradius-1.1.7.tar.gz) = 9d33a4b01fc791557153b375a41e3d905fc8efe5
+Size (freeradius-1.1.7.tar.gz) = 3156228 bytes
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
 SHA1 (patch-ae) = 8fa500de8c24ec4a8e3bfa043ebb2fb574b0fe7e
-SHA1 (patch-ai) = 361897e4083b5f7827f73dc7b4683027ac4f66e2
+SHA1 (patch-ai) = 8e74a07cde8134881cfd2e5fe661e42cfa3e9fbf
 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
 SHA1 (patch-ak) = 7be986e3949a6f8368f7e01ba93521fac48eff7d
diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai
index 2eb9c59a14c..ad8416d90a8 100644
--- a/net/freeradius/patches/patch-ai
+++ b/net/freeradius/patches/patch-ai
@@ -1,12 +1,11 @@
-$NetBSD: patch-ai,v 1.9 2007/02/17 18:36:23 adrianp Exp $
+$NetBSD: patch-ai,v 1.10 2007/09/18 22:15:08 adrianp Exp $
 
---- configure.orig	2007-01-04 23:42:11.000000000 +0000
+--- configure.orig	2007-07-21 15:01:34.000000000 +0100
 +++ configure
-@@ -19990,14 +19990,13 @@ fi
- 
+@@ -20022,13 +20022,13 @@ fi
  done
  
--
+ 
 -  { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 -echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
 +  { echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
@@ -20,7 +19,7 @@ $NetBSD: patch-ai,v 1.9 2007/02/17 18:36:23 adrianp Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20054,7 +20053,7 @@ fi
+@@ -20085,7 +20085,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"
@@ -29,7 +28,7 @@ $NetBSD: patch-ai,v 1.9 2007/02/17 18:36:23 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; }
-@@ -20163,7 +20162,7 @@ return sem_init ();
+@@ -20194,7 +20194,7 @@ return sem_init ();
    return 0;
  }
  _ACEOF
@@ -38,21 +37,21 @@ $NetBSD: patch-ai,v 1.9 2007/02/17 18:36:23 adrianp Exp $
    if test -z "$ac_lib"; then
      ac_res="none required"
    else
-@@ -20520,7 +20519,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
+@@ -20552,7 +20552,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lssl  $LIBS"
-+LIBS="-lssl -lcrypto $LIBS"
++LIBS="-lssl -lcrypto  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23588,7 +23587,7 @@ gethostbyaddrrstyle=""
+@@ -23623,7 +23623,7 @@ gethostbyaddrrstyle=""
  { echo "$as_me:$LINENO: checking gethostbyaddr_r() syntax" >&5
  echo $ECHO_N "checking gethostbyaddr_r() syntax... $ECHO_C" >&6; }
  case "$host" in
 -*-freebsd*)
 +*-freebsd* | *-dragonfly*)
- 	cat >>confdefs.h <<\_ACEOF
- #define GETHOSTBYADDRRSTYLE BSDSTYLE
- _ACEOF
+ 	{ echo "$as_me:$LINENO: checking whether gethostbyaddr_r is declared" >&5
+ echo $ECHO_N "checking whether gethostbyaddr_r is declared... $ECHO_C" >&6; }
+ if test "${ac_cv_have_decl_gethostbyaddr_r+set}" = set; then