- Update to 2.0.0

PR:		ports/119582
Submitted by:	David Wood <david@wood2.org.uk> (maintainer)
Approved by:	linimon (mentor)

6 files changed, 223 insertions, 159 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index da5da32ffad0..8df8e2e1a62d 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -6,57 +6,47 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION?=	1.1.7
-PORTREVISION?=	2
+DISTVERSION=	2.0.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
+MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/ \
 		ftp://ftp.ntua.gr/pub/net/radius/freeradius/ \
 		ftp://ftp.uk.freeradius.org/pub/radius/ \
-		ftp://ftp.us.freeradius.org/pub/radius/ \
+		http://ftp.cc.uoc.gr/mirrors/ftp.freeradius.org/ \
 		http://freeradius.portal-to-web.de/
 MASTER_SITE_SUBDIR=	. old
+DISTNAME=	freeradius-server-${DISTVERSION}
 
-MAINTAINER?=	david@wood2.org.uk
-COMMENT?=	A free RADIUS server implementation
+MAINTAINER=	david@wood2.org.uk
+COMMENT=	A free RADIUS server implementation
+
+RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 WANT_PERL=	yes
 
-LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
-
 LOGDIR?=	/var/log
 
-# If FREERADIUS_SLAVE_MYSQL is defined, we want to build the
-# freeradius-mysql slave port
-
-CONFLICTS=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].*
-.ifdef(FREERADIUS_SLAVE_MYSQL)
-CONFLICTS+=	freeradius-[0-9].* freeradius-mysql-[02-9].*
-PKGNAMESUFFIX=	-mysql
-.else
-CONFLICTS+=	freeradius-mysql-[0-9].* freeradius-[02-9].*
-.endif
+CONFLICTS=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
+		freeradius-mysql-[0-9].* freeradius-[013-9].*
 
 USE_RC_SUBR=	radiusd.sh
 USE_AUTOTOOLS=	libltdl:15 libtool:15 autoconf:261
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
+USE_PYTHON=	yes
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${DISTVERSION}
 
 OPTIONS=	KERBEROS	"With Kerberos support" off \
 		HEIMDAL		"With Heimdal Kerberos support" off \
-		LDAP		"With LDAP database support" off
-.ifndef(FREERADIUS_SLAVE_MYSQL)
-OPTIONS+=	MYSQL		"With MySQL database support" off
-.endif
-OPTIONS+=	PGSQL		"With PostgreSQL database support" off \
+		LDAP		"With LDAP database support" off \
+		MYSQL		"With MySQL database support" off \
+		PGSQL		"With PostgreSQL database support" off \
 		FIREBIRD	"With Firebird database support (EXPERIMENTAL)" off \
 		SNMP		"With SNMP support" off \
-		EDIR		"With Novell eDirectory support" off \
-		NOPERL		"Do not require perl (use only if necessary)" off \
 		EXPERIMENTAL	"Build experimental modules" off
 
 .include <bsd.port.pre.mk>
@@ -64,10 +54,6 @@ OPTIONS+=	PGSQL		"With PostgreSQL database support" off \
 # Default requirements for rc script
 _REQUIRE=	NETWORKING SERVERS
 
-.ifdef(FREERADIUS_SLAVE_MYSQL)
-WITH_MYSQL=	yes
-.endif
-
 CONFIGURE_ARGS=	--quiet \
 		--prefix=${PREFIX} \
 		--localstatedir=/var \
@@ -80,19 +66,23 @@ CONFIGURE_ARGS+=--with-docdir=${DOCSDIR}
 PLIST_SUB+=	PORTDOCS=""
 .endif
 CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
-		--with-large-files \
 		--with-openssl-includes=${OPENSSLINC}
 # This conditionality avoids -L/usr/lib in the radiusd build step when
 # building with base system OpenSSL
 .if ${OPENSSLLIB} != "/usr/lib"
 CONFIGURE_ARGS+=--with-openssl-libraries=${OPENSSLLIB}
 .endif
-CONFIGURE_ARGS+=--without-rlm_sql_db2 \
-		--without-rlm_sql_freetds \
+CONFIGURE_ARGS+=--with-rlm-python-lib-dir=${PYTHON_LIBDIR} \
+		--with-rlm-python-include-dir=${PYTHON_INCLUDEDIR} \
+		--without-rlm_eap_ikev2 \
+		--without-rlm_eap2 \
+		--without-rlm_opendirectory \
+		--without-rlm_sql_db2 \
 		--without-rlm_sql_iodbc \
 		--without-rlm_sql_oracle \
 		--without-rlm_sql_sybase \
-		--without-rlm_sql_unixodbc
+		--without-rlm_sql_unixodbc \
+		--with-vmps
 
 .if ${ARCH} == amd64
 CONFIGURE_ARGS+=	--with-pic
@@ -117,10 +107,6 @@ CONFIGURE_ARGS+=--without-rlm_krb5
 PLIST_SUB+=	KRB5="@comment "
 .endif
 
