- Update to 2.1.12

- Remove previously backported patches from upstream

7 files changed, 305 insertions, 427 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index d49dd883da6c..faf964f3ed59 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	freeradius
-DISTVERSION=	2.1.11
-PORTREVISION=	3
+DISTVERSION=	2.1.12
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -301,15 +300,16 @@ SUB_LIST+=	RADIUS_USER="${RADIUS_USER}" \
 SUB_FILES+=	pkg-install pkg-deinstall pkg-message
 
 MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
-		radzap.1
+		radzap.1 smbencrypt.1
 MAN5=		acct_users.5 clients.conf.5 dictionary.5 radiusd.conf.5 \
 		radrelay.conf.5 rlm_acct_unique.5 rlm_always.5 \
 		rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \
 		rlm_detail.5 rlm_digest.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 \
 		rlm_pap.5 rlm_passwd.5 rlm_policy.5 rlm_realm.5 rlm_sql.5 \
-		rlm_sql_log.5 rlm_unix.5 unlang.5 users.5
+		rlm_sql_log.5 rlm_unix.5 unlang.5 users.5 checkrad.5
 MAN8=		radiusd.8 radmin.8 raddebug.8 radrelay.8 radsqlrelay.8 \
-		radwatch.8 rlm_ippool_tool.8
+		radwatch.8 rlm_ippool_tool.8 radconf2xml.8 radcrypt.8 \
+		radsniff.8 rlm_dbm_cat.8 rlm_dbm_parse.8
 
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index cecbb5919208..91ec17cd8499 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeradius-server-2.1.11.tar.bz2) = c93ce0c419c5540cb044d5319c3beb995d2a91134bdc2ed5896c72413f95b9e7
-SIZE (freeradius-server-2.1.11.tar.bz2) = 2632549
+SHA256 (freeradius-server-2.1.12.tar.bz2) = b66bb2935b656e19f2b725df1162e7ac160537e8ef8266c2447779bb7d113172
+SIZE (freeradius-server-2.1.12.tar.bz2) = 2670611
diff --git a/net/freeradius2/files/patch-src__modules__rlm_detail__rlm_detail.c b/net/freeradius2/files/patch-src__modules__rlm_detail__rlm_detail.c
deleted file mode 100644
index 4f259167f280..000000000000
--- a/net/freeradius2/files/patch-src__modules__rlm_detail__rlm_detail.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- ./src/modules/rlm_detail/rlm_detail.c.orig	2011-08-09 23:23:35.000000000 -0400
-+++ ./src/modules/rlm_detail/rlm_detail.c	2011-08-09 23:25:09.000000000 -0400
-@@ -463,11 +463,11 @@
- 	 */
- 	if (fflush(fp) != 0) {
- 		ftruncate(outfd, fsize); /* ignore errors! */
--		close(outfd);
-+		fclose(fp);
- 		return RLM_MODULE_FAIL;
- 	}
- 
--	close(outfd);
-+	fclose(fp);
- 
- 	/*
- 	 *	And everything is fine.
diff --git a/net/freeradius2/files/patch-src__modules__rlm_eap__types__rlm_eap_tls__rlm_eap_tls.c b/net/freeradius2/files/patch-src__modules__rlm_eap__types__rlm_eap_tls__rlm_eap_tls.c
deleted file mode 100644
index 47875db8cd05..000000000000
--- a/net/freeradius2/files/patch-src__modules__rlm_eap__types__rlm_eap_tls__rlm_eap_tls.c
+++ /dev/null
@@ -1,125 +0,0 @@
---- ./src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c.orig	2011-06-20 10:57:14.000000000 -0400
-+++ ./src/modules/rlm_eap/types/rlm_eap_tls/rlm_eap_tls.c	2011-08-10 07:03:40.000000000 -0400
-@@ -277,6 +277,10 @@
-  * This function sends a OCSP request to a defined OCSP responder
-  * and checks the OCSP response for correctness.
-  */
-+
-+/* Maximum leeway in validity period: default 5 minutes */
-+#define MAX_VALIDITY_PERIOD     (5 * 60)
-+
- static int ocsp_check(X509_STORE *store, X509 *issuer_cert, X509 *client_cert,
- 		      EAP_TLS_CONF *conf)
- {
-@@ -288,9 +292,12 @@
- 	char *port = NULL;
- 	char *path = NULL;
- 	int use_ssl = -1;
--	BIO *cbio;
--	int ocsp_ok;
--	int status;
-+	long nsec = MAX_VALIDITY_PERIOD, maxage = -1;
-+	BIO *cbio, *bio_out;
-+	int ocsp_ok = 0;
-+	int status ;
-+	ASN1_GENERALIZEDTIME *rev, *thisupd, *nextupd;
-+	int reason;
- 
- 	/* 
- 	 * Create OCSP Request 
-@@ -299,7 +306,7 @@
- 	req = OCSP_REQUEST_new();
- 	OCSP_request_add0_id(req, certid);
- 	OCSP_request_add1_nonce(req, NULL, 8);
--
-+	
- 	/* 
- 	 * Send OCSP Request and get OCSP Response
- 	 */
-@@ -316,6 +323,9 @@
- 
- 	/* Setup BIO socket to OCSP responder */
- 	cbio = BIO_new_connect(host);
-+
-+	bio_out = BIO_new_fp(stdout, BIO_NOCLOSE);
-+
- 	BIO_set_conn_port(cbio, port);
- 	BIO_do_connect(cbio);
- 
-@@ -323,30 +333,60 @@
- 	resp = OCSP_sendreq_bio(cbio, path, req);
- 	if(resp==0) {
- 		radlog(L_ERR, "Error: Couldn't get OCSP response");
--		ocsp_ok = 0;
- 		goto ocsp_end;
- 	}
- 
--	/* Verify OCSP response */
-+	/* Verify OCSP response status */
- 	status = OCSP_response_status(resp);
-+	DEBUG2("[ocsp] --> Response status: %s",OCSP_response_status_str(status));
- 	if(status != OCSP_RESPONSE_STATUS_SUCCESSFUL) {
- 		radlog(L_ERR, "Error: OCSP response status: %s", OCSP_response_status_str(status));
--		ocsp_ok = 0;
- 		goto ocsp_end;
- 	}
- 	bresp = OCSP_response_get1_basic(resp);
- 	if(OCSP_check_nonce(req, bresp)!=1) {
- 		radlog(L_ERR, "Error: OCSP response has wrong nonce value");
--		ocsp_ok = 0;
- 		goto ocsp_end;
- 	}
- 	if(OCSP_basic_verify(bresp, NULL, store, 0)!=1){
- 		radlog(L_ERR, "Error: Couldn't verify OCSP basic response");
--		ocsp_ok = 0;
- 		goto ocsp_end;
- 	}
--	
--	ocsp_ok = 1; 
-+	/*	Verify OCSP cert status */
-+	if(!OCSP_resp_find_status(bresp, certid, &status, &reason,
-+				                      &rev, &thisupd, &nextupd)) {
-+		radlog(L_ERR, "ERROR: No Status found.\n");
-+		goto ocsp_end;
-+	}
-+
-+	if (!OCSP_check_validity(thisupd, nextupd, nsec, maxage)) {
-+		BIO_puts(bio_out, "WARNING: Status times invalid.\n");
-+		ERR_print_errors(bio_out);
-+		goto ocsp_end;
-+	}
-+	BIO_puts(bio_out, "\tThis Update: ");
-+        ASN1_GENERALIZEDTIME_print(bio_out, thisupd);
-+        BIO_puts(bio_out, "\n");
-+	BIO_puts(bio_out, "\tNext Update: ");
-+        ASN1_GENERALIZEDTIME_print(bio_out, nextupd);
-+        BIO_puts(bio_out, "\n");
-+
-+	switch (status) {
-+	case V_OCSP_CERTSTATUS_GOOD:
-+		DEBUG2("[oscp] --> Cert status: good");
-+		ocsp_ok = 1; 
-+		break;
-+
-+	default:
-+		/* REVOKED / UNKNOWN */
-+		DEBUG2("[ocsp] --> Cert status: %s",OCSP_cert_status_str(status));
-+                if (reason != -1)
-+			DEBUG2("[ocsp] --> Reason: %s", OCSP_crl_reason_str(reason));
-+                BIO_puts(bio_out, "\tRevocation Time: ");
-+                ASN1_GENERALIZEDTIME_print(bio_out, rev);
-+                BIO_puts(bio_out, "\n"); 
-+		break;
-+	}
- 
- ocsp_end:
- 	/* Free OCSP Stuff */
-@@ -1170,7 +1210,7 @@
- 		  return -1;
- 		}
- 	}
--#endif HAVE_OPENSSL_OCSP_H
-+#endif /*HAVE_OPENSSL_OCSP_H*/
- 
- 	if (load_dh_params(inst->ctx, conf->dh_file) < 0) {
- 		eaptls_detach(inst);
diff --git a/net/freeradius2/files/patch-rlm_sql_oracle b/net/freeradius2/files/patch-src__modules__rlm_sql__drivers__rlm_sql_oracle__configure
index a80afa354a9f..2f9b01cad1fc 100644
--- a/net/freeradius2/files/patch-rlm_sql_oracle
+++ b/net/freeradius2/files/patch-src__modules__rlm_sql__drivers__rlm_sql_oracle__configure
@@ -1,6 +1,5 @@
-diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
---- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	2011-06-20 10:57:14.000000000 -0400
-+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	2011-06-21 15:18:44.000000000 -0400
+--- ./src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.orig	2011-10-01 11:04:19.000000000 -0400
++++ ./src/modules/rlm_sql/drivers/rlm_sql_oracle/configure	2011-10-01 11:04:45.000000000 -0400
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.10 .
@@ -136,7 +135,7 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2711,65 +2683,207 @@
+@@ -2711,23 +2683,49 @@
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -165,8 +164,8 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
 -		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
+-		for oracle_version in 10 11 9 ""; do
+-			LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}"
 +
 +
 +if test "x$LOCATE" != "x"; then
