Update to 1.1.4

* Major enhancements to rlm_pap, that make "encryption_scheme"
a think of the past.  See "man rlm_pap" for details.
* Added SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS flag to use
work-arounds that enable Windows Vista clients to work.
* Added preliminary code to support Firebird.
Use at your own risk!
* Send MS-CHAP2-Success, which makes EAP-TTLS/MSCHAP work on more
platforms.
* Add a new "reply-name" directive in rlm_sqlcounter to define the
name of the reply attribute.
* Added more dictionaries and attributes
* Print ntlm_auth failure reason in Module-Failure-Message
* radsqlrelay is able to get the DB password from a file instead
of command line.

Bug fixes
* Fix a parse error in the digest module, where malformed
digest requests would result in the user being accepted.  Oops...
* VALUEs can only be defined for 'integer', to catch mistakes
with setting VALUEs for type 'string'.
* Better parsing of VALUE names, so that values starting with
a digit work correctly.
* Check return from malloc
* Fix a double free() in rlm_eap_tls.c
* Check return code of malloc() during initialization.
* Fix a corner case where the proxy port isn't set either in
radiusd.conf or in proxy.conf.

4 files changed, 41 insertions, 37 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 67e3b110de9..47a8ed9abcc 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/09/10 22:35:22 adrianp Exp $
+# $NetBSD: Makefile,v 1.56 2007/02/17 18:36:23 adrianp Exp $
 
 DISTNAME=	freeradius-${RADVER}
 CATEGORIES=	net
