Update to 1.1.2

* Updated dictionaries (as always),
* Extended Ascend "abinary" support for Juniper,
* Configurable "cipher_list" for EAP methods that use TLS,
* Additional checks on cert issuer validation for EAP methods that use TLS,
* SQL IODBC bug fixes,
* Updates to the LDAP module,
* Better catching of errors in the config files,
* Miscellaneous other fixes

In addition to this add an extra option to options.mk which is
"freeradius-simul-use".  This will enable Simultaneous-Use and is
enabled by default.  If you disable it freeradius can be built without
depending on the net-snmp package.  Original idea from John Nemeth.

6 files changed, 47 insertions, 37 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 9d1bc943b80..ab641d0d1b9 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2006/07/13 22:20:35 adrianp Exp $
+# $NetBSD: Makefile,v 1.51 2006/07/14 22:10:01 adrianp Exp $
 
-DISTNAME=	freeradius-1.1.1
-PKGREVISION=	4
+DISTNAME=	freeradius-1.1.2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -82,7 +81,6 @@ CONF_FILES+= 	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
-.include "../../net/net-snmp/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST
index 1371c94430a..01cc85f5970 100644
--- a/net/freeradius/PLIST
+++ b/net/freeradius/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/04/10 15:25:04 joerg Exp $
+@comment $NetBSD: PLIST,v 1.17 2006/07/14 22:10:01 adrianp Exp $
 bin/radclient
 bin/radeapclient
 bin/radlast
@@ -282,6 +282,7 @@ 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
 share/freeradius/dictionary.erx
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 9797f38f328..1c8558e37f0 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2006/03/22 20:53:41 joerg Exp $
+$NetBSD: distinfo,v 1.21 2006/07/14 22:10:01 adrianp Exp $
 
-SHA1 (freeradius-1.1.1.tar.gz) = efc52b20fa88148b8ebf58fa0ae5c36df204b703
-RMD160 (freeradius-1.1.1.tar.gz) = f9947c299ec2a7d0189d0718edf10c8dc5783119
-Size (freeradius-1.1.1.tar.gz) = 2358196 bytes
+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 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
-SHA1 (patch-ae) = 0c1b6c79329f41c35e3a783e61cc205cb78a4773
-SHA1 (patch-ai) = b8259ea89acc0bd9e14fe4c84ecc79c6ce98bea3
+SHA1 (patch-ae) = cf3497723b15b8a61c5458f312697a2d4a147439
+SHA1 (patch-ai) = 128c5984464241294b201384d43a287e9bcb147e
 SHA1 (patch-aj) = 422c9dfbde08c26acf41a040c57508ab9725004e
diff --git a/net/freeradius/options.mk b/net/freeradius/options.mk
index 95c121d5a09..6833122fe15 100644
--- a/net/freeradius/options.mk
+++ b/net/freeradius/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.9 2006/07/13 22:20:35 adrianp Exp $
+# $NetBSD: options.mk,v 1.10 2006/07/14 22:10:01 adrianp Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.freeradius
 
 PKG_OPTIONS_OPTIONAL_GROUPS=	dbm
 PKG_OPTIONS_GROUP.dbm=	bdb gdbm
 
-PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql snmp kerberos
-PKG_SUGGESTED_OPTIONS=	gdbm
+PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql snmp kerberos freeradius-simul-use
+PKG_SUGGESTED_OPTIONS=	gdbm freeradius-simul-use
 
 .include "../../mk/bsd.options.mk"
 
@@ -70,6 +70,7 @@ CONFIGURE_ARGS+=	--without-rlm_sql_mysql
 ###
 ###
 .if !empty(PKG_OPTIONS:Msnmp)
+.  include "../../net/net-snmp/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-snmp
 .else
 CONFIGURE_ARGS+=	--without-snmp
@@ -88,3 +89,13 @@ PLIST_SRC+=		${PKGDIR}/PLIST.kerberos
 .else
 CONFIGURE_ARGS+=	--without-rlm_krb5
 .endif
+
+###
+### Enable Simultaneous-Use which needs snmpwalk and snmpget
+###
+.if !empty(PKG_OPTIONS:Mfreeradius-simul-use)
+.  include "../../net/net-snmp/buildlink3.mk"
+.else
+CONFIGURE_ENV+=	ac_cv_path_SNMPGET=""
+CONFIGURE_ENV+=	ac_cv_path_SNMPWALK=""
+.endif
diff --git a/net/freeradius/patches/patch-ae b/net/freeradius/patches/patch-ae
index 3cb277c9c99..3c2d8ca1e01 100644
--- a/net/freeradius/patches/patch-ae
+++ b/net/freeradius/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2004/09/23 19:51:22 adrianp Exp $
+$NetBSD: patch-ae,v 1.4 2006/07/14 22:10:01 adrianp Exp $
 