@@ -197,10 +196,10 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
 +
 +		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
+ 			cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
- cat confdefs.h >>conftest.$ac_ext
+@@ -2735,42 +2733,157 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <oci.h>
@@ -234,14 +233,14 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
 +  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;
+-					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
@@ -249,7 +248,7 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
 +				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
@@ -288,38 +287,37 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-					  int             p_bvi;
+-					  char            p_sli[20];
+-					  int             rc;
+-					  char            errbuf[100];
+-					  int             errcode;
 +	OHOME=
-+
+ 
+-					  rc = OCIInitialize((ub4) OCI_DEFAULT, (dvoid *)0,  /* Initialize OCI */
+-							  (dvoid * (*)(dvoid *, size_t)) 0,
+-							  (dvoid * (*)(dvoid *, dvoid *, size_t))0,
+-							  (void (*)(dvoid *, dvoid *)) 0 );
 +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
@@ -377,13 +375,13 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -2778,30 +2892,29 @@
+@@ -2779,34 +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"
+-  ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}"
 +       } && test -s conftest.$ac_objext; then
 +  ORACLE_INCLUDE="-I$try"
  else
@@ -397,13 +395,15 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
  
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
--
--		LIBS="$old_LIBS"
+-			if test "x$ORACLE_LIBS" != "x"; then
+-				break
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +			if test "x$ORACLE_INCLUDE" != "x"; then
 +				break;