-.if defined(WITH_EDIR) && !defined(WITH_LDAP)
-WITH_LDAP=	yes
-.endif
-
 .ifdef(WITH_LDAP)
 USE_OPENLDAP=	YES
 PLIST_SUB+=	LDAP=""
@@ -130,10 +116,6 @@ CONFIGURE_ARGS+=--without-rlm_ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
-.ifdef(WITH_EDIR)
-CONFIGURE_ARGS+=--with-edir
-.endif
-
 .ifdef(WITH_MYSQL)
 USE_MYSQL=	YES
 CONFIGURE_ARGS+=--with-rlm_sql_mysql
@@ -175,9 +157,6 @@ CONFIGURE_ARGS+=--without-snmp
 .endif
 
 .ifdef(WITH_EXPERIMENTAL)
-USE_PYTHON=	yes
-# hack to get the dependency
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 CONFIGURE_ARGS+=--with-experimental-modules
 PLIST_SUB+=	EXPM=""
 .else
@@ -188,6 +167,14 @@ PLIST_SUB+=	EXPM="@comment "
 CONFIGURE_ARGS+=--enable-developer
 .endif
 
+# NOPERL has been removed from OPTIONS. It is a nasty hack as it doesn't
+# properly remove the dependency on perl. The main configure.in should be
+# patched so that the perl detection test fails to make this work properly,
+# though that configure run (at least in 2.0.0) only looks for perl to issue
+# a warning about Simultaneous-Use and checkrad.pl maybe not working without
+# perl.
+# Leave WITH_NOPERL as a knob for anyone that really wants it - or for
+# a proper fix in the future.
 .ifdef(WITH_NOPERL)
 CONFIGURE_ARGS+=--without-rlm_perl
 PLIST_SUB+=	RLMPERL="@comment "
@@ -201,13 +188,14 @@ USE_LDCONFIG=	yes
 
 MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
 		radzap.1
-MAN5=		acct_users.5 clients.5 clients.conf.5 dictionary.5 naslist.5 \
-		radiusd.conf.5 rlm_acct_unique.5 rlm_always.5 \
+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_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \
-		rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 \
-		users.5
-MAN8=		radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 rlm_ippool_tool.8
+		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
+MAN8=		radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 \
+		rlm_ippool_tool.8
 
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
@@ -218,6 +206,12 @@ post-patch:
 		${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" {} \;
 # Clean up after the last operation (so as not to get unwanted files when installing doc/)
 	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?\.(orig|bak)$$' -delete
+# Patch raddb/certs/bootstrap to use gmake instead of make
+	@${REINPLACE_CMD} -Ee "s:^make:${PREFIX}/bin/gmake:" \
+		${WRKSRC}/raddb/certs/bootstrap
+# Clean up after the last operation (so as not to get unwanted files in raddb)
+	@${FIND} -E ${WRKSRC}/raddb/certs -regex '.*/bootstrap\.(orig|bak)$$' \
+		-delete
 
 pre-configure:
 # Replace -pthread with ${PTHREAD_LIBS} in configure(.in) files
@@ -243,10 +237,11 @@ post-install:
 	done
 # Copy all files from ${EXAMPLESDIR}/raddb to ${PREFIX}/etc/raddb if they
 # don't already exist in the destination location
-	@for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type f -print \
+	@for i in `${FIND} -P ${EXAMPLESDIR}/raddb/ \( -type f -or -type l \) \
+	-print \
 	| ${SED} -e 's:^${EXAMPLESDIR}/raddb/::g'`; do \
 		if [ ! -f ${PREFIX}/etc/raddb/$${i} ]; then \
-			${CP} ${EXAMPLESDIR}/raddb/$${i} ${PREFIX}/etc/raddb/$${i}; \
+			${CP} -RP ${EXAMPLESDIR}/raddb/$${i} ${PREFIX}/etc/raddb/$${i}; \
 		fi; \
 	done
 # Set ${PREFIX}/etc/raddb and all the files and folders in it to g-w,o-rwx
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index c8840aaac7d1..ea5242127a3a 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeradius-1.1.7.tar.bz2) = d95d303adccdaa065e4bb1d5038b2452
-SHA256 (freeradius-1.1.7.tar.bz2) = 4fa180d5afa4ae957efbad541be8408fc4f6837933793d4b30910802a1ea2cf0
-SIZE (freeradius-1.1.7.tar.bz2) = 2063278
+MD5 (freeradius-server-2.0.0.tar.bz2) = 965bf18592468023fec80279246fa1df
+SHA256 (freeradius-server-2.0.0.tar.bz2) = 5938c20470af3a970fe74abad352e30cf7dd6e12a3248446a42eb95e2f199311
+SIZE (freeradius-server-2.0.0.tar.bz2) = 2270574
diff --git a/net/freeradius2/files/patch-pthread b/net/freeradius2/files/patch-pthread
index 8ccf0b6362a2..32c5e7d4e4e4 100644
--- a/net/freeradius2/files/patch-pthread
+++ b/net/freeradius2/files/patch-pthread
@@ -1,9 +1,9 @@
---- configure.in	Tue May 15 13:48:04 2007
-+++ configure.in	Fri Jul 27 18:43:56 2007
-@@ -475,14 +475,25 @@
+--- configure.in	Mon Aug  6 00:38:46 2007
++++ configure.in	Wed Aug 29 20:06:05 2007
+@@ -470,14 +470,25 @@
  dnl # On Some systems, we need extra pre-processor flags, to get them to
  dnl # to do the threading properly.
