Update to 1.1.3:

This version has been released to fix build issues in 1.1.2. The build
tools (autoconf, libtool, libltld) have been upgraded to a recent version,
and the server now builds "out of the box" on more platforms. Other fixes
include:

  * More dictionary updates
  * Oracle support for radsqlrelay
  * Security and portability fixes to rlm_otp
  * Experimental module to store IP's in an SQL table.
  * Miscellaneous bug fixes

5 files changed, 61 insertions, 93 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 6e5c1557473..67e3b110de9 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2006/08/11 16:22:04 adrianp Exp $
+# $NetBSD: Makefile,v 1.55 2006/09/10 22:35:22 adrianp Exp $
 
 DISTNAME=	freeradius-${RADVER}
-PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -41,7 +40,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd/radacct \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 
-RADVER=			1.1.2
+RADVER=			1.1.3
 EGDIR=			${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index abd3fc6fc4e..ae41716d27e 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2006/08/09 16:42:09 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.19 2006/09/10 22:35:22 adrianp Exp $
 bin/radclient
 bin/radeapclient
 bin/radlast
@@ -198,13 +198,13 @@ share/doc/freeradius/rlm_eap
 share/doc/freeradius/rlm_fastusers
 share/doc/freeradius/rlm_krb5
 share/doc/freeradius/rlm_ldap
-share/doc/freeradius/rlm_otp
 share/doc/freeradius/rlm_pam
 share/doc/freeradius/rlm_passwd
 share/doc/freeradius/rlm_python
 share/doc/freeradius/rlm_sim_triplets
 share/doc/freeradius/rlm_sql
 share/doc/freeradius/rlm_sqlcounter
+share/doc/freeradius/rlm_sqlippool
 share/doc/freeradius/supervise-radiusd.txt
 share/doc/freeradius/tuning_guide
 share/doc/freeradius/variables.txt
@@ -264,6 +264,7 @@ share/freeradius/dictionary.airespace
 share/freeradius/dictionary.alcatel
 share/freeradius/dictionary.alteon
 share/freeradius/dictionary.altiga
+share/freeradius/dictionary.alvarion
 share/freeradius/dictionary.aptis
 share/freeradius/dictionary.aruba
 share/freeradius/dictionary.ascend
@@ -326,6 +327,7 @@ share/freeradius/dictionary.rfc2869
 share/freeradius/dictionary.rfc3162
 share/freeradius/dictionary.rfc3576
 share/freeradius/dictionary.rfc3580
+share/freeradius/dictionary.riverstone
 share/freeradius/dictionary.roaringpenguin
 share/freeradius/dictionary.shasta
 share/freeradius/dictionary.shiva
@@ -335,10 +337,12 @@ share/freeradius/dictionary.starent
 share/freeradius/dictionary.t_systems_nova
 share/freeradius/dictionary.telebit
 share/freeradius/dictionary.trapeze
+share/freeradius/dictionary.tropos
 share/freeradius/dictionary.unix
 share/freeradius/dictionary.usr
 share/freeradius/dictionary.valemount
 share/freeradius/dictionary.versanet
+share/freeradius/dictionary.walabi
 share/freeradius/dictionary.waverider
 share/freeradius/dictionary.wispr
 share/freeradius/dictionary.xedia
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 060757dac1f..cced8cb7b06 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2006/08/10 10:55:52 adrianp Exp $
+$NetBSD: distinfo,v 1.23 2006/09/10 22:35:22 adrianp Exp $
 
-SHA1 (freeradius-1.1.2.tar.gz) = 0636c1afb14fc22e78ecb83aeaf63150d515d73d
-RMD160 (freeradius-1.1.2.tar.gz) = 3c0960bd30d29af9bab699ee7a38c22ec0472eb5
-Size (freeradius-1.1.2.tar.gz) = 2389227 bytes
+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 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
-SHA1 (patch-ae) = cf3497723b15b8a61c5458f312697a2d4a147439
-SHA1 (patch-ai) = 128c5984464241294b201384d43a287e9bcb147e
+SHA1 (patch-ae) = 8fa500de8c24ec4a8e3bfa043ebb2fb574b0fe7e
+SHA1 (patch-ai) = 96f98a20c6244b93023f83ce3dc260ac9ee96b8d
 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
 SHA1 (patch-ak) = 7be986e3949a6f8368f7e01ba93521fac48eff7d
diff --git a/net/freeradius/patches/patch-ae b/net/freeradius/patches/patch-ae
index 3c2d8ca1e01..7177c623750 100644
--- a/net/freeradius/patches/patch-ae
+++ b/net/freeradius/patches/patch-ae
@@ -1,17 +1,17 @@
-$NetBSD: patch-ae,v 1.4 2006/07/14 22:10:01 adrianp Exp $
+$NetBSD: patch-ae,v 1.5 2006/09/10 22:35:22 adrianp Exp $
 
---- Makefile.orig	2006-05-25 17:24:40.000000000 +0100
+--- Makefile.orig	2006-06-23 05:31:58.000000000 +0100
 +++ Makefile
 @@ -11,7 +11,7 @@ include Make.inc
  
  .PHONY: all clean install
  
--SUBDIRS		= ${LIBLTDLPATH} src raddb scripts doc
-+SUBDIRS		= ${LIBLTDLPATH} src scripts doc
+-SUBDIRS		= $(LTDL_SUBDIRS) src raddb scripts doc
++SUBDIRS		= $(LTDL_SUBDIRS) src scripts doc
  WHAT_TO_MAKE	= all
  
  all:
-@@ -38,9 +38,7 @@ clean:
+@@ -42,9 +42,7 @@ export DESTDIR := $(R)
  install:
  	$(INSTALL) -d -m 755	$(R)$(sbindir)
  	$(INSTALL) -d -m 755	$(R)$(bindir)
diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai
index ebc282bb290..3f74b69076b 100644
--- a/net/freeradius/patches/patch-ai
+++ b/net/freeradius/patches/patch-ai
@@ -1,92 +1,57 @@
-$NetBSD: patch-ai,v 1.7 2006/07/14 22:10:01 adrianp Exp $
+$NetBSD: patch-ai,v 1.8 2006/09/10 22:35:22 adrianp Exp $
 
---- configure.orig	2006-05-21 18:35:25.000000000 +0100
+--- configure.orig	2006-07-15 18:14:54.000000000 +0100
 +++ configure
-@@ -1936,13 +1936,13 @@ darwin* | rhapsody*)
-   esac
-   ;;
- 
--freebsd*)
-+freebsd*|dragonfly*)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-       # Not sure whether the presence of OpenBSD here was a mistake.
-       # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|DragonFly|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-       lt_cv_file_magic_cmd=/usr/bin/file
-       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-@@ -3702,7 +3702,7 @@ else
-     ;;
- 
-   # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
-+  freebsd*|dragonfly*)
-     archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-     hardcode_libdir_flag_spec='-R$libdir'
-     hardcode_direct=yes
-@@ -4157,7 +4157,7 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
-+freebsd*|dragonfly*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-   case $version_type in
-@@ -6266,14 +6266,14 @@ fi
+@@ -19321,13 +19321,13 @@ fi
  done
  
  
