6 files changed, 76 insertions, 61 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index 28af41bb6788..c5cb2d2f5368 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -8,8 +8,7 @@
 #
 
 PORTNAME=	freeradius
-DISTVERSION=	2.1.10
-PORTREVISION=	2
+DISTVERSION=	2.1.11
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
@@ -61,6 +60,8 @@ OPTIONS=	USER		"Run as user freeradius, group freeradius" on \
 
 .include <bsd.port.options.mk>
 
+LICENSE=	GPLv2
+
 # Default requirements for rc script
 _REQUIRE=	NETWORKING SERVERS
 
@@ -156,8 +157,6 @@ WITH_EXPERIMENTAL=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS+=--with-rlm_perl
 PLIST_SUB+=	RLMPERL=""
-# temporary workaround for libtool issue until FR 2.2.x is released
-CFLAGS+=	-DHAVE_LT_DLADVISE_INIT
 .else
 CONFIGURE_ARGS+=--without-perl --without-rlm_perl
 PLIST_SUB+=	RLMPERL="@comment "
@@ -168,8 +167,6 @@ USE_PYTHON=	yes
 CONFIGURE_ARGS+=--with-rlm_python \
 		--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
 		--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR}
-# temporary workaround for libtool issue until FR 2.2.x is released
-CFLAGS+=	-DHAVE_LT_DLADVISE_INIT
 PLIST_SUB+=	RLMPYTHON=""
 .else
 CONFIGURE_ARGS+=--without-rlm_python
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index d58b567b3113..cecbb5919208 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeradius-server-2.1.10.tar.bz2) = 8c56356cec5fd33522d86118a1065e004cce6735f0889146526f9839261fee9e
-SIZE (freeradius-server-2.1.10.tar.bz2) = 2545578
+SHA256 (freeradius-server-2.1.11.tar.bz2) = c93ce0c419c5540cb044d5319c3beb995d2a91134bdc2ed5896c72413f95b9e7
+SIZE (freeradius-server-2.1.11.tar.bz2) = 2632549
diff --git a/net/freeradius2/files/patch-rlm_sql_oracle b/net/freeradius2/files/patch-rlm_sql_oracle
index 2672c4430acf..a80afa354a9f 100644
--- a/net/freeradius2/files/patch-rlm_sql_oracle
+++ b/net/freeradius2/files/patch-rlm_sql_oracle
@@ -1,6 +1,6 @@
-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
+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
 @@ -1,5 +1,5 @@
  #! /bin/sh
 -# From configure.in Revision: 1.10 .
@@ -560,9 +560,9 @@ diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle
  			{ 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
+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 $)
@@ -570,7 +570,7 @@ diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle
  AC_DEFUN(modname,[rlm_sql_oracle])
  
  fail=
-@@ -18,120 +18,145 @@
+@@ -18,125 +18,145 @@
  	dnl # defined anyways.
  	dnl #
  
@@ -697,46 +697,49 @@ diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle
 -		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 );
+-		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 -lnnz10",
--			ORACLE_LIBS=
--		)
+-				],
+-				ORACLE_LIBS="$ORACLE_LIBDIR_SWITCH -lclntsh -lnnz${oracle_version}",
+-				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_LIBS" != "x"; then
+-				break
 +			if test "x$ORACLE_INCLUDE" != "x"; then
 +				break;
-+			fi
-+		done
+ 			fi
+ 		done
+-
+-		LIBS="$old_LIBS"
  		CFLAGS="$old_CFLAGS"
  	fi
  
@@ -795,7 +798,7 @@ diff -urN ../freeradius-server-2.1.10/src/modules/rlm_sql/drivers/rlm_sql_oracle
 +
  		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 libclntsh libnnz${oracle_version}"
 +			fail="$fail liboracleclient"
  		else
 -			sql_oracle_ldflags="${sql_oracle_ldflags} $ORACLE_LIBS"