- dnl # 
+ dnl #
 -  AC_CHECK_LIB(pthread, pthread_create,
 -		[ CFLAGS="$CFLAGS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
 -                  LIBS="$LIBS -lpthread" ],
@@ -33,7 +33,7 @@
 +  esac
  fi
  
- dnl # 
+ dnl #
 --- src/modules/rlm_ldap/configure.in	Fri Jul 27 17:51:33 2007
 +++ src/modules/rlm_ldap/configure.in	Fri Jul 27 18:10:51 2007
 @@ -77,14 +77,27 @@
@@ -111,7 +111,7 @@
 --- src/modules/rlm_python/configure.in	Thu May 15 15:52:02 2003
 +++ src/modules/rlm_python/configure.in	Thu Aug  2 12:43:47 2007
 @@ -84,6 +84,44 @@
- 		AC_SMART_CHECK_LIB(python${PY_VERSION}, Py_Initialize)
+ 		FR_SMART_CHECK_LIB(python${PY_VERSION}, Py_Initialize)
  		LIBS=$old_LIBS
  
 +dnl # If that check fails, try it again having identified threading libraries
@@ -147,7 +147,7 @@
 +		        old_LIBS=$LIBS
 +		        LIBS="$LIBS $PY_LIB_LOC $PY_EXTRA_LIBS -lm"
 +		        smart_try_dir=$PY_LIB_DIR
-+		        AC_SMART_CHECK_LIB(python${PY_VERSION}, Py_Initialize)
++		        FR_SMART_CHECK_LIB(python${PY_VERSION}, Py_Initialize)
 +		        LIBS=$old_LIBS
 +		    fi
 +		fi
diff --git a/net/freeradius2/files/patch-radiusd-no-pie b/net/freeradius2/files/patch-radiusd-no-pie
deleted file mode 100644
index bf0772399683..000000000000
--- a/net/freeradius2/files/patch-radiusd-no-pie
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/main/Makefile.in	Wed Feb 14 15:44:23 2007
-+++ src/main/Makefile.in	Mon Dec  3 14:26:53 2007
-@@ -61,7 +61,7 @@
- 
- radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
- 	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
--		$(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
-+		$(LDFLAGS) $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
- 		$(MODULE_LIBS) $(LIBS) $(SNMP_LIBS) $(PTHREADLIB) \
- 		$(LIBLTDL) $(OPENSSL_LIBS)
- 
diff --git a/net/freeradius2/pkg-descr b/net/freeradius2/pkg-descr
index 95f994c97924..27749b155145 100644
--- a/net/freeradius2/pkg-descr
+++ b/net/freeradius2/pkg-descr
@@ -1,22 +1,8 @@
-FreeRADIUS is the premiere open source RADIUS server. Based on current
-statistics, there are over 50,000 deployments of the software. These
-deployments include small sites with 10 users, large-scale enterprises with
-tens of thousands of users, and carrier-class deployments with over 10 million
-users. In total, the sites that we know are using FreeRADIUS support nearly
-100 million users. The only other servers that come close in terms of market
-share and/or number of sites are ACS and IAS.
-
-The server scales easily from embedded systems with small amounts of memory to
-systems with millions of users. It is fast, flexible, configurable, and
-supports more authentication protocols than most commercial servers. It
-includes support for SQL, LDAP, RADIUS Proxying, failover, load balancing, and
-nearly 100 vendor dictionary files. It can perform authentications via the
-PAP, CHAP, MS-CHAP, EAP-MD5, EAP-GTC, EAP-TLS, EAP-TTLS, PEAPv0, LEAP,
-EAP-SIM, and Digest authentication protocols. It has reached a stable 1.1
-version, with incremental improvements added in each release.
-
-The server is released under the GNU General Public License (GPL), which means
-that it is free to download and install.
+FreeRADIUS is the most widely deployed RADIUS server in the world. It is the
+basis for multiple commercial offerings. It supplies the AAA needs of many
+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 0353a31f628c..74552443568d 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -2,7 +2,7 @@
 bin/radclient
 bin/radeapclient
 bin/radlast
-bin/radrelay
+bin/radsniff
 bin/radsqlrelay
 bin/radtest
 bin/radwho
@@ -11,34 +11,29 @@ bin/rlm_dbm_cat
 bin/rlm_dbm_parser
 bin/rlm_ippool_tool
 bin/smbencrypt
-@unexec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -f %D/%%EXAMPLESDIR%%/raddb/${i} ]; then if cmp -s %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; then rm -f %D/etc/raddb/${i}; fi; fi; done
+@unexec for i in `find -P %D/%%EXAMPLESDIR%%/raddb/ \( -type f -or -type l \) -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -f %D/%%EXAMPLESDIR%%/raddb/${i} ]; then if cmp -hsz %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; then rm -f %D/etc/raddb/${i}; fi; fi; done
 @unexec for i in `find -d %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ -d %D/etc/raddb/${i} ]; then rmdir %D/etc/raddb/${i} 2>/dev/null || true; fi; done