-+			fi
-+		done
+ 			fi
+ 		done
+-
+-		LIBS="$old_LIBS"
  		CFLAGS="$old_CFLAGS"
  	fi
  
@@ -418,7 +418,7 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
  		fail="$fail oci.h"
  	else
  		sql_oracle_cflags="${sql_oracle_cflags} ${ORACLE_INCLUDE}"
-@@ -2809,12 +2922,139 @@
+@@ -2814,12 +2922,139 @@
  echo "${ECHO_T}yes" >&6; }
  
  
@@ -552,7 +552,7 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
  		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 libclntsh libnnz${oracle_version}"
 +			fail="$fail liboracleclient"
  		else
 -			sql_oracle_ldflags="${sql_oracle_ldflags} $ORACLE_LIBS"
@@ -560,249 +560,21 @@ diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure ./configure
  			{ echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6; }
  		fi
-diff -urN src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in ./configure.in
---- src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2011-06-20 10:57:14.000000000 -0400
-+++ src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2011-06-21 15:18:44.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,125 +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=
- 	)
+@@ -2848,7 +3083,11 @@
  
--	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.
+-ac_config_files="$ac_config_files Makefile"
 +
-+	# 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
--		for oracle_version in 10 11 9 ""; do
--			LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}"
--			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 -lnnz${oracle_version}",
--				ORACLE_LIBS=
-+		FR_LOCATE_DIR(oracle_include_dir,oci.h)
++  unset ac_cv_env_LIBS_set
++  unset ac_cv_env_LIBS_value
 +
