6 files changed, 141 insertions, 112 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index e179d6d01cdc..1f2ec34cb779 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	0.7
+PORTVERSION=	0.8.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
@@ -16,25 +16,33 @@ COMMENT=	A free RADIUS server implementation
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
+LOGDIR?=	/var/log
+
 USE_GMAKE=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--quiet --with-logdir=/var/log
+USE_LIBTOOL=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR}
+INSTALLS_SHLIB=	yes
 
 MAN1=		radclient.1 radlast.1 radtest.1 raduse.1 radwho.1 radzap.1
 MAN5=		acct_users.5 clients.5 dictionary.5 naslist.5 radiusd.conf.5 \
 		users.5
-MAN8=		builddbm.8 radiusd.8 radwatch.8
+MAN8=		builddbm.8 radiusd.8 radrelay.8 radwatch.8
 
 RADDB=		acct_users attrs clients clients.conf dictionary \
-		dictionary.acc dictionary.aptis dictionary.ascend \
-		dictionary.bay dictionary.cisco dictionary.compat \
-		dictionary.erx dictionary.foundry dictionary.freeradius \
-		dictionary.livingston dictionary.microsoft dictionary.nomadix \
-		dictionary.quintum dictionary.redback dictionary.shasta \
-		dictionary.shiva dictionary.tunnel dictionary.usr \
-		dictionary.versanet hints huntgroups ldap.attrmap naslist \
-		naspasswd postgresql.conf proxy.conf radiusd.conf realms \
-		snmp.conf sql.conf users x99.conf
+		dictionary.acc dictionary.alcatel dictionary.alteon \
+	       	dictionary.altiga dictionary.aptis dictionary.ascend \
+	       	dictionary.bay dictionary.cisco dictionary.cisco.bbsm \
+		dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
+		dictionary.colubris dictionary.columbia_university \
+	       	dictionary.compat dictionary.erx dictionary.foundry \
+	       	dictionary.freeradius dictionary.juniper \
+	       	dictionary.livingston dictionary.microsoft \
+	       	dictionary.nomadix dictionary.quintum dictionary.redback \
+	       	dictionary.shasta dictionary.shiva dictionary.tunnel \
+	       	dictionary.usr dictionary.versanet hints huntgroups \
+		ldap.attrmap mssql.conf naslist naspasswd oraclesql.conf \
+	       	postgresql.conf  preproxy_users proxy.conf radiusd.conf \
+	       	realms snmp.conf sql.conf users x99.conf x99passwd.sample
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/raddb
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index 5723bc5c63e6..7feca3855fc5 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1 +1 @@
-MD5 (freeradius-0.7.tar.gz) = 04e4026a1f4bb08e8db20a16d9834b71
+MD5 (freeradius-0.8.1.tar.gz) = 2693a9067a112d2c4f5dfb98a531f25d
diff --git a/net/freeradius/files/patch-aa b/net/freeradius/files/patch-aa
index 6228127c020b..8a2f691bc3de 100644
--- a/net/freeradius/files/patch-aa
+++ b/net/freeradius/files/patch-aa
@@ -1,16 +1,16 @@
---- Makefile.orig	Fri Jul 12 20:44:01 2002
-+++ Makefile	Sat Aug 31 17:54:01 2002
-@@ -31,33 +31,6 @@
+--- Makefile.orig	Tue Apr  8 11:51:28 2003
++++ Makefile	Tue Apr  8 11:51:38 2003
+@@ -34,33 +34,6 @@
  			$(INSTALL) -m 644 $$p $(R)$(mandir)/man$$i; \
  		done \
  	done
 -	@echo "Creating/updating files in $(R)$(raddbdir)"; \
--	$(INSTALL) -d -m 755	$(R)$(raddbdir); \
 -	cd raddb; \
 -	for i in [a-c]* [e-z]*; do \
 -		[ $$i != radiusd.conf.in -a ! -f $(R)$(raddbdir)/$$i ] && \
 -                $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
 -	done; \
+-	chmod 600 $(R)$(raddbdir)/naspasswd $(R)$(raddbdir)/clients $(R)$(raddbdir)/clients.conf; \
 -	for i in dictionary*; do \
 -		[ ! -f $(R)$(raddbdir)/$$i ] && $(INSTALL) -m 644 $$i $(R)$(raddbdir); \
 -		if [ "`find $$i -newer $(R)$(raddbdir)/$$i`" ]; then \