-@dirrmtry etc/raddb/certs/demoCA
 @dirrmtry etc/raddb/certs
+@dirrmtry etc/raddb/sql/mssql
+@dirrmtry etc/raddb/sql/mysql
+@dirrmtry etc/raddb/sql/oracle
+@dirrmtry etc/raddb/sql/postgresql
+@dirrmtry etc/raddb/sql
+@dirrmtry etc/raddb/sites-available
 @dirrmtry etc/raddb
 @unexec if [ -d %D/etc/raddb ]; then echo "You should remove %D/etc/raddb if you don't need it any more."; fi
 %%EXAMPLESDIR%%/raddb/acct_users
 %%EXAMPLESDIR%%/raddb/attrs
+%%EXAMPLESDIR%%/raddb/attrs.access_reject
+%%EXAMPLESDIR%%/raddb/attrs.accounting_response
+%%EXAMPLESDIR%%/raddb/attrs.pre-proxy
+%%EXAMPLESDIR%%/raddb/certs/Makefile
 %%EXAMPLESDIR%%/raddb/certs/README
-%%EXAMPLESDIR%%/raddb/certs/cert-clt.der
-%%EXAMPLESDIR%%/raddb/certs/cert-clt.p12
-%%EXAMPLESDIR%%/raddb/certs/cert-clt.pem
-%%EXAMPLESDIR%%/raddb/certs/cert-srv.der
-%%EXAMPLESDIR%%/raddb/certs/cert-srv.p12
-%%EXAMPLESDIR%%/raddb/certs/cert-srv.pem
-%%EXAMPLESDIR%%/raddb/certs/demoCA/cacert.pem
-%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt
-%%EXAMPLESDIR%%/raddb/certs/demoCA/index.txt.old
-%%EXAMPLESDIR%%/raddb/certs/demoCA/serial
-%%EXAMPLESDIR%%/raddb/certs/demoCA/serial.old
-%%EXAMPLESDIR%%/raddb/certs/dh
-%%EXAMPLESDIR%%/raddb/certs/newcert.pem
-%%EXAMPLESDIR%%/raddb/certs/newreq.pem
-%%EXAMPLESDIR%%/raddb/certs/random
-%%EXAMPLESDIR%%/raddb/certs/root.der
-%%EXAMPLESDIR%%/raddb/certs/root.p12
-%%EXAMPLESDIR%%/raddb/certs/root.pem
-%%EXAMPLESDIR%%/raddb/clients
+%%EXAMPLESDIR%%/raddb/certs/bootstrap
+%%EXAMPLESDIR%%/raddb/certs/ca.cnf
+%%EXAMPLESDIR%%/raddb/certs/client.cnf
+%%EXAMPLESDIR%%/raddb/certs/server.cnf
+%%EXAMPLESDIR%%/raddb/certs/xpextensions
 %%EXAMPLESDIR%%/raddb/clients.conf
 %%EXAMPLESDIR%%/raddb/dictionary
 %%EXAMPLESDIR%%/raddb/eap.conf
@@ -46,44 +41,76 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/hints
 %%EXAMPLESDIR%%/raddb/huntgroups
 %%EXAMPLESDIR%%/raddb/ldap.attrmap
-%%EXAMPLESDIR%%/raddb/mssql.conf
-%%EXAMPLESDIR%%/raddb/naslist
-%%EXAMPLESDIR%%/raddb/naspasswd
-%%EXAMPLESDIR%%/raddb/oraclesql.conf
 %%EXAMPLESDIR%%/raddb/otp.conf
-%%EXAMPLESDIR%%/raddb/postgresql.conf
-%%EXAMPLESDIR%%/raddb/postgresqlippool.conf
+%%EXAMPLESDIR%%/raddb/policy.conf
+%%EXAMPLESDIR%%/raddb/policy.txt
 %%EXAMPLESDIR%%/raddb/preproxy_users
 %%EXAMPLESDIR%%/raddb/proxy.conf
 %%EXAMPLESDIR%%/raddb/radiusd.conf