--  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:6271: checking for pthread_create in -lpthread" >&5
-+  echo $ac_n "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}""... $ac_c" 1>&6
-+echo "configure:6271: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
- ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&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_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpthread  $LIBS"
-+LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6279 "configure"
- #include "confdefs.h"
-@@ -6302,7 +6302,7 @@ fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
++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
+ 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}" 
+-                  LIBS="$LIBS -lpthread"
++                  LIBS="$LIBS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
  else
-   echo "$ac_t""no" 1>&6
- echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-@@ -6386,7 +6386,7 @@ else
-   cat conftest.$ac_ext >&5
- fi
- rm -f conftest*
--test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt; do
-+test "$ac_cv_search_sem_init" = "no" && for i in pthread sem posix4 rt semaphore; do
- LIBS="-l$i  $ac_func_search_save_LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6393 "configure"
-@@ -6619,7 +6619,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
-   echo $ac_n "(cached) $ac_c" 1>&6
+   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 $ECHO_N "(cached) $ECHO_C" >&6
  else
-   ac_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lssl  $LIBS"
-+LIBS="-lssl -lcrypto  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 6625 "configure"
- #include "confdefs.h"
-@@ -8423,7 +8423,7 @@ gethostbyaddrrstyle=""
- echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6
- echo "configure:8425: checking gethostbyaddr_r() syntax" >&5
++LIBS="-lssl -lcrypto $LIBS"
+ 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
  case "$host" in
 -*-freebsd*)
 +*-freebsd* | *-dragonfly*)
- 	cat >> confdefs.h <<\EOF
+ 	cat >>confdefs.h <<\_ACEOF
  #define GETHOSTBYADDRRSTYLE BSDSTYLE
- EOF
+ _ACEOF