4 files changed, 842 insertions, 22 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index a534e2209401..0f10787944b0 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	freeradius
-DISTVERSION=	2.1.9
-PORTREVISION=	1
+DISTVERSION=	2.1.10
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -77,6 +76,8 @@ RADIUS_GROUP=	freeradius
 USERS=		${RADIUS_USER}
 GROUPS=		${RADIUS_GROUP}
 
+CONFIGURE_ARGS+=	--with-system-libtool --with-system-libltdl --disable-ltdl-install
+
 .if defined(WITH_HEIMDAL) && !defined(WITH_KERBEROS)
 WITH_KERBEROS=	yes
 .endif
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index 0f7c1dd581a4..0d4a22808af7 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeradius-server-2.1.9.tar.bz2) = 5e16a0869acdf448b191c7e30f6507d8
-SHA256 (freeradius-server-2.1.9.tar.bz2) = b0b7c5fe334e826e2f643569485ce203520ecb1d058d42b8df2a94a73acb05b1
-SIZE (freeradius-server-2.1.9.tar.bz2) = 2524497
+MD5 (freeradius-server-2.1.10.tar.bz2) = 8ea2bd39460a06212decf2c14fdf3fb8
+SHA256 (freeradius-server-2.1.10.tar.bz2) = 8c56356cec5fd33522d86118a1065e004cce6735f0889146526f9839261fee9e
+SIZE (freeradius-server-2.1.10.tar.bz2) = 2545578
diff --git a/net/freeradius2/files/patch-rlm_sql_oracle b/net/freeradius2/files/patch-rlm_sql_oracle
new file mode 100644
index 000000000000..2672c4430acf
--- /dev/null
+++ b/net/freeradius2/files/patch-rlm_sql_oracle
@@ -0,0 +1,805 @@
+diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure src/modules/rlm_sql/drivers/rlm_sql_oracle/configure
+--- ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	2010-09-28 07:03:56.000000000 -0400
++++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	2010-05-24 01:40:58.000000000 -0400
+@@ -1,5 +1,5 @@
+ #! /bin/sh
+-# From configure.in Revision: 1.10 .
++# From configure.in Revision.
+ # Guess values for system-dependent variables and create Makefiles.
+ # Generated by GNU Autoconf 2.61.
+ #
+@@ -1201,23 +1201,6 @@
+ 
+   cat <<\_ACEOF
+ 
+-Optional Packages:
+-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+-  --with-oracle-include-dir=DIR
+-                          Directory where the Oracle includes may be found. It
+-                          should be located under ORACLE_HOME if you have
+-                          client SDK installed. Use
+-                          --with-oracle-include-dir=yes if you are sure that
+-                          your compiler include path includes Oracle include
+-                          dir. Hint: you might try to do: locate oci.h
+-  --with-oracle-lib-dir=DIR
+-                          Directory where the oracle libraries may be found.
+-                          It should be located under ORACLE_HOME. iUse
+-                          --with-oracle-lib-dir=yes if you are sure that your
+-                          linker will find the necessary Oracle client libs.
+-                          Hint: you might try to do: locate libclntsh.so
+-
+ Some influential environment variables:
+   CC          C compiler command
+   CFLAGS      C compiler flags
+@@ -1661,47 +1644,6 @@
+ echo $ECHO_N "checking for oci.h... $ECHO_C" >&6; }
+ 
+ 
+-
+-		oracle_include_dir=
+-
+-# Check whether --with-oracle-include-dir was given.
+-if test "${with_oracle_include_dir+set}" = set; then
+-  withval=$with_oracle_include_dir; case "$withval" in
+-			no)
+-			    { { echo "$as_me:$LINENO: error: Need oracle-include-dir" >&5
+-echo "$as_me: error: Need oracle-include-dir" >&2;}
+-   { (exit 1); exit 1; }; }
+-			    ;;
+-			yes)
+-			    ;;
+-			*)
+-			    oracle_include_dir="$withval"
+-			    ;;
+-		esac
+-fi
+-
+-
+-		oracle_lib_dir=
+-
+-# Check whether --with-oracle-lib-dir was given.
+-if test "${with_oracle_lib_dir+set}" = set; then
+-  withval=$with_oracle_lib_dir; case "$withval" in
+-			no)
+-			    { { echo "$as_me:$LINENO: error: Need oracle-lib-dir" >&5
+-echo "$as_me: error: Need oracle-lib-dir" >&2;}
+-   { (exit 1); exit 1; }; }
+-			    ;;
+-			yes)
+-			    ;;
+-			*)
+-			    oracle_lib_dir="$withval"
+-			    ;;
+-        esac
+-fi
+-
+-
+-
+-
+ 	ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -2665,11 +2607,41 @@
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-	RLM_SQL_ORA_WORKING_CFLAGS_FOR_LINKING_TEST=
+-	if test "x$ORACLE_INCLUDE" = "x" ; then
+-		old_CFLAGS="$CFLAGS"
+-		CFLAGS="$old_CFLAGS -I$oracle_include_dir"
+-		cat >conftest.$ac_ext <<_ACEOF
++        # Look for Oracle10g "Instant Client" installed from RPM
++        if test "x$ORACLE_INCLUDE" = "x"; then
++                old_CFLAGS="$CFLAGS"
++
++
++
++if test "x$LOCATE" != "x"; then
++        DIRS=
++  file=oci.h
++
++  for x in `${LOCATE} $file 2>/dev/null`; do
++                                        base=`echo $x | sed "s%/${file}%%"`
++    if test "x$x" = "x$base"; then
++      continue;
++    fi
++
++    dir=`${DIRNAME} $x 2>/dev/null`
++                exclude=`echo ${dir} | ${GREP} /home`
++    if test "x$exclude" != "x"; then
++      continue
++    fi
++
++                    already=`echo \$oracle_include_dir ${DIRS} | ${GREP} ${dir}`
++    if test "x$already" = "x"; then
++      DIRS="$DIRS $dir"
++    fi
++  done
++fi
++
++eval "oracle_include_dir=\"\$oracle_include_dir $DIRS\""
++
++
++                for try in /usr/include/oracle/10.1.0.3/client $oracle_include_dir; do
++                        CFLAGS="$old_CFLAGS -I$try"
++                        cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -2701,7 +2673,7 @@
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        } && test -s conftest.$ac_objext; then
+-  ORACLE_INCLUDE="-I$oracle_include_dir"
++  ORACLE_INCLUDE="-I$try"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2711,65 +2683,207 @@
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++                        if test "x$ORACLE_INCLUDE" != "x"; then
++                                ORACLE_LIBS="-L$/usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lm"
++                                break;
++                        fi
++                done
++                CFLAGS="$old_CFLAGS"
++        fi
++        # Finish Looking for Oracle10g includes installed from RPM
+ 
+-		RLM_SQL_ORA_WORKING_CFLAGS_FOR_LINKING_TEST="$CFLAGS"
+-		CFLAGS="$old_CFLAGS"
+-	fi
+-
+-	# Proceed to linking makes only sense if include dir is OK.
+-	if test "x$ORACLE_INCLUDE" != "x" ; then
+-		old_LIBS="$LIBS"
++	# Look for Oracle8i.
++	if test "x$ORACLE_INCLUDE" = "x"; then
+ 		old_CFLAGS="$CFLAGS"
+-		CFLAGS="$RLM_SQL_ORA_WORKING_CFLAGS_FOR_LINKING_TEST"
+ 
+-		ORACLE_LIBDIR_SWITCH=
+-		if test "x$oracle_lib_dir" != "x" ; then
+-			ORACLE_LIBDIR_SWITCH="-L${oracle_lib_dir} "
+-		fi
+-		LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz10"
+-		cat >conftest.$ac_ext <<_ACEOF
++
++
++if test "x$LOCATE" != "x"; then
++        DIRS=
++  file=oci.h
++
++  for x in `${LOCATE} $file 2>/dev/null`; do
++                                        base=`echo $x | sed "s%/${file}%%"`
++    if test "x$x" = "x$base"; then
++      continue;
++    fi
++
++    dir=`${DIRNAME} $x 2>/dev/null`
++                exclude=`echo ${dir} | ${GREP} /home`
++    if test "x$exclude" != "x"; then
++      continue
++    fi
++
++                    already=`echo \$oracle_home_dir ${DIRS} | ${GREP} ${dir}`
++    if test "x$already" = "x"; then
++      DIRS="$DIRS $dir"
++    fi
++  done
++fi
++
++eval "oracle_home_dir=\"\$oracle_home_dir $DIRS\""
++
++
++		for try in $oracle_home_dir $oracle_include_dir; do
++			CFLAGS="$old_CFLAGS -I${try}/rdbms/demo -I${try}/rdbms/public -I${try}/plsql/public -I${try}/network/public -I${try}/oci/include"
++			cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <oci.h>
++int
++main ()
++{
++ int a = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  OHOME=$try
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-				static OCIEnv           *p_env;
+-				static OCIError         *p_err;
+-				static OCISvcCtx        *p_svc;
+-				static OCIStmt          *p_sql;
+-				static OCIDefine        *p_dfn    = (OCIDefine *) 0;
+-				static OCIBind          *p_bnd    = (OCIBind *) 0;
++	OHOME=
+ 
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++			if test "x$OHOME" != "x"; then
++				break;
++			fi
++		done
++
++		if test "x$OHOME" = "x" -a "x$ORACLE_HOME" != "x"; then
++			CFLAGS="$old_CFLAGS -I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I${ORACLE_HOME}/network/public -I${ORACLE_HOME}/oci/include"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <oci.h>
+ int
+ main ()
+ {
++ int a = 1;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  OHOME=$ORACLE_HOME
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	OHOME=
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++		fi
++
++		CFLAGS="$old_CFLAGS"
++
++		if test "x$OHOME" != "x"; then
++			ORACLE_HOME=$OHOME
++			ORACLE_INCLUDE="-I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I${ORACLE_HOME}/network/public -I${ORACLE_HOME}/oci/include"
++		fi
++	fi     ##  this section sets $ORACLE_HOME, if found.
++
++	# not Oracle8i, try older.
++	if test "x$ORACLE_INCLUDE" = "x"; then
++		old_CFLAGS="$CFLAGS"
+ 
+-				  int             p_bvi;
+-				  char            p_sli[20];
+-				  int             rc;
+-				  char            errbuf[100];
+-				  int             errcode;
+-
+-				  rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid *)0,  /* Initialize OCI */
+-				          (dvoid * (*)(dvoid *, size_t)) 0,
+-				          (dvoid * (*)(dvoid *, dvoid *, size_t))0,
+-				          (void (*)(dvoid *, dvoid *)) 0 );
+ 
+ 
++if test "x$LOCATE" != "x"; then
++        DIRS=
++  file=oci.h
++
++  for x in `${LOCATE} $file 2>/dev/null`; do
++                                        base=`echo $x | sed "s%/${file}%%"`
++    if test "x$x" = "x$base"; then
++      continue;
++    fi
++
++    dir=`${DIRNAME} $x 2>/dev/null`
++                exclude=`echo ${dir} | ${GREP} /home`
++    if test "x$exclude" != "x"; then
++      continue
++    fi
++
++                    already=`echo \$oracle_include_dir ${DIRS} | ${GREP} ${dir}`
++    if test "x$already" = "x"; then
++      DIRS="$DIRS $dir"
++    fi
++  done
++fi
++
++eval "oracle_include_dir=\"\$oracle_include_dir $DIRS\""
++
++
++		for try in /usr/local/include/oracle /usr/local/oracle/include $oracle_include_dir; do
++			CFLAGS="$old_CFLAGS -I$try"
++			cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <oci.h>
++int
++main ()
++{
++ int a = 1;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_link") 2>conftest.er1
++  (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+@@ -2778,30 +2892,29 @@
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext &&
+-       $as_test_x conftest$ac_exeext; then
+-  ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz10"
++       } && test -s conftest.$ac_objext; then
++  ORACLE_INCLUDE="-I$try"
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ORACLE_LIBS=
++	ORACLE_INCLUDE=
+ 
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-
+-		LIBS="$old_LIBS"
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++			if test "x$ORACLE_INCLUDE" != "x"; then
++				break;
++			fi
++		done
+ 		CFLAGS="$old_CFLAGS"
+ 	fi
+ 
+-
+ 	if test "x$ORACLE_INCLUDE" = "x"; then
+ 		{ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+-		{ echo "$as_me:$LINENO: WARNING: oracle headers not found.  Use --with-oracle-include-dir=<path>." >&5
+-echo "$as_me: WARNING: oracle headers not found.  Use --with-oracle-include-dir=<path>." >&2;}
++		{ echo "$as_me:$LINENO: WARNING: oracle headers not found.  Use --with-oracle-home-dir=<path>." >&5
++echo "$as_me: WARNING: oracle headers not found.  Use --with-oracle-home-dir=<path>." >&2;}
+ 		fail="$fail oci.h"
+ 	else
+ 		sql_oracle_cflags="${sql_oracle_cflags} ${ORACLE_INCLUDE}"
+@@ -2809,12 +2922,139 @@
+ echo "${ECHO_T}yes" >&6; }
+ 
+ 
++		## is this set, from above?
++		if test "x$ORACLE_HOME" != "x"; then
++			## we must have an Oracle8i tree
++
++			# FIXME: we might do some checking, just to be nice
++			ORACLE_LIBS="-L$ORACLE_HOME/lib -lclntsh -lm"
++
++		else
++			{ echo "$as_me:$LINENO: checking for oracle_init in -loracleclient" >&5
++echo $ECHO_N "checking for oracle_init in -loracleclient... $ECHO_C" >&6; }
++
++												old_LIBS="$LIBS"
++
++
++
++if test "x$LOCATE" != "x"; then
++        DIRS=
++  file=oracleclient.so
++
++  for x in `${LOCATE} $file 2>/dev/null`; do
++                                        base=`echo $x | sed "s%/${file}%%"`
++    if test "x$x" = "x$base"; then
++      continue;
++    fi
++
++    dir=`${DIRNAME} $x 2>/dev/null`
++                exclude=`echo ${dir} | ${GREP} /home`
++    if test "x$exclude" != "x"; then
++      continue
++    fi
++
++                    already=`echo \$oracle_lib_dir ${DIRS} | ${GREP} ${dir}`
++    if test "x$already" = "x"; then
++      DIRS="$DIRS $dir"
++    fi
++  done
++fi
++
++eval "oracle_lib_dir=\"\$oracle_lib_dir $DIRS\""
++
++
++
++if test "x$LOCATE" != "x"; then
++        DIRS=
++  file=oracleclient.a
++
++  for x in `${LOCATE} $file 2>/dev/null`; do
++                                        base=`echo $x | sed "s%/${file}%%"`
++    if test "x$x" = "x$base"; then
++      continue;
++    fi
++
++    dir=`${DIRNAME} $x 2>/dev/null`
++                exclude=`echo ${dir} | ${GREP} /home`
++    if test "x$exclude" != "x"; then
++      continue
++    fi
++
++                    already=`echo \$oracle_lib_dir ${DIRS} | ${GREP} ${dir}`
++    if test "x$already" = "x"; then
++      DIRS="$DIRS $dir"
++    fi
++  done
++fi
++
++eval "oracle_lib_dir=\"\$oracle_lib_dir $DIRS\""
++
++
++			for try in /usr/lib/oracle /usr/local/lib/oracle /usr/local/oracle/lib $oracle_lib_dir; do
++				LIBS="$old_LIBS -L$try -loracleclient"
++				cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++extern char oracle_init();
++int
++main ()
++{
++ oracle_init()
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_link") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++  ORACLE_LIBS="-L$try -loracleclient"
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ORACLE_LIBS=
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++				if test "x$ORACLE_LIBS" != "x"; then
++					break;
++				fi
++			done
++			LIBS="$old_LIBS"
++
++																		if test "x$ORACLE_LIBS" = "x"; then
++				{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++				ORACLE_INCLUDE=
++			fi
++		fi
++
+ 		if test "x$ORACLE_LIBS" = "x"; then
+ 			{ echo "$as_me:$LINENO: WARNING: oracle libraries not found.  Use --with-oracle-lib-dir=<path>." >&5
+ echo "$as_me: WARNING: oracle libraries not found.  Use --with-oracle-lib-dir=<path>." >&2;}
+-			fail="$fail libclntsh libnnz10"
++			fail="$fail liboracleclient"
+ 		else
+-			sql_oracle_ldflags="${sql_oracle_ldflags} $ORACLE_LIBS"
++			sql_oracle_ldflags="$sql_oracle_ldflags $ORACLE_LIBS"
+ 			{ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 		fi
+diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in
+--- ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2010-09-28 07:03:56.000000000 -0400
++++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2010-05-24 01:40:58.000000000 -0400
+@@ -1,5 +1,5 @@
+ AC_INIT(sql_oracle.c)
+-AC_REVISION($Revision: 1.10 $)
++AC_REVISION($Revision$)
+ AC_DEFUN(modname,[rlm_sql_oracle])
+ 
+ fail=
+@@ -18,120 +18,145 @@
+ 	dnl # defined anyways.
+ 	dnl #
+ 
+-	dnl ############################################################
+-	dnl # Check for command line options
+-	dnl ############################################################
+-
+-	dnl extra argument: --with-oracle-include-dir=DIR
+-	oracle_include_dir=
+-	AC_ARG_WITH(oracle-include-dir,
+-		[AS_HELP_STRING([--with-oracle-include-dir=DIR],
+-			    [Directory where the Oracle includes may be found. It should be located under ORACLE_HOME if you have client SDK installed. Use --with-oracle-include-dir=yes if you are sure that your compiler include path includes Oracle include dir. Hint: you might try to do: locate oci.h])],
+-		[case "$withval" in
+-			no)
+-			    AC_MSG_ERROR(Need oracle-include-dir)
+-			    ;;
+-			yes)
+-			    ;;
+-			*)
+-			    oracle_include_dir="$withval"
+-			    ;;
+-		esac])
+-
+-	dnl extra argument: --with-oracle-lib-dir=DIR
+-	oracle_lib_dir=
+-	AC_ARG_WITH(oracle-lib-dir,
+-		[AS_HELP_STRING([--with-oracle-lib-dir=DIR],
+-			    [Directory where the oracle libraries may be found. It should be located under ORACLE_HOME. iUse --with-oracle-lib-dir=yes if you are sure that your linker will find the necessary Oracle client libs. Hint: you might try to do: locate libclntsh.so])],
+-		[case "$withval" in
+-			no)
+-			    AC_MSG_ERROR(Need oracle-lib-dir)
+-			    ;;
+-			yes)
+-			    ;;
+-			*)
+-			    oracle_lib_dir="$withval"
+-			    ;;
+-        esac])
+-
+-
+-
+ 	AC_TRY_COMPILE([#include <oci.h>],
+ 		[ int a = 1;],
+ 		ORACLE_INCLUDE=" ",
+ 		ORACLE_INCLUDE=
+ 	)
+ 
+-	RLM_SQL_ORA_WORKING_CFLAGS_FOR_LINKING_TEST=
+-	if test "x$ORACLE_INCLUDE" = "x" ; then
++        # Look for Oracle10g "Instant Client" installed from RPM
++        if test "x$ORACLE_INCLUDE" = "x"; then
++                old_CFLAGS="$CFLAGS"
++
++                FR_LOCATE_DIR(oracle_include_dir,oci.h)
++
++                for try in /usr/include/oracle/10.1.0.3/client $oracle_include_dir; do
++                        CFLAGS="$old_CFLAGS -I$try"
++                        AC_TRY_COMPILE([#include <oci.h>],
++                                [ int a = 1; ],
++                                ORACLE_INCLUDE="-I$try",
++                                ORACLE_INCLUDE=
++                        )
++                        if test "x$ORACLE_INCLUDE" != "x"; then
++                                ORACLE_LIBS="-L$/usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lm"
++                                break;
++                        fi
++                done
++                CFLAGS="$old_CFLAGS"
++        fi
++        # Finish Looking for Oracle10g includes installed from RPM
++
++	# Look for Oracle8i.
++	if test "x$ORACLE_INCLUDE" = "x"; then
+ 		old_CFLAGS="$CFLAGS"
+-		CFLAGS="$old_CFLAGS -I$oracle_include_dir"
+-		AC_TRY_COMPILE([#include <oci.h>],
+-			[ int a = 1;],
+-			ORACLE_INCLUDE="-I$oracle_include_dir",
+-			ORACLE_INCLUDE=
+-		)
+ 
+-		RLM_SQL_ORA_WORKING_CFLAGS_FOR_LINKING_TEST="$CFLAGS"
++		FR_LOCATE_DIR(oracle_home_dir,oci.h)
++
++		for try in $oracle_home_dir $oracle_include_dir; do
++			CFLAGS="$old_CFLAGS -I${try}/rdbms/demo -I${try}/rdbms/public -I${try}/plsql/public -I${try}/network/public -I${try}/oci/include"
++			AC_TRY_COMPILE([#include <oci.h>],
++				[ int a = 1; ],
++				OHOME=$try,
++				OHOME=
++			)
++			if test "x$OHOME" != "x"; then
++				break;
++			fi
++		done
++
++		if test "x$OHOME" = "x" -a "x$ORACLE_HOME" != "x"; then
++			CFLAGS="$old_CFLAGS -I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I${ORACLE_HOME}/network/public -I${ORACLE_HOME}/oci/include"
++			AC_TRY_COMPILE([#include <oci.h>],
++				[ int a = 1; ],
++				OHOME=$ORACLE_HOME,
++				OHOME=
++			)
++		fi
++
+ 		CFLAGS="$old_CFLAGS"
+-	fi
+ 
+-	# Proceed to linking makes only sense if include dir is OK.
+-	if test "x$ORACLE_INCLUDE" != "x" ; then
+-		old_LIBS="$LIBS"
++		if test "x$OHOME" != "x"; then
++			ORACLE_HOME=$OHOME
++			ORACLE_INCLUDE="-I${ORACLE_HOME}/rdbms/demo -I${ORACLE_HOME}/rdbms/public -I${ORACLE_HOME}/plsql/public -I${ORACLE_HOME}/network/public -I${ORACLE_HOME}/oci/include"
++		fi
++	fi     ##  this section sets $ORACLE_HOME, if found.
++
++	# not Oracle8i, try older.
++	if test "x$ORACLE_INCLUDE" = "x"; then
+ 		old_CFLAGS="$CFLAGS"
+-		CFLAGS="$RLM_SQL_ORA_WORKING_CFLAGS_FOR_LINKING_TEST"
+ 
+-		ORACLE_LIBDIR_SWITCH=
+-		if test "x$oracle_lib_dir" != "x" ; then
+-			ORACLE_LIBDIR_SWITCH="-L${oracle_lib_dir} "
+-		fi
+-		LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz10"
+-		AC_TRY_LINK([#include <oci.h>
+-	
+-				static OCIEnv           *p_env;
+-				static OCIError         *p_err;
+-				static OCISvcCtx        *p_svc;
+-				static OCIStmt          *p_sql;
+-				static OCIDefine        *p_dfn    = (OCIDefine *) 0;
+-				static OCIBind          *p_bnd    = (OCIBind *) 0;
+-			],
+-			[
+-				  int             p_bvi;
+-				  char            p_sli[20];
+-				  int             rc;
+-				  char            errbuf[100];
+-				  int             errcode;
+-				
+-				  rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid *)0,  /* Initialize OCI */
+-				          (dvoid * (*)(dvoid *, size_t)) 0,
+-				          (dvoid * (*)(dvoid *, dvoid *, size_t))0,
+-				          (void (*)(dvoid *, dvoid *)) 0 );
+-
+-			],
+-			ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz10",
+-			ORACLE_LIBS=
+-		)
++		FR_LOCATE_DIR(oracle_include_dir,oci.h)
+ 
+-		LIBS="$old_LIBS"
++		for try in /usr/local/include/oracle /usr/local/oracle/include $oracle_include_dir; do
++			CFLAGS="$old_CFLAGS -I$try"
++			AC_TRY_COMPILE([#include <oci.h>],
++				[ int a = 1; ],
++				ORACLE_INCLUDE="-I$try",
++				ORACLE_INCLUDE=
++			)
++			if test "x$ORACLE_INCLUDE" != "x"; then
++				break;
++			fi
++		done
+ 		CFLAGS="$old_CFLAGS"
+ 	fi
+ 
+-
+ 	if test "x$ORACLE_INCLUDE" = "x"; then
+ 		AC_MSG_RESULT(no)
+-		AC_MSG_WARN([oracle headers not found.  Use --with-oracle-include-dir=<path>.])
++		AC_MSG_WARN([oracle headers not found.  Use --with-oracle-home-dir=<path>.])
+ 		fail="$fail oci.h"
+ 	else
+ 		sql_oracle_cflags="${sql_oracle_cflags} ${ORACLE_INCLUDE}"
+ 		AC_MSG_RESULT(yes)
+ 
+ 
++		## is this set, from above?
++		if test "x$ORACLE_HOME" != "x"; then
++			## we must have an Oracle8i tree
++
++			# FIXME: we might do some checking, just to be nice
++			ORACLE_LIBS="-L$ORACLE_HOME/lib -lclntsh -lm"
++
++		else
++			AC_MSG_CHECKING([for oracle_init in -loracleclient])
++
++			dnl #
++			dnl #  Look for it in a number of directories.
++			dnl #
++			old_LIBS="$LIBS"
++
++			FR_LOCATE_DIR(oracle_lib_dir,[oracleclient.so])
++			FR_LOCATE_DIR(oracle_lib_dir,[oracleclient.a])
++
++			for try in /usr/lib/oracle /usr/local/lib/oracle /usr/local/oracle/lib $oracle_lib_dir; do
++				LIBS="$old_LIBS -L$try -loracleclient"
++				AC_TRY_LINK([extern char oracle_init();],
++					[ oracle_init()],
++					ORACLE_LIBS="-L$try -loracleclient",
++					ORACLE_LIBS=
++				)
++				if test "x$ORACLE_LIBS" != "x"; then
++					break;
++				fi
++			done
++			LIBS="$old_LIBS"
++
++			dnl #
++			dnl #  If one or the other isn't found, disable
++			dnl #  them both..
++			dnl #  If both are found, enable them both.
++			dnl #
++			if test "x$ORACLE_LIBS" = "x"; then
++				AC_MSG_RESULT(no)
++				ORACLE_INCLUDE=
++			fi
++		fi
++
+ 		if test "x$ORACLE_LIBS" = "x"; then
+ 			AC_MSG_WARN([oracle libraries not found.  Use --with-oracle-lib-dir=<path>.])
+-			fail="$fail libclntsh libnnz10"
++			fail="$fail liboracleclient"
+ 		else
+-			sql_oracle_ldflags="${sql_oracle_ldflags} $ORACLE_LIBS"
++			sql_oracle_ldflags="$sql_oracle_ldflags $ORACLE_LIBS"
+ 			AC_MSG_RESULT(yes)
+ 		fi
+ 	fi
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index ad204a9637c7..6c8de07ffcd4 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -1,4 +1,5 @@
 @stopdaemon radiusd
+bin/radcrypt
 bin/radclient
 bin/radconf2xml
 bin/radeapclient
@@ -46,6 +47,7 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/modules/detail.example.com
 %%EXAMPLESDIR%%/raddb/modules/detail.log
 %%EXAMPLESDIR%%/raddb/modules/digest
+%%EXAMPLESDIR%%/raddb/modules/dynamic_clients
 %%EXAMPLESDIR%%/raddb/modules/echo
 %%EXAMPLESDIR%%/raddb/modules/etc_group
 %%EXAMPLESDIR%%/raddb/modules/exec
@@ -62,6 +64,7 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/modules/mac2vlan
 %%EXAMPLESDIR%%/raddb/modules/mschap
 %%EXAMPLESDIR%%/raddb/modules/ntlm_auth
+%%EXAMPLESDIR%%/raddb/modules/opendirectory
 %%EXAMPLESDIR%%/raddb/modules/otp
 %%EXAMPLESDIR%%/raddb/modules/pam
 %%EXAMPLESDIR%%/raddb/modules/pap
@@ -515,11 +518,7 @@ include/freeradius/udpfromto.h
 include/freeradius/vmps.h
 include/freeradius/vqp.h
 @dirrm include/freeradius
-%%PORTDOCS%%%%DOCSDIR%%/Acct-Type
-%%PORTDOCS%%%%DOCSDIR%%/Autz-Type
-%%PORTDOCS%%%%DOCSDIR%%/CYGWIN
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/DIFFS
 %%PORTDOCS%%%%DOCSDIR%%/MACOSX
 %%PORTDOCS%%%%DOCSDIR%%/OS2
 %%PORTDOCS%%%%DOCSDIR%%/Post-Auth-Type
@@ -528,26 +527,15 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/Session-Type
 %%PORTDOCS%%%%DOCSDIR%%/Simultaneous-Use
-%%PORTDOCS%%%%DOCSDIR%%/aaa.txt
 %%PORTDOCS%%%%DOCSDIR%%/ascend
 %%PORTDOCS%%%%DOCSDIR%%/bay
 %%PORTDOCS%%%%DOCSDIR%%/bugs
-%%PORTDOCS%%%%DOCSDIR%%/cisco
-%%PORTDOCS%%%%DOCSDIR%%/coding-methods.txt
-%%PORTDOCS%%%%DOCSDIR%%/configurable_failover
 %%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.ldif
 %%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.schema
 %%PORTDOCS%%%%DOCSDIR%%/examples/openldap.schema
 %%PORTDOCS%%%%DOCSDIR%%/examples/postgresql_update_radacct_group_trigger.sql
-%%PORTDOCS%%%%DOCSDIR%%/ldap_howto.txt
-%%PORTDOCS%%%%DOCSDIR%%/load-balance.txt
-%%PORTDOCS%%%%DOCSDIR%%/misc-nas
-%%PORTDOCS%%%%DOCSDIR%%/module_interface
 %%PORTDOCS%%%%DOCSDIR%%/mssql
 %%PORTDOCS%%%%DOCSDIR%%/performance-testing
-%%PORTDOCS%%%%DOCSDIR%%/processing_users_file
-%%PORTDOCS%%%%DOCSDIR%%/proxy
-%%PORTDOCS%%%%DOCSDIR%%/release-method.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-kamath-pppext-eap-mschapv2-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt
@@ -578,6 +566,7 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2869.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2882.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2924.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3079.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3162.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3575.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3576.txt
@@ -602,6 +591,9 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5247.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5281.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5580.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5607.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5904.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5997.txt
 %%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
 %%PORTDOCS%%%%DOCSDIR%%/rlm_eap
 %%PORTDOCS%%%%DOCSDIR%%/rlm_expiration
@@ -617,9 +609,26 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool
 %%PORTDOCS%%%%DOCSDIR%%/snmp
-%%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning_guide
-%%PORTDOCS%%%%DOCSDIR%%/variables.txt
+%%PORTDOCS%%%%DOCSDIR%%/Acct-Type.rst
+%%PORTDOCS%%%%DOCSDIR%%/Autz-Type.rst
+%%PORTDOCS%%%%DOCSDIR%%/CYGWIN.rst
+%%PORTDOCS%%%%DOCSDIR%%/DIFFS.rst
+%%PORTDOCS%%%%DOCSDIR%%/Makefile.sphinx
+%%PORTDOCS%%%%DOCSDIR%%/aaa.rst
+%%PORTDOCS%%%%DOCSDIR%%/cisco.rst
+%%PORTDOCS%%%%DOCSDIR%%/coding-methods.rst
+%%PORTDOCS%%%%DOCSDIR%%/configurable_failover.rst
+%%PORTDOCS%%%%DOCSDIR%%/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/ldap_howto.rst
+%%PORTDOCS%%%%DOCSDIR%%/load-balance.rst
+%%PORTDOCS%%%%DOCSDIR%%/misc-nas.rst
+%%PORTDOCS%%%%DOCSDIR%%/module_interface.rst
+%%PORTDOCS%%%%DOCSDIR%%/processing_users_file.rst
+%%PORTDOCS%%%%DOCSDIR%%/proxy.rst
+%%PORTDOCS%%%%DOCSDIR%%/release-method.rst
+%%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.rst
+%%PORTDOCS%%%%DOCSDIR%%/variables.rst
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -693,6 +702,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.microsoft
 %%DATADIR%%/dictionary.mikrotik
 %%DATADIR%%/dictionary.motorola
+%%DATADIR%%/dictionary.motorola.wimax
 %%DATADIR%%/dictionary.navini
 %%DATADIR%%/dictionary.netscreen
 %%DATADIR%%/dictionary.networkphysics
@@ -721,6 +731,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.rfc3580
 %%DATADIR%%/dictionary.rfc4072
 %%DATADIR%%/dictionary.rfc4372
+%%DATADIR%%/dictionary.rfc4603
 %%DATADIR%%/dictionary.rfc4675
 %%DATADIR%%/dictionary.rfc4679
 %%DATADIR%%/dictionary.rfc4818
@@ -728,6 +739,8 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.rfc5090
 %%DATADIR%%/dictionary.rfc5176
 %%DATADIR%%/dictionary.rfc5580
+%%DATADIR%%/dictionary.rfc5607
+%%DATADIR%%/dictionary.rfc5904
 %%DATADIR%%/dictionary.riverstone
 %%DATADIR%%/dictionary.roaringpenguin
 %%DATADIR%%/dictionary.shasta
@@ -752,6 +765,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.waverider
 %%DATADIR%%/dictionary.wichorus
 %%DATADIR%%/dictionary.wimax
+%%DATADIR%%/dictionary.wimax.wichorus
 %%DATADIR%%/dictionary.wispr
 %%DATADIR%%/dictionary.xedia
 %%DATADIR%%/dictionary.xylan