-+		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_LIBS" != "x"; then
--				break
-+			if test "x$ORACLE_INCLUDE" != "x"; then
-+				break;
- 			fi
- 		done
--
--		LIBS="$old_LIBS"
- 		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)
++  ac_config_files="$ac_config_files Makefile"
  
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+@@ -3856,3 +4095,4 @@
+   $ac_cs_success || { (exit 1); exit 1; }
+ fi
  
-+		## 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 libnnz${oracle_version}"
-+			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/files/patch-src__modules__rlm_sql__drivers__rlm_sql_oracle__configure.in b/net/freeradius2/files/patch-src__modules__rlm_sql__drivers__rlm_sql_oracle__configure.in
new file mode 100644
index 000000000000..61f30e7cc3a2
--- /dev/null
+++ b/net/freeradius2/files/patch-src__modules__rlm_sql__drivers__rlm_sql_oracle__configure.in
@@ -0,0 +1,244 @@
+--- ./src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in.orig	2011-10-01 11:04:24.000000000 -0400
++++ ./src/modules/rlm_sql/drivers/rlm_sql_oracle/configure.in	2011-10-01 11:04:47.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,125 +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
+-		for oracle_version in 10 11 9 ""; do
+-			LIBS="$old_LIBS $ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}"
+-			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 );
++		FR_LOCATE_DIR(oracle_include_dir,oci.h)
+ 
+-				],
+-				ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}",
+-				ORACLE_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_LIBS" != "x"; then
+-				break
++			if test "x$ORACLE_INCLUDE" != "x"; then
++				break;
+ 			fi
+ 		done
+-
+-		LIBS="$old_LIBS"
+ 		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 libnnz${oracle_version}"
++			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 847e70ba060c..fb34605f495c 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -765,11 +765,14 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.roaringpenguin
 %%DATADIR%%/dictionary.shasta
 %%DATADIR%%/dictionary.shiva
+%%DATADIR%%/dictionary.siemens
 %%DATADIR%%/dictionary.slipstream
 %%DATADIR%%/dictionary.sofaware
 %%DATADIR%%/dictionary.sonicwall
 %%DATADIR%%/dictionary.springtide
 %%DATADIR%%/dictionary.starent
+%%DATADIR%%/dictionary.starent.vsa1
+%%DATADIR%%/dictionary.symbol
 %%DATADIR%%/dictionary.t_systems_nova
 %%DATADIR%%/dictionary.telebit
 %%DATADIR%%/dictionary.telkom