-%%EXAMPLESDIR%%/raddb/realms
+%%EXAMPLESDIR%%/raddb/sites-available/README
+%%EXAMPLESDIR%%/raddb/sites-available/default
+%%EXAMPLESDIR%%/raddb/sites-available/example
+%%EXAMPLESDIR%%/raddb/sites-enabled/default
 %%EXAMPLESDIR%%/raddb/snmp.conf
 %%EXAMPLESDIR%%/raddb/sql.conf
+%%EXAMPLESDIR%%/raddb/sql/mssql/dialup.conf
+%%EXAMPLESDIR%%/raddb/sql/mssql/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/mysql/counter.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/dialup.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/ippool.conf
+%%EXAMPLESDIR%%/raddb/sql/mysql/ippool.sql
+%%EXAMPLESDIR%%/raddb/sql/mysql/nas.sql
+%%EXAMPLESDIR%%/raddb/sql/mysql/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/oracle/dialup.conf
+%%EXAMPLESDIR%%/raddb/sql/oracle/ippool.sql
+%%EXAMPLESDIR%%/raddb/sql/oracle/nas.sql
+%%EXAMPLESDIR%%/raddb/sql/oracle/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/cisco_h323_db_schema.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/counter.conf
+%%EXAMPLESDIR%%/raddb/sql/postgresql/dialup.conf
+%%EXAMPLESDIR%%/raddb/sql/postgresql/ippool.conf
+%%EXAMPLESDIR%%/raddb/sql/postgresql/ippool.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/nas.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/schema.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/update_radacct_group_trigger.sql
+%%EXAMPLESDIR%%/raddb/sql/postgresql/voip-postpaid.conf
 %%EXAMPLESDIR%%/raddb/sqlippool.conf
+%%EXAMPLESDIR%%/raddb/templates.conf
 %%EXAMPLESDIR%%/raddb/users
 %%EXAMPLESDIR%%/raddb/example.pl
 @exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -d %D/etc/raddb/${i} ]; then mkdir -p %D/etc/raddb/${i}; fi; done