diff --git a/net/freeradius/files/patch-ab b/net/freeradius/files/patch-ab
index cd74cc9ab4a4..f9beec55bde7 100644
--- a/net/freeradius/files/patch-ab
+++ b/net/freeradius/files/patch-ab
@@ -1,10 +1,9 @@
---- src/modules/rlm_mschap/rlm_mschap.c.orig	Mon Jan 21 11:20:42 2002
-+++ src/modules/rlm_mschap/rlm_mschap.c	Fri Jul  5 00:44:19 2002
-@@ -258,11 +258,15 @@
- {
+--- src/modules/rlm_mschap/rlm_mschap.c.orig	Tue Apr  8 11:53:05 2003
++++ src/modules/rlm_mschap/rlm_mschap.c	Tue Apr  8 11:53:32 2003
+@@ -260,10 +260,15 @@
  	SHA1_CTX Context;
  	char hash[20];
--	
+ 	
 +	const char *name;
 +
 +	name = strchr(user_name, '\\');
diff --git a/net/freeradius/pkg-descr b/net/freeradius/pkg-descr
index c1892705c95e..044d72cbf88d 100644
--- a/net/freeradius/pkg-descr
+++ b/net/freeradius/pkg-descr
@@ -1,5 +1,4 @@
   All code in this server was written from scratch.
-
   The server is mostly compatible with livingston radiusd-2.01
   (no menus or s/key support though) but with more feautures, such as:
 
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index 54f6159bc341..74ec41fea882 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -1,28 +1,41 @@
-bin/radwho
-bin/raduse
-bin/radzap
-bin/radlast
 bin/radclient
+bin/radlast
+bin/radrelay
 bin/radtest
+bin/raduse
+bin/radwho
+bin/radzap
+bin/rlm_dbm_cat
+bin/rlm_dbm_parser
+bin/smbencrypt
 etc/raddb/acct_users.sample
 etc/raddb/attrs.sample
-etc/raddb/clients.sample
 etc/raddb/clients.conf.sample
-etc/raddb/dictionary.sample
+etc/raddb/clients.sample
 etc/raddb/dictionary.acc.sample
+etc/raddb/dictionary.alcatel.sample
+etc/raddb/dictionary.alteon.sample
+etc/raddb/dictionary.altiga.sample
 etc/raddb/dictionary.aptis.sample
 etc/raddb/dictionary.ascend.sample
 etc/raddb/dictionary.bay.sample
+etc/raddb/dictionary.cisco.bbsm.sample
 etc/raddb/dictionary.cisco.sample
+etc/raddb/dictionary.cisco.vpn3000.sample
+etc/raddb/dictionary.cisco.vpn5000.sample
+etc/raddb/dictionary.colubris.sample
+etc/raddb/dictionary.columbia_university.sample
 etc/raddb/dictionary.compat.sample
 etc/raddb/dictionary.erx.sample
 etc/raddb/dictionary.foundry.sample
 etc/raddb/dictionary.freeradius.sample
+etc/raddb/dictionary.juniper.sample
 etc/raddb/dictionary.livingston.sample
 etc/raddb/dictionary.microsoft.sample
 etc/raddb/dictionary.nomadix.sample
 etc/raddb/dictionary.quintum.sample
 etc/raddb/dictionary.redback.sample
+etc/raddb/dictionary.sample
 etc/raddb/dictionary.shasta.sample
 etc/raddb/dictionary.shiva.sample
 etc/raddb/dictionary.tunnel.sample
@@ -31,9 +44,12 @@ etc/raddb/dictionary.versanet.sample
 etc/raddb/hints.sample
 etc/raddb/huntgroups.sample
 etc/raddb/ldap.attrmap.sample
+etc/raddb/mssql.conf.sample
 etc/raddb/naslist.sample
 etc/raddb/naspasswd.sample
+etc/raddb/oraclesql.conf.sample
 etc/raddb/postgresql.conf.sample
+etc/raddb/preproxy_users.sample
 etc/raddb/proxy.conf.sample
 etc/raddb/radiusd.conf.sample
 etc/raddb/realms.sample
@@ -41,138 +57,145 @@ etc/raddb/snmp.conf.sample
 etc/raddb/sql.conf.sample
 etc/raddb/users.sample
 etc/raddb/x99.conf.sample
+etc/raddb/x99passwd.sample.sample
 etc/rc.d/radiusd.sh
+include/ltdl.h
 lib/libltdl.a
+lib/libltdl.la
 lib/libltdl.so
 lib/libltdl.so.4
-lib/libradius-0.7.so
-lib/libradius.la
+lib/libradius-0.8.1.la
+lib/libradius-0.8.1.so
 lib/libradius.a
-lib/libradius-0.7.la
+lib/libradius.la
 lib/libradius.so
-lib/rlm_acct_unique-0.7.so
-lib/rlm_acct_unique-0.7.la
+lib/rlm_acct_unique-0.8.1.la
+lib/rlm_acct_unique-0.8.1.so
 lib/rlm_acct_unique.a
-lib/rlm_acct_unique.so
 lib/rlm_acct_unique.la
-lib/rlm_always.so
-lib/rlm_always.la
-lib/rlm_always-0.7.so
-lib/rlm_attr_filter.so
+lib/rlm_acct_unique.so
+lib/rlm_always-0.8.1.la
+lib/rlm_always-0.8.1.so
 lib/rlm_always.a
-lib/rlm_always-0.7.la
-lib/rlm_attr_filter-0.7.so
+lib/rlm_always.la
+lib/rlm_always.so
+lib/rlm_attr_filter-0.8.1.la
+lib/rlm_attr_filter-0.8.1.so
 lib/rlm_attr_filter.a
 lib/rlm_attr_filter.la
-lib/rlm_attr_filter-0.7.la
-lib/rlm_attr_rewrite-0.7.so
-lib/rlm_attr_rewrite.so
-lib/rlm_attr_rewrite.la
+lib/rlm_attr_filter.so
+lib/rlm_attr_rewrite-0.8.1.la
+lib/rlm_attr_rewrite-0.8.1.so
 lib/rlm_attr_rewrite.a
-lib/rlm_attr_rewrite-0.7.la
+lib/rlm_attr_rewrite.la
+lib/rlm_attr_rewrite.so
+lib/rlm_chap-0.8.1.la
+lib/rlm_chap-0.8.1.so
 lib/rlm_chap.a
 lib/rlm_chap.la
-lib/rlm_chap-0.7.la
-lib/rlm_chap-0.7.so
 lib/rlm_chap.so
-lib/rlm_dbm-0.7.so
-lib/rlm_dbm-0.7.la
-lib/rlm_dbm.la
-lib/rlm_counter.so
-lib/rlm_dbm.so
-lib/rlm_counter.la
+lib/rlm_counter-0.8.1.la
+lib/rlm_counter-0.8.1.so
 lib/rlm_counter.a
-lib/rlm_counter-0.7.la
+lib/rlm_counter.la
+lib/rlm_counter.so
+lib/rlm_dbm-0.8.1.la
+lib/rlm_dbm-0.8.1.so
 lib/rlm_dbm.a
-lib/rlm_counter-0.7.so
-lib/rlm_detail-0.7.la
+lib/rlm_dbm.la
+lib/rlm_dbm.so
+lib/rlm_detail-0.8.1.la
+lib/rlm_detail-0.8.1.so
 lib/rlm_detail.a
-lib/rlm_detail.so
-lib/rlm_detail-0.7.so
 lib/rlm_detail.la
-lib/rlm_eap.la
-lib/rlm_eap-0.7.so
-lib/rlm_eap-0.7.la
+lib/rlm_detail.so
+lib/rlm_eap-0.8.1.la
+lib/rlm_eap-0.8.1.so
 lib/rlm_eap.a
+lib/rlm_eap.la
 lib/rlm_eap.so
+lib/rlm_eap_md5-0.8.1.la
+lib/rlm_eap_md5-0.8.1.so
 lib/rlm_eap_md5.a
-lib/rlm_eap_md5.so
-lib/rlm_eap_md5-0.7.so
 lib/rlm_eap_md5.la
-lib/rlm_eap_md5-0.7.la
+lib/rlm_eap_md5.so
+lib/rlm_eap_tls-0.8.1.la
+lib/rlm_eap_tls-0.8.1.so
 lib/rlm_eap_tls.a
-lib/rlm_eap_tls-0.7.la
 lib/rlm_eap_tls.la
-lib/rlm_eap_tls-0.7.so
 lib/rlm_eap_tls.so
+lib/rlm_expr-0.8.1.la
+lib/rlm_expr-0.8.1.so
+lib/rlm_expr.a
+lib/rlm_expr.la
+lib/rlm_expr.so
+lib/rlm_fastusers-0.8.1.la
+lib/rlm_fastusers-0.8.1.so
 lib/rlm_fastusers.a
 lib/rlm_fastusers.la
-lib/rlm_files-0.7.so
+lib/rlm_fastusers.so
+lib/rlm_files-0.8.1.la
+lib/rlm_files-0.8.1.so
 lib/rlm_files.a
-lib/rlm_fastusers-0.7.la
-lib/rlm_fastusers-0.7.so
-lib/rlm_files.so
 lib/rlm_files.la
-lib/rlm_files-0.7.la
-lib/rlm_fastusers.so
-lib/rlm_ldap.so
-lib/rlm_ldap-0.7.la
-lib/rlm_ldap.la
-lib/rlm_ldap.a
-lib/rlm_ldap-0.6.la
-lib/rlm_ldap-0.7.so
+lib/rlm_files.so
+lib/rlm_mschap-0.8.1.la
+lib/rlm_mschap-0.8.1.so
 lib/rlm_mschap.a
 lib/rlm_mschap.la
-lib/rlm_mschap-0.7.la
-lib/rlm_mschap-0.7.so
 lib/rlm_mschap.so
-lib/rlm_ns_mta_md5.so
+lib/rlm_ns_mta_md5-0.8.1.la
+lib/rlm_ns_mta_md5-0.8.1.so
+lib/rlm_ns_mta_md5.a
 lib/rlm_ns_mta_md5.la
+lib/rlm_ns_mta_md5.so
+lib/rlm_pam-0.8.1.la
+lib/rlm_pam-0.8.1.so
 lib/rlm_pam.a
-lib/rlm_pam-0.7.so
-lib/rlm_pam-0.7.la
-lib/rlm_ns_mta_md5-0.7.so
-lib/rlm_ns_mta_md5-0.7.la
 lib/rlm_pam.la
-lib/rlm_ns_mta_md5.a
 lib/rlm_pam.so
+lib/rlm_pap-0.8.1.la
+lib/rlm_pap-0.8.1.so
+lib/rlm_pap.a
 lib/rlm_pap.la
-lib/rlm_pap-0.7.so
 lib/rlm_pap.so
-lib/rlm_pap.a
-lib/rlm_pap-0.7.la
-lib/rlm_radutmp-0.7.la
-lib/rlm_radutmp.so
-lib/rlm_preprocess-0.7.so
-lib/rlm_preprocess.so
-lib/rlm_preprocess-0.7.la
-lib/rlm_radutmp-0.7.so
-lib/rlm_preprocess.la
+lib/rlm_preprocess-0.8.1.la
+lib/rlm_preprocess-0.8.1.so
 lib/rlm_preprocess.a
-lib/rlm_radutmp.la
+lib/rlm_preprocess.la
+lib/rlm_preprocess.so
+lib/rlm_radutmp-0.8.1.la
+lib/rlm_radutmp-0.8.1.so
 lib/rlm_radutmp.a
-lib/rlm_realm.so
+lib/rlm_radutmp.la
+lib/rlm_radutmp.so
+lib/rlm_realm-0.8.1.la
+lib/rlm_realm-0.8.1.so
 lib/rlm_realm.a
 lib/rlm_realm.la
-lib/rlm_realm-0.7.so
-lib/rlm_realm-0.7.la
+lib/rlm_realm.so
+lib/rlm_sql-0.8.1.la
+lib/rlm_sql-0.8.1.so
 lib/rlm_sql.a
-lib/rlm_sql.so
-lib/rlm_sql-0.7.la
 lib/rlm_sql.la
-lib/rlm_sql-0.7.so
-lib/rlm_unix-0.7.la
-lib/rlm_unix.la
+lib/rlm_sql.so
+lib/rlm_sql_mysql.a
+lib/rlm_sql_mysql.la
+lib/rlm_sql_mysql.so
+lib/rlm_sql_mysql.so.0
+lib/rlm_unix-0.8.1.la
+lib/rlm_unix-0.8.1.so
 lib/rlm_unix.a
-lib/rlm_unix-0.7.so
+lib/rlm_unix.la
 lib/rlm_unix.so
+lib/rlm_x99_token-0.8.1.la
+lib/rlm_x99_token-0.8.1.so
 lib/rlm_x99_token.a
 lib/rlm_x99_token.la
-lib/rlm_x99_token-0.7.la
 lib/rlm_x99_token.so
-lib/rlm_x99_token-0.7.so
+sbin/check-radiusd-config
 sbin/checkrad
 sbin/radiusd
-sbin/rc.radiusd
 sbin/radwatch
-sbin/check-radiusd-config
+sbin/rc.radiusd
+@dirrm etc/raddb