@@ -40,7 +40,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd/radacct \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 
-RADVER=			1.1.3
+RADVER=			1.1.4
 EGDIR=			${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
@@ -95,7 +95,7 @@ EGFILES=	acct_users attrs certs/demoCA/index.txt.old \
 		naslist naspasswd oraclesql.conf pgsql-voip.conf \
 		postgresql.conf preproxy_users proxy.conf \
 		realms snmp.conf sql.conf users radiusd.conf dictionary \
-		otp.conf otppasswd.sample
+		otp.conf sqlippool.conf
 
 .for f in ${EGFILES}
 CONF_FILES_PERMS+= 	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index ae41716d27e..98d0eb4dd70 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2006/09/10 22:35:22 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.20 2007/02/17 18:36:23 adrianp Exp $
 bin/radclient
 bin/radeapclient
 bin/radlast
@@ -244,7 +244,6 @@ share/examples/freeradius/naslist
 share/examples/freeradius/naspasswd
 share/examples/freeradius/oraclesql.conf
 share/examples/freeradius/otp.conf
-share/examples/freeradius/otppasswd.sample
 share/examples/freeradius/pgsql-voip.conf
 share/examples/freeradius/postgresql.conf
 share/examples/freeradius/preproxy_users
@@ -253,6 +252,7 @@ share/examples/freeradius/radiusd.conf
 share/examples/freeradius/realms
 share/examples/freeradius/snmp.conf
 share/examples/freeradius/sql.conf
+share/examples/freeradius/sqlippool.conf
 share/examples/freeradius/users
 share/examples/rc.d/radiusd
 share/freeradius/dictionary
@@ -282,7 +282,6 @@ share/freeradius/dictionary.colubris
 share/freeradius/dictionary.columbia_university
 share/freeradius/dictionary.compat
 share/freeradius/dictionary.cosine
-share/freeradius/dictionary.digest
 share/freeradius/dictionary.digium
 share/freeradius/dictionary.epygi
 share/freeradius/dictionary.ericsson
@@ -315,6 +314,7 @@ share/freeradius/dictionary.nomadix
 share/freeradius/dictionary.nortel
 share/freeradius/dictionary.ntua
 share/freeradius/dictionary.packeteer
+share/freeradius/dictionary.patton
 share/freeradius/dictionary.propel
 share/freeradius/dictionary.quintum
 share/freeradius/dictionary.redback
@@ -327,10 +327,13 @@ share/freeradius/dictionary.rfc2869
 share/freeradius/dictionary.rfc3162
 share/freeradius/dictionary.rfc3576
 share/freeradius/dictionary.rfc3580
+share/freeradius/dictionary.rfc4590
 share/freeradius/dictionary.riverstone
 share/freeradius/dictionary.roaringpenguin
+share/freeradius/dictionary.schulzrinne-sipping
 share/freeradius/dictionary.shasta
 share/freeradius/dictionary.shiva
+share/freeradius/dictionary.sofaware
 share/freeradius/dictionary.sonicwall
 share/freeradius/dictionary.springtide
 share/freeradius/dictionary.starent
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index cced8cb7b06..aa1b39b76a5 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.23 2006/09/10 22:35:22 adrianp Exp $
+$NetBSD: distinfo,v 1.24 2007/02/17 18:36:23 adrianp Exp $
 
-SHA1 (freeradius-1.1.3.tar.gz) = efd1d7d0f9bed69ec7c5e5a6a35477cb0b05bfb9
-RMD160 (freeradius-1.1.3.tar.gz) = 4ba264d2ed85e5300d48017d1e343b1db35fce90
-Size (freeradius-1.1.3.tar.gz) = 3068204 bytes
+SHA1 (freeradius-1.1.4.tar.gz) = e555c5dd555d9bbea74466558156d9f3e7b52f58
+RMD160 (freeradius-1.1.4.tar.gz) = 7f594557b27ada4f27dfc6d51f6c6b95a13edeee
+Size (freeradius-1.1.4.tar.gz) = 3088835 bytes
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
 SHA1 (patch-ae) = 8fa500de8c24ec4a8e3bfa043ebb2fb574b0fe7e
-SHA1 (patch-ai) = 96f98a20c6244b93023f83ce3dc260ac9ee96b8d
+SHA1 (patch-ai) = 361897e4083b5f7827f73dc7b4683027ac4f66e2
 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
 SHA1 (patch-ak) = 7be986e3949a6f8368f7e01ba93521fac48eff7d
diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai
index 3f74b69076b..2eb9c59a14c 100644
--- a/net/freeradius/patches/patch-ai
+++ b/net/freeradius/patches/patch-ai
@@ -1,43 +1,44 @@
-$NetBSD: patch-ai,v 1.8 2006/09/10 22:35:22 adrianp Exp $
+$NetBSD: patch-ai,v 1.9 2007/02/17 18:36:23 adrianp Exp $
 
---- configure.orig	2006-07-15 18:14:54.000000000 +0100
+--- configure.orig	2007-01-04 23:42:11.000000000 +0000
 +++ configure
-@@ -19321,13 +19321,13 @@ fi
- done
+@@ -19990,14 +19990,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
-+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
+-
+-  { 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
++echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; }
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS} $LIBS"
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -19386,7 +19386,7 @@ echo "$as_me:$LINENO: result: $ac_cv_lib
- echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
+@@ -20054,7 +20053,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"
 -                  LIBS="$LIBS -lpthread"
 +                  LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  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
-@@ -19528,7 +19528,7 @@ fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
- if test "$ac_cv_search_sem_init" = no; then
--  for ac_lib in pthread sem posix4 rt; do
-+  for ac_lib in pthread sem posix4 rt semaphore; do
-     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -19903,7 +19903,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
+   { 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 ();
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' pthread sem posix4 rt; do
++for ac_lib in '' pthread sem posix4 rt semaphore; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+@@ -20520,7 +20519,7 @@ if test "${ac_cv_lib_ssl_SSL_new+set}" =
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -46,9 +47,9 @@ $NetBSD: patch-ai,v 1.8 2006/09/10 22:35:22 adrianp Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23156,7 +23156,7 @@ gethostbyaddrrstyle=""
- echo "$as_me:$LINENO: checking gethostbyaddr_r() syntax" >&5
- echo $ECHO_N "checking gethostbyaddr_r() syntax... $ECHO_C" >&6
+@@ -23588,7 +23587,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*)