-@exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -f %D/etc/raddb/${i} ]; then cp %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; fi; done
+@exec for i in `find -P %D/%%EXAMPLESDIR%%/raddb/ \( -type f -or -type l \) -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -f %D/etc/raddb/${i} ]; then cp -RP %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; fi; done
 @exec chmod -R g-w,o-rwx %D/etc/raddb
-@dirrm %%EXAMPLESDIR%%/raddb/certs/demoCA
+@dirrm %%EXAMPLESDIR%%/raddb/sites-enabled
 @dirrm %%EXAMPLESDIR%%/raddb/certs
+@dirrm %%EXAMPLESDIR%%/raddb/sql/mssql
+@dirrm %%EXAMPLESDIR%%/raddb/sql/mysql
+@dirrm %%EXAMPLESDIR%%/raddb/sql/oracle
+@dirrm %%EXAMPLESDIR%%/raddb/sql/postgresql
+@dirrm %%EXAMPLESDIR%%/raddb/sql
+@dirrm %%EXAMPLESDIR%%/raddb/sites-available
 @dirrm %%EXAMPLESDIR%%/raddb
 @dirrm %%EXAMPLESDIR%%
-lib/libeap-%%PORTVERSION%%.la
-lib/libeap-%%PORTVERSION%%.so
-lib/libeap.a
-lib/libeap.la
-lib/libeap.so
-lib/libradius-%%PORTVERSION%%.la
-lib/libradius-%%PORTVERSION%%.so
-lib/libradius.a
-lib/libradius.la
-lib/libradius.so
+lib/libfreeradius-eap-%%PORTVERSION%%.la
+lib/libfreeradius-eap-%%PORTVERSION%%.so
+lib/libfreeradius-eap.a
+lib/libfreeradius-eap.la
+lib/libfreeradius-eap.so
+lib/libfreeradius-radius-%%PORTVERSION%%.la
+lib/libfreeradius-radius-%%PORTVERSION%%.so
+lib/libfreeradius-radius.a
+lib/libfreeradius-radius.la
+lib/libfreeradius-radius.so
 lib/rlm_acct_unique-%%PORTVERSION%%.la
 lib/rlm_acct_unique-%%PORTVERSION%%.so
 lib/rlm_acct_unique.a
 lib/rlm_acct_unique.la
 lib/rlm_acct_unique.so
+lib/rlm_acctlog-%%PORTVERSION%%.la
+lib/rlm_acctlog-%%PORTVERSION%%.so
+lib/rlm_acctlog.a
+lib/rlm_acctlog.la
+lib/rlm_acctlog.so
 lib/rlm_always-%%PORTVERSION%%.la
 lib/rlm_always-%%PORTVERSION%%.so
 lib/rlm_always.a
@@ -109,6 +136,11 @@ lib/rlm_checkval-%%PORTVERSION%%.so
 lib/rlm_checkval.a
 lib/rlm_checkval.la
 lib/rlm_checkval.so
+lib/rlm_copy_packet-%%PORTVERSION%%.la
+lib/rlm_copy_packet-%%PORTVERSION%%.so
+lib/rlm_copy_packet.a
+lib/rlm_copy_packet.la
+lib/rlm_copy_packet.so
 lib/rlm_counter-%%PORTVERSION%%.la
 lib/rlm_counter-%%PORTVERSION%%.so
 lib/rlm_counter.a
@@ -174,6 +206,11 @@ lib/rlm_eap_tls-%%PORTVERSION%%.so
 lib/rlm_eap_tls.a
 lib/rlm_eap_tls.la
 lib/rlm_eap_tls.so
+lib/rlm_eap_tnc-%%PORTVERSION%%.la
+lib/rlm_eap_tnc-%%PORTVERSION%%.so
+lib/rlm_eap_tnc.a
+lib/rlm_eap_tnc.la
+lib/rlm_eap_tnc.so
 lib/rlm_eap_ttls-%%PORTVERSION%%.la
 lib/rlm_eap_ttls-%%PORTVERSION%%.so
 lib/rlm_eap_ttls.a
@@ -189,6 +226,11 @@ lib/rlm_exec-%%PORTVERSION%%.so
 lib/rlm_exec.a
 lib/rlm_exec.la
 lib/rlm_exec.so
+lib/rlm_expiration-%%PORTVERSION%%.la
+lib/rlm_expiration-%%PORTVERSION%%.so
+lib/rlm_expiration.a
+lib/rlm_expiration.la
+lib/rlm_expiration.so
 lib/rlm_expr-%%PORTVERSION%%.la
 lib/rlm_expr-%%PORTVERSION%%.so
 lib/rlm_expr.a
@@ -209,6 +251,11 @@ lib/rlm_ippool-%%PORTVERSION%%.so
 lib/rlm_ippool.a
 lib/rlm_ippool.la
 lib/rlm_ippool.so
+%%EXPM%%lib/rlm_jradius-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_jradius-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_jradius.a
+%%EXPM%%lib/rlm_jradius.la
+%%EXPM%%lib/rlm_jradius.so
 %%KRB5%%lib/rlm_krb5-%%PORTVERSION%%.la
 %%KRB5%%lib/rlm_krb5-%%PORTVERSION%%.so
 %%KRB5%%lib/rlm_krb5.a
@@ -219,16 +266,21 @@ lib/rlm_ippool.so
 %%LDAP%%lib/rlm_ldap.a
 %%LDAP%%lib/rlm_ldap.la
 %%LDAP%%lib/rlm_ldap.so
+%%EXPM%%lib/rlm_linelog-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_linelog-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_linelog.a
+%%EXPM%%lib/rlm_linelog.la
+%%EXPM%%lib/rlm_linelog.so
+lib/rlm_logintime-%%PORTVERSION%%.la
+lib/rlm_logintime-%%PORTVERSION%%.so
+lib/rlm_logintime.a
+lib/rlm_logintime.la
+lib/rlm_logintime.so
 lib/rlm_mschap-%%PORTVERSION%%.la
 lib/rlm_mschap-%%PORTVERSION%%.so
 lib/rlm_mschap.a
 lib/rlm_mschap.la
 lib/rlm_mschap.so
-lib/rlm_ns_mta_md5-%%PORTVERSION%%.la
-lib/rlm_ns_mta_md5-%%PORTVERSION%%.so
-lib/rlm_ns_mta_md5.a
-lib/rlm_ns_mta_md5.la
-lib/rlm_ns_mta_md5.so
 lib/rlm_otp-%%PORTVERSION%%.la
 lib/rlm_otp-%%PORTVERSION%%.so
 lib/rlm_otp.a
@@ -254,16 +306,26 @@ lib/rlm_passwd.so
 %%RLMPERL%%lib/rlm_perl.a
 %%RLMPERL%%lib/rlm_perl.la
 %%RLMPERL%%lib/rlm_perl.so
+lib/rlm_policy-%%PORTVERSION%%.la
+lib/rlm_policy-%%PORTVERSION%%.so
+lib/rlm_policy.a
+lib/rlm_policy.la
+lib/rlm_policy.so
 lib/rlm_preprocess-%%PORTVERSION%%.la
 lib/rlm_preprocess-%%PORTVERSION%%.so
 lib/rlm_preprocess.a
 lib/rlm_preprocess.la
 lib/rlm_preprocess.so
-%%EXPM%%lib/rlm_python-%%PORTVERSION%%.la
-%%EXPM%%lib/rlm_python-%%PORTVERSION%%.so
-%%EXPM%%lib/rlm_python.a
-%%EXPM%%lib/rlm_python.la
-%%EXPM%%lib/rlm_python.so
+%%EXPM%%lib/rlm_protocol_filter-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_protocol_filter-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_protocol_filter.a
+%%EXPM%%lib/rlm_protocol_filter.la
+%%EXPM%%lib/rlm_protocol_filter.so
+lib/rlm_python-%%PORTVERSION%%.la
+lib/rlm_python-%%PORTVERSION%%.so
+lib/rlm_python.a
+lib/rlm_python.la
+lib/rlm_python.so
 lib/rlm_radutmp-%%PORTVERSION%%.la
 lib/rlm_radutmp-%%PORTVERSION%%.so
 lib/rlm_radutmp.a
@@ -289,6 +351,7 @@ lib/rlm_sql-%%PORTVERSION%%.so
 lib/rlm_sql.a
 lib/rlm_sql.la
 lib/rlm_sql.so
+%%FIREBIRD%%lib/rlm_sql_firebird-%%PORTVERSION%%.la
 %%FIREBIRD%%lib/rlm_sql_firebird-%%PORTVERSION%%.so
 %%FIREBIRD%%lib/rlm_sql_firebird.a
 %%FIREBIRD%%lib/rlm_sql_firebird.la
@@ -298,10 +361,12 @@ lib/rlm_sql_log-%%PORTVERSION%%.so
 lib/rlm_sql_log.a
 lib/rlm_sql_log.la
 lib/rlm_sql_log.so
+%%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.la
 %%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.so
 %%MYSQL%%lib/rlm_sql_mysql.a
 %%MYSQL%%lib/rlm_sql_mysql.la
 %%MYSQL%%lib/rlm_sql_mysql.so
+%%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.la
 %%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.so
 %%PGSQL%%lib/rlm_sql_postgresql.a
 %%PGSQL%%lib/rlm_sql_postgresql.la
@@ -331,6 +396,20 @@ sbin/checkrad
 sbin/radiusd
 sbin/radwatch
 sbin/rc.radiusd
+include/freeradius/hash.h
+include/freeradius/ident.h
+include/freeradius/libradius.h
+include/freeradius/md4.h
+include/freeradius/md5.h
+include/freeradius/missing.h
+include/freeradius/packet.h
+include/freeradius/radius.h
+include/freeradius/radpaths.h
+include/freeradius/sha1.h
+include/freeradius/token.h
+include/freeradius/udpfromto.h
+include/freeradius/vqp.h
+@dirrm include/freeradius
 %%PORTDOCS%%%%DOCSDIR%%/Acct-Type
 %%PORTDOCS%%%%DOCSDIR%%/Autz-Type
 %%PORTDOCS%%%%DOCSDIR%%/CYGWIN
@@ -351,15 +430,10 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/cisco
 %%PORTDOCS%%%%DOCSDIR%%/coding-methods.txt
 %%PORTDOCS%%%%DOCSDIR%%/configurable_failover
-%%PORTDOCS%%%%DOCSDIR%%/duplicate-users
 %%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.ldif
 %%PORTDOCS%%%%DOCSDIR%%/examples/iplanet.schema
-%%PORTDOCS%%%%DOCSDIR%%/examples/mssql.sql
-%%PORTDOCS%%%%DOCSDIR%%/examples/mysql.sql
 %%PORTDOCS%%%%DOCSDIR%%/examples/openldap.schema
-%%PORTDOCS%%%%DOCSDIR%%/examples/oracle.sql
-%%PORTDOCS%%%%DOCSDIR%%/examples/postgresql.sql
-%%PORTDOCS%%%%DOCSDIR%%/examples/postgresql.sql.extra
+%%PORTDOCS%%%%DOCSDIR%%/examples/postgresql_update_radacct_group_trigger.sql
 %%PORTDOCS%%%%DOCSDIR%%/ldap_howto.txt
 %%PORTDOCS%%%%DOCSDIR%%/load-balance.txt
 %%PORTDOCS%%%%DOCSDIR%%/misc-nas
@@ -368,7 +442,6 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/performance-testing
 %%PORTDOCS%%%%DOCSDIR%%/processing_users_file
 %%PORTDOCS%%%%DOCSDIR%%/proxy
-%%PORTDOCS%%%%DOCSDIR%%/radrelay
 %%PORTDOCS%%%%DOCSDIR%%/release-method.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-kamath-pppext-eap-mschapv2-00.txt
@@ -380,14 +453,11 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1448.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1901.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1905.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2058.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2059.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2138.txt
-%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2139.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2243.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2289.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2433.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2548.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2607.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2618.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2619.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2620.txt
@@ -407,11 +477,19 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3576.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3579.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3580.txt
-%%PORTDOCS%%%%DOCSDIR%%/rlm_attr_filter
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3748.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4372.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4590.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4675.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4679.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4818.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc4849.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc5080.txt
 %%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
-%%PORTDOCS%%%%DOCSDIR%%/rlm_digest
 %%PORTDOCS%%%%DOCSDIR%%/rlm_eap
+%%PORTDOCS%%%%DOCSDIR%%/rlm_expiration
 %%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers
+%%PORTDOCS%%%%DOCSDIR%%/rlm_jradius
 %%PORTDOCS%%%%DOCSDIR%%/rlm_krb5
 %%PORTDOCS%%%%DOCSDIR%%/rlm_ldap
 %%PORTDOCS%%%%DOCSDIR%%/rlm_pam
@@ -421,6 +499,7 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sql
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlippool
+%%PORTDOCS%%%%DOCSDIR%%/snmp
 %%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning_guide
 %%PORTDOCS%%%%DOCSDIR%%/variables.txt
@@ -442,11 +521,13 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.ascend
 %%DATADIR%%/dictionary.asn
 %%DATADIR%%/dictionary.avaya
+%%DATADIR%%/dictionary.azaire
 %%DATADIR%%/dictionary.bay
 %%DATADIR%%/dictionary.bintec
 %%DATADIR%%/dictionary.bristol
 %%DATADIR%%/dictionary.cablelabs
 %%DATADIR%%/dictionary.cabletron
+%%DATADIR%%/dictionary.chillispot
 %%DATADIR%%/dictionary.cisco
 %%DATADIR%%/dictionary.cisco.bbsm
 %%DATADIR%%/dictionary.cisco.vpn3000
@@ -467,28 +548,37 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.gandalf
 %%DATADIR%%/dictionary.garderos
 %%DATADIR%%/dictionary.gemtek
+%%DATADIR%%/dictionary.h3c
 %%DATADIR%%/dictionary.hp
+%%DATADIR%%/dictionary.huawei
 %%DATADIR%%/dictionary.ipunplugged
 %%DATADIR%%/dictionary.issanni
 %%DATADIR%%/dictionary.itk
+%%DATADIR%%/dictionary.jradius
 %%DATADIR%%/dictionary.juniper
 %%DATADIR%%/dictionary.karlnet
 %%DATADIR%%/dictionary.livingston
 %%DATADIR%%/dictionary.localweb
 %%DATADIR%%/dictionary.lucent
+%%DATADIR%%/dictionary.manzara
 %%DATADIR%%/dictionary.merit
 %%DATADIR%%/dictionary.microsoft
 %%DATADIR%%/dictionary.mikrotik
 %%DATADIR%%/dictionary.motorola
 %%DATADIR%%/dictionary.navini
 %%DATADIR%%/dictionary.netscreen
+%%DATADIR%%/dictionary.nexans
 %%DATADIR%%/dictionary.nokia
+%%DATADIR%%/dictionary.nokia.conflict
 %%DATADIR%%/dictionary.nomadix
 %%DATADIR%%/dictionary.nortel
 %%DATADIR%%/dictionary.ntua
+%%DATADIR%%/dictionary.openser
 %%DATADIR%%/dictionary.packeteer
 %%DATADIR%%/dictionary.patton
 %%DATADIR%%/dictionary.propel
+%%DATADIR%%/dictionary.prosoft
+%%DATADIR%%/dictionary.quiconnect
 %%DATADIR%%/dictionary.quintum
 %%DATADIR%%/dictionary.redback
 %%DATADIR%%/dictionary.redcreek
@@ -500,27 +590,31 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.rfc3162
 %%DATADIR%%/dictionary.rfc3576
 %%DATADIR%%/dictionary.rfc3580
+%%DATADIR%%/dictionary.rfc4072
 %%DATADIR%%/dictionary.rfc4372
-%%DATADIR%%/dictionary.rfc4590
 %%DATADIR%%/dictionary.rfc4675
 %%DATADIR%%/dictionary.rfc4679
+%%DATADIR%%/dictionary.rfc4818
+%%DATADIR%%/dictionary.rfc4849
 %%DATADIR%%/dictionary.riverstone
 %%DATADIR%%/dictionary.roaringpenguin
-%%DATADIR%%/dictionary.schulzrinne-sipping
 %%DATADIR%%/dictionary.shasta
 %%DATADIR%%/dictionary.shiva
+%%DATADIR%%/dictionary.slipstream
 %%DATADIR%%/dictionary.sofaware
 %%DATADIR%%/dictionary.sonicwall
 %%DATADIR%%/dictionary.springtide
 %%DATADIR%%/dictionary.starent
 %%DATADIR%%/dictionary.t_systems_nova
 %%DATADIR%%/dictionary.telebit
+%%DATADIR%%/dictionary.telkom
 %%DATADIR%%/dictionary.trapeze
 %%DATADIR%%/dictionary.tropos
 %%DATADIR%%/dictionary.unix
 %%DATADIR%%/dictionary.usr
 %%DATADIR%%/dictionary.valemount
 %%DATADIR%%/dictionary.versanet
+%%DATADIR%%/dictionary.vqp
 %%DATADIR%%/dictionary.walabi
 %%DATADIR%%/dictionary.waverider
 %%DATADIR%%/dictionary.wispr