diff --git a/net/freeradius2/files/patch-src-modules-rlm_mschap-rlm_mschap.c b/net/freeradius2/files/patch-src-modules-rlm_mschap-rlm_mschap.c
deleted file mode 100644
index fa0377ea79b7..000000000000
--- a/net/freeradius2/files/patch-src-modules-rlm_mschap-rlm_mschap.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/modules/rlm_mschap/rlm_mschap.c.orig	2010-09-28 13:03:56.000000000 +0200
-+++ src/modules/rlm_mschap/rlm_mschap.c	2010-11-18 12:02:02.211071015 +0100
-@@ -1273,8 +1273,9 @@
- 		 *	return 'not found'.
- 		 */
- 		if (((smb_ctrl->vp_integer & ACB_DISABLED) != 0) ||
--		    ((smb_ctrl->vp_integer & ACB_NORMAL) == 0)) {
--			RDEBUG2("SMB-Account-Ctrl says that the account is disabled, or is not a normal account.");
-+		    (((smb_ctrl->vp_integer & ACB_NORMAL) == 0) &&
-+		    ((smb_ctrl->vp_integer & ACB_WSTRUST) == 0))) {
-+			RDEBUG2("SMB-Account-Ctrl says that the account is disabled, or is not a normal or workstation trust account.");
- 			mschap_add_reply(request, &request->reply->vps,
- 					  *response->vp_octets,
- 					  "MS-CHAP-Error", "E=691 R=1", 9);
diff --git a/net/freeradius2/pkg-descr b/net/freeradius2/pkg-descr
index 27749b155145..2eb2d5d594ee 100644
--- a/net/freeradius2/pkg-descr
+++ b/net/freeradius2/pkg-descr
@@ -4,5 +4,4 @@ Fortune-500 companies and Tier 1 ISPs. It is also widely used in the academic
 community, including eduroam. The server is fast, feature-rich, modular, and
 scalable.
 
-
 WWW: http://www.freeradius.org/
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 6c8de07ffcd4..847e70ba060c 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -74,8 +74,12 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/modules/preprocess
 %%EXAMPLESDIR%%/raddb/modules/radutmp
 %%EXAMPLESDIR%%/raddb/modules/realm
+%%EXAMPLESDIR%%/raddb/modules/redis
+%%EXAMPLESDIR%%/raddb/modules/rediswho
+%%EXAMPLESDIR%%/raddb/modules/replicate
 %%EXAMPLESDIR%%/raddb/modules/smbpasswd
 %%EXAMPLESDIR%%/raddb/modules/smsotp
+%%EXAMPLESDIR%%/raddb/modules/soh
 %%EXAMPLESDIR%%/raddb/modules/sql_log
 %%EXAMPLESDIR%%/raddb/modules/sqlcounter_expire_on_login
 %%EXAMPLESDIR%%/raddb/modules/sradutmp
@@ -101,6 +105,7 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/sites-available/proxy-inner-tunnel
 %%EXAMPLESDIR%%/raddb/sites-available/robust-proxy-accounting
 %%EXAMPLESDIR%%/raddb/sites-available/status
+%%EXAMPLESDIR%%/raddb/sites-available/soh
 %%EXAMPLESDIR%%/raddb/sites-available/virtual.example.com
 %%EXAMPLESDIR%%/raddb/sites-available/vmps
 %%EXAMPLESDIR%%/raddb/sites-enabled/control-socket
@@ -402,6 +407,16 @@ bin/smbencrypt
 %%LIBDIR%%/rlm_realm.a
 %%LIBDIR%%/rlm_realm.la
 %%LIBDIR%%/rlm_realm.so
+%%LIBDIR%%/rlm_soh.so
+%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_soh.la
+%%LIBDIR%%/rlm_soh.a
+%%LIBDIR%%/rlm_soh-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_replicate-%%PORTVERSION%%.so
+%%LIBDIR%%/rlm_replicate.so
+%%LIBDIR%%/rlm_replicate-%%PORTVERSION%%.la
+%%LIBDIR%%/rlm_replicate.la
+%%LIBDIR%%/rlm_replicate.a
 %%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.la
 %%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby-%%PORTVERSION%%.so
 %%EXPM%%%%RLMRUBY%%%%LIBDIR%%/rlm_ruby.a
@@ -594,6 +609,7 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5607.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5904.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5997.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc6158.txt
 %%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
 %%PORTDOCS%%%%DOCSDIR%%/rlm_eap
 %%PORTDOCS%%%%DOCSDIR%%/rlm_expiration
@@ -609,6 +625,7 @@ include/freeradius/vqp.h
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool
 %%PORTDOCS%%%%DOCSDIR%%/snmp
+%%PORTDOCS%%%%DOCSDIR%%/SoH.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning_guide
 %%PORTDOCS%%%%DOCSDIR%%/Acct-Type.rst
 %%PORTDOCS%%%%DOCSDIR%%/Autz-Type.rst
@@ -649,6 +666,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.aptis
 %%DATADIR%%/dictionary.aruba
 %%DATADIR%%/dictionary.ascend
+%%DATADIR%%/dictionary.ascend.illegal
 %%DATADIR%%/dictionary.asn
 %%DATADIR%%/dictionary.avaya
 %%DATADIR%%/dictionary.azaire
@@ -671,6 +689,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.dhcp
 %%DATADIR%%/dictionary.digium
 %%DATADIR%%/dictionary.epygi
+%%DATADIR%%/dictionary.eltex
 %%DATADIR%%/dictionary.ericsson
 %%DATADIR%%/dictionary.erx
 %%DATADIR%%/dictionary.extreme
@@ -702,6 +721,7 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.microsoft
 %%DATADIR%%/dictionary.mikrotik
 %%DATADIR%%/dictionary.motorola
+%%DATADIR%%/dictionary.motorola.illegal
 %%DATADIR%%/dictionary.motorola.wimax
 %%DATADIR%%/dictionary.navini
 %%DATADIR%%/dictionary.netscreen
@@ -755,8 +775,10 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.telkom
 %%DATADIR%%/dictionary.trapeze
 %%DATADIR%%/dictionary.tropos
+%%DATADIR%%/dictionary.ukerna
 %%DATADIR%%/dictionary.unix
 %%DATADIR%%/dictionary.usr
+%%DATADIR%%/dictionary.usr.illegal
 %%DATADIR%%/dictionary.utstarcom
 %%DATADIR%%/dictionary.valemount
 %%DATADIR%%/dictionary.versanet
@@ -771,6 +793,14 @@ include/freeradius/vqp.h
 %%DATADIR%%/dictionary.xylan
 %%DATADIR%%/dictionary.zyxel
 @dirrm %%DATADIR%%
+@dirrmtry share/freeradius
+@dirrmtry share/examples/freeradius/raddb/sites-available
+@dirrmtry share/examples/freeradius/raddb/modules
+@dirrmtry share/examples/freeradius/raddb
+@dirrmtry share/examples/freeradius
+@dirrmtry share/doc/freeradius/rfc
+@dirrmtry share/doc/freeradius
+@dirrmtry %%LIBDIR%%
 @exec if [ ! -d /var/log/radacct ]; then mkdir -p /var/log/radacct; chmod -R go= /var/log/radacct; fi
 @exec for i in /var/log/radius.log /var/log/radutmp /var/log/radwtmp; do if [ ! -f ${i} ]; then touch ${i}; chmod go= ${i}; fi; done
 @exec mkdir -p /var/run/radiusd