---- Makefile.orig	2004-06-09 18:31:11.000000000 +0100
-+++ Makefile	2004-09-14 20:50:36.000000000 +0100
-@@ -11,7 +11,7 @@
+--- Makefile.orig	2006-05-25 17:24:40.000000000 +0100
++++ Makefile
+@@ -11,7 +11,7 @@ include Make.inc
  
  .PHONY: all clean install
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.3 2004/09/23 19:51:22 adrianp Exp $
  WHAT_TO_MAKE	= all
  
  all:
-@@ -38,9 +38,7 @@
+@@ -38,9 +38,7 @@ clean:
  install:
  	$(INSTALL) -d -m 755	$(R)$(sbindir)
  	$(INSTALL) -d -m 755	$(R)$(bindir)
@@ -20,4 +20,4 @@ $NetBSD: patch-ae,v 1.3 2004/09/23 19:51:22 adrianp Exp $
 -	$(INSTALL) -d -m 755	$(R)$(RUNDIR)
  	$(INSTALL) -d -m 700	$(R)$(logdir)
  	$(INSTALL) -d -m 700	$(R)$(radacctdir)
- 	$(INSTALL) -d -m 700	$(R)$(datadir)
+ 	$(INSTALL) -d -m 755	$(R)$(datadir)
diff --git a/net/freeradius/patches/patch-ai b/net/freeradius/patches/patch-ai
index 9487dcb127b..ebc282bb290 100644
--- a/net/freeradius/patches/patch-ai
+++ b/net/freeradius/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
+$NetBSD: patch-ai,v 1.7 2006/07/14 22:10:01 adrianp Exp $
 
---- configure.orig	2006-02-06 12:55:53.000000000 +0000
+--- configure.orig	2006-05-21 18:35:25.000000000 +0100
 +++ configure
-@@ -1934,13 +1934,13 @@ darwin* | rhapsody*)
+@@ -1936,13 +1936,13 @@ darwin* | rhapsody*)
    esac
    ;;
  
@@ -18,7 +18,7 @@ $NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -3700,7 +3700,7 @@ else
+@@ -3702,7 +3702,7 @@ else
      ;;
  
    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -27,7 +27,7 @@ $NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
      hardcode_libdir_flag_spec='-R$libdir'
      hardcode_direct=yes
-@@ -4155,7 +4155,7 @@ freebsd1*)
+@@ -4157,7 +4157,7 @@ freebsd1*)
    dynamic_linker=no
    ;;
  
@@ -36,14 +36,14 @@ $NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -6252,14 +6252,14 @@ fi
+@@ -6266,14 +6266,14 @@ fi
  done
  
  
 -  echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
--echo "configure:6257: checking for pthread_create in -lpthread" >&5
+-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:6257: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
++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
@@ -52,9 +52,9 @@ $NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
 -LIBS="-lpthread  $LIBS"
 +LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 6265 "configure"
+ #line 6279 "configure"
  #include "confdefs.h"
-@@ -6288,7 +6288,7 @@ fi
+@@ -6302,7 +6302,7 @@ fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
     CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
@@ -63,7 +63,7 @@ $NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-@@ -6372,7 +6372,7 @@ else
+@@ -6386,7 +6386,7 @@ else
    cat conftest.$ac_ext >&5
  fi
  rm -f conftest*
@@ -71,19 +71,19 @@ $NetBSD: patch-ai,v 1.6 2006/03/22 20:53:41 joerg Exp $
 +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 6379 "configure"
-@@ -6605,7 +6605,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
+ #line 6393 "configure"
+@@ -6619,7 +6619,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lssl  $LIBS"
-+LIBS="-lssl -lcrypto $LIBS"
++LIBS="-lssl -lcrypto  $LIBS"
  cat > conftest.$ac_ext <<EOF
- #line 6611 "configure"
+ #line 6625 "configure"
  #include "confdefs.h"
-@@ -8407,7 +8407,7 @@ gethostbyaddrrstyle=""
+@@ -8423,7 +8423,7 @@ gethostbyaddrrstyle=""
  echo $ac_n "checking gethostbyaddr_r() syntax""... $ac_c" 1>&6
- echo "configure:8409: checking gethostbyaddr_r() syntax" >&5
+ echo "configure:8425: checking gethostbyaddr_r() syntax" >&5
  case "$host" in
 -*-freebsd*)
 +*-freebsd* | *-dragonfly*)