6 files changed, 232 insertions, 67 deletions

diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index aab3ccd70798..3e1e1e2dc9ad 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION=	0.9.3
-PORTREVISION=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	andy@fud.org.nz
 COMMENT=	A free RADIUS server implementation
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
@@ -21,19 +20,32 @@ LOGDIR?=	/var/log
 
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 
+USE_RC_SUBR=	yes
 USE_LIBLTDL=	yes
 USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	yes
+USE_OPENSSL=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--prefix=${PREFIX} --quiet --with-logdir=${LOGDIR} \
 		--localstatedir=/var \
 		--disable-ltdl-install \
 		--with-ltdl-include=${LOCALBASE}/include \
 		--with-ltdl-lib=${LOCALBASE}/lib \
-		--with-large-files
+		--with-large-files --without-rlm_sql_unixodbc \
+		--without-rlm_sql_oracle --without-rlm_sql_iodbc \
+		--without-rlm_sql_db2 --without-rlm_krb5
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-.if defined(WITH_OPENLDAP)
+OPTIONS=	LDAP		"With LDAP user database" off \
+		MYSQL		"With MySQL user database" off \
+		PGSQL		"With PostgreSQL use database" off \
+		SNMP		"With SNMP support" off \
+		EXPERIMENTAL	"Build experimental modules" off
+
+.include <bsd.port.pre.mk>
+
+.ifdef(WITH_LDAP)
 USE_OPENLDAP=	YES
 PLIST_SUB+=	LDAP=""
 .else
@@ -41,7 +53,7 @@ CONFIGURE_ARGS+=--without-rlm_ldap
 PLIST_SUB+=	LDAP="@comment "
 .endif
 
-.if defined(WITH_MYSQL)
+.ifdef(WITH_MYSQL)
 USE_MYSQL=	YES
 PLIST_SUB+=	MYSQL=""
 .else
@@ -49,7 +61,7 @@ CONFIGURE_ARGS+=--without-rlm_sql_mysql
 PLIST_SUB+=	MYSQL="@comment "
 .endif
 
-.if defined(WITH_PGSQL) || defined(WITH_POSTGRESQL)
+.ifdef(WITH_PGSQL)
 POSTGRESQL_PORT?=	databases/postgresql7
 LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 PLIST_SUB+=	PGSQL=""
@@ -58,38 +70,66 @@ CONFIGURE_ARGS+=--without-rlm_sql_postgresql
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
+.ifdef(WITH_SNMP)
+LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
+.else
+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
+PLIST_SUB+=	EXPM="@comment "
+.endif
+
 .if defined(NOPORTDOCS)
-MAKE_ENV+=		NOPORTDOCS=yes
+MAKE_ENV+=	NOPORTDOCS=yes
 .endif
 
 # rlm_x99_token seems broken
-CONFIGURE_ARGS+=--without-rlm_x99_token
-PLIST_SUB+=	TOKEN="@comment "
+#CONFIGURE_ARGS+=--without-rlm_x99_token
+PLIST_SUB+=	TOKEN=""
 
 INSTALLS_SHLIB=	yes
 
-MAN1=		radclient.1 radlast.1 radtest.1 radwho.1 radzap.1
+MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
+		radzap.1
 MAN5=		acct_users.5 clients.5 dictionary.5 naslist.5 radiusd.conf.5 \
-		users.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_unix.5 users.5
 MAN8=		radiusd.8 radrelay.8 radwatch.8 rlm_ippool_tool.8
 
-DICTS=		dictionary.acc dictionary.alcatel dictionary.alteon \
-	       	dictionary.altiga dictionary.aptis dictionary.ascend \
-	       	dictionary.bay dictionary.cisco dictionary.cisco.bbsm \
+DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
+		dictionary.alcatel dictionary.alteon dictionary.altiga \
+		dictionary.aptis dictionary.ascend dictionary.bay \
+		dictionary.bristol 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
+	       	dictionary.freeradius dictionary.gandalf dictionary.juniper \
+	       	dictionary.karlnet dictionary.livingston dictionary.merit \
+		dictionary.microsoft dictionary.mikrotik dictionary.navini \
+	       	dictionary.nomadix dictionary.propel dictionary.quintum \
+		dictionary.redback dictionary.shasta dictionary.shiva \
+		dictionary.sonicwall dictionary.trapeze dictionary.tunnel \
+	       	dictionary.unix dictionary.usr dictionary.valemount \
+		dictionary.versanet
+
+post-patch:
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%RC_SUBR%%|${RC_SUBR}|g" \
+		< ${FILESDIR}/radiusd.sh > ${WRKDIR}/radiusd.sh
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/raddb ${DATADIR}
 .for dict in ${DICTS}
 	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
 .endfor
-	${INSTALL_SCRIPT} ${FILESDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/radiusd.sh ${PREFIX}/etc/rc.d/radiusd.sh
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo
index a99c349f6d0b..058c15618111 100644
--- a/net/freeradius/distinfo
+++ b/net/freeradius/distinfo
@@ -1,2 +1,2 @@
-MD5 (freeradius-0.9.3.tar.gz) = 36f33d9dd305a2c9f1089c30a9fff0b8
-SIZE (freeradius-0.9.3.tar.gz) = 1819922
+MD5 (freeradius-1.0.0.tar.gz) = 4755295e786c2d119c6749cc4dc66e10
+SIZE (freeradius-1.0.0.tar.gz) = 2199631
diff --git a/net/freeradius/files/patch-ab b/net/freeradius/files/patch-ab
index f9beec55bde7..67f06dd8a2de 100644
--- a/net/freeradius/files/patch-ab
+++ b/net/freeradius/files/patch-ab
@@ -1,9 +1,9 @@
---- 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 @@
+--- src/modules/rlm_mschap/rlm_mschap.c.orig	Thu Aug 19 10:20:28 2004
++++ src/modules/rlm_mschap/rlm_mschap.c	Thu Aug 19 10:21:16 2004
+@@ -220,10 +220,15 @@
  	SHA1_CTX Context;
  	char hash[20];
- 	
+ 
 +	const char *name;
 +
 +	name = strchr(user_name, '\\');
diff --git a/net/freeradius/files/patch-x99_rlm.c b/net/freeradius/files/patch-x99_rlm.c
new file mode 100644
index 000000000000..70fecf4393d8
--- /dev/null
+++ b/net/freeradius/files/patch-x99_rlm.c
@@ -0,0 +1,21 @@
+--- src/modules/rlm_x99_token/x99_rlm.c.orig	Wed Aug 18 10:52:56 2004
++++ src/modules/rlm_x99_token/x99_rlm.c	Wed Aug 18 10:53:43 2004
+@@ -544,8 +544,6 @@
+ 			"auth: bad state for [%s]: expired", username);
+ 		return RLM_MODULE_REJECT;
+ 	    }
+-good_state:
+-	    /* State is good! */
+ 
+ 	} else {
+ 	    /* This should only happen if the authorize code didn't run. */
+@@ -555,6 +553,9 @@
+ 	    return RLM_MODULE_FAIL;
+ 	}
+     } /* if (!fast_sync) */
++
++good_state:
++	    /* State is good! */
+ 
+     /* Get the time of the last authentication. */
+     if (x99_get_last_auth(inst->syncdir, username, &last_auth) != 0) {
diff --git a/net/freeradius/files/radiusd.sh b/net/freeradius/files/radiusd.sh
index 798339462cd1..ea3a152bfd47 100644
--- a/net/freeradius/files/radiusd.sh
+++ b/net/freeradius/files/radiusd.sh
@@ -1,38 +1,27 @@
 #!/bin/sh
 
-# RADIUSD_FLAGS='-xxyzsf -l stdout'
-RADIUSD_FLAGS=
+# PROVIDE radiusd
+# REQUIRE: NETWORKING SERVERS
+# BEFORE: DAEMON
+# KEYWORD: FreeBSD shutdown
 
-if [ -r /etc/defaults/rc.conf ]; then
-	. /etc/defaults/rc.conf
-	source_rc_confs
-elif [ -r /etc/rc.conf ]; then
-	. /etc/rc.conf
-fi
+#
+# Add the following lines to /etc/rc.conf to enable radiusd:
+#
+# radiusd_enable="YES"
+#
 
-prog=$(realpath $0) || exit 1
-dir=${prog%/*}
-PREFIX=${dir%/etc/rc.d}
+. %%RC_SUBR%%
 
-if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
-then
-	echo "$0: Cannot determine the PREFIX" >&2
-	exit 1
-fi
+name=radiusd
+rcvar=`set_rcvar`
 
-case $1 in
-start)
-	"$PREFIX"/sbin/radiusd $RADIUSD_FLAGS && echo -n " radiusd"
-	;;
-stop)
-	if [ -f /var/run/radiusd/radiusd.pid ]; then
-		kill `cat /var/run/radiusd/radiusd.pid` && echo -n ' radiusd'
-	fi
-	;;
-*)
-	echo "Usage: `basename $0` {start|stop}" >&2
-	exit 64
-	;;
-esac
+command=%%PREFIX%%/sbin/radiusd
+radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/radiusd.conf"}
+required_files=${radiusd_config}
+pidfile=/var/run/radiusd/radiusd.pid
 
-exit 0
+radiusd_enable=${radiusd_enable:-"NO"}
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/freeradius/pkg-plist b/net/freeradius/pkg-plist
index b361e5fe08a4..81a0cf06607f 100644
--- a/net/freeradius/pkg-plist
+++ b/net/freeradius/pkg-plist
@@ -1,4 +1,6 @@
+@unexec %D/etc/rc.d/radiusd.sh forcestop 2>/dev/null || true
 bin/radclient
+bin/radeapclient
 bin/radlast
 bin/radrelay
 bin/radtest
@@ -8,12 +10,33 @@ bin/rlm_dbm_cat
 bin/rlm_dbm_parser
 bin/rlm_ippool_tool
 bin/smbencrypt
+etc/raddb/certs/demoCA/serial.old
+etc/raddb/certs/demoCA/serial
+etc/raddb/certs/demoCA/index.txt.old
+etc/raddb/certs/demoCA/index.txt
+etc/raddb/certs/demoCA/cacert.pem
+etc/raddb/certs/root.p12
+etc/raddb/certs/root.der
+etc/raddb/certs/random
+etc/raddb/certs/newreq.pem
+etc/raddb/certs/newcert.pem
+etc/raddb/certs/dh
+etc/raddb/certs/cert-srv.pem
+etc/raddb/certs/cert-srv.p12
+etc/raddb/certs/cert-srv.der
+etc/raddb/certs/cert-clt.pem
+etc/raddb/certs/cert-clt.p12
+etc/raddb/certs/cert-clt.der
+etc/raddb/certs/root.pem
+etc/raddb/certs/README
 etc/raddb/acct_users
 etc/raddb/attrs
 etc/raddb/clients
 etc/raddb/clients.conf
 etc/raddb/dictionary
+%%EXPM%%etc/raddb/example.pl
 etc/raddb/experimental.conf
+etc/raddb/eap.conf
 etc/raddb/hints
 etc/raddb/huntgroups
 etc/raddb/ldap.attrmap
@@ -32,6 +55,11 @@ etc/raddb/users
 etc/raddb/x99.conf
 etc/raddb/x99passwd.sample
 etc/rc.d/radiusd.sh
+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
@@ -62,11 +90,21 @@ lib/rlm_chap-%%PORTVERSION%%.so
 lib/rlm_chap.a
 lib/rlm_chap.la
 lib/rlm_chap.so
+lib/rlm_checkval-%%PORTVERSION%%.la
+lib/rlm_checkval-%%PORTVERSION%%.so
+lib/rlm_checkval.a
+lib/rlm_checkval.la
+lib/rlm_checkval.so
 lib/rlm_counter-%%PORTVERSION%%.la
 lib/rlm_counter-%%PORTVERSION%%.so
 lib/rlm_counter.a
 lib/rlm_counter.la
 lib/rlm_counter.so
+%%EXPM%%lib/rlm_cram-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_cram-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_cram.a
+%%EXPM%%lib/rlm_cram.la
+%%EXPM%%lib/rlm_cram.so
 lib/rlm_dbm-%%PORTVERSION%%.la
 lib/rlm_dbm-%%PORTVERSION%%.so
 lib/rlm_dbm.a
@@ -87,6 +125,11 @@ lib/rlm_eap-%%PORTVERSION%%.so
 lib/rlm_eap.a
 lib/rlm_eap.la
 lib/rlm_eap.so
+lib/rlm_eap_gtc-%%PORTVERSION%%.la
+lib/rlm_eap_gtc-%%PORTVERSION%%.so
+lib/rlm_eap_gtc.a
+lib/rlm_eap_gtc.la
+lib/rlm_eap_gtc.so
 lib/rlm_eap_leap-%%PORTVERSION%%.la
 lib/rlm_eap_leap-%%PORTVERSION%%.so
 lib/rlm_eap_leap.a
@@ -97,11 +140,36 @@ lib/rlm_eap_md5-%%PORTVERSION%%.so
 lib/rlm_eap_md5.a
 lib/rlm_eap_md5.la
 lib/rlm_eap_md5.so
+lib/rlm_eap_mschapv2-%%PORTVERSION%%.la
+lib/rlm_eap_mschapv2-%%PORTVERSION%%.so
+lib/rlm_eap_mschapv2.a
+lib/rlm_eap_mschapv2.la
+lib/rlm_eap_mschapv2.so
+lib/rlm_eap_peap-%%PORTVERSION%%.la
+lib/rlm_eap_peap-%%PORTVERSION%%.so
+lib/rlm_eap_peap.a
+lib/rlm_eap_peap.la
+lib/rlm_eap_peap.so
+lib/rlm_eap_sim-%%PORTVERSION%%.la
+lib/rlm_eap_sim-%%PORTVERSION%%.so
+lib/rlm_eap_sim.a
+lib/rlm_eap_sim.la
+lib/rlm_eap_sim.so
 lib/rlm_eap_tls-%%PORTVERSION%%.la
 lib/rlm_eap_tls-%%PORTVERSION%%.so
 lib/rlm_eap_tls.a
 lib/rlm_eap_tls.la
 lib/rlm_eap_tls.so
+lib/rlm_eap_ttls-%%PORTVERSION%%.la
+lib/rlm_eap_ttls-%%PORTVERSION%%.so
+lib/rlm_eap_ttls.a
+lib/rlm_eap_ttls.la
+lib/rlm_eap_ttls.so
+%%EXPM%%lib/rlm_example-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_example-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_example.a
+%%EXPM%%lib/rlm_example.la
+%%EXPM%%lib/rlm_example.so
 lib/rlm_exec-%%PORTVERSION%%.la
 lib/rlm_exec-%%PORTVERSION%%.so
 lib/rlm_exec.a
@@ -152,11 +220,26 @@ lib/rlm_pap-%%PORTVERSION%%.so
 lib/rlm_pap.a
 lib/rlm_pap.la
 lib/rlm_pap.so
+lib/rlm_passwd-%%PORTVERSION%%.la
+lib/rlm_passwd-%%PORTVERSION%%.so
+lib/rlm_passwd.a
+lib/rlm_passwd.la
+lib/rlm_passwd.so
+%%EXPM%%lib/rlm_perl-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_perl-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_perl.a
+%%EXPM%%lib/rlm_perl.la
+%%EXPM%%lib/rlm_perl.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
 lib/rlm_radutmp-%%PORTVERSION%%.la
 lib/rlm_radutmp-%%PORTVERSION%%.so
 lib/rlm_radutmp.a
@@ -167,11 +250,26 @@ lib/rlm_realm-%%PORTVERSION%%.so
 lib/rlm_realm.a
 lib/rlm_realm.la
 lib/rlm_realm.so
+%%EXPM%%lib/rlm_sim_files-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_sim_files-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_sim_files.a
+%%EXPM%%lib/rlm_sim_files.la
+%%EXPM%%lib/rlm_sim_files.so
+%%EXPM%%lib/rlm_smb-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_smb-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_smb.a
+%%EXPM%%lib/rlm_smb.la
+%%EXPM%%lib/rlm_smb.so
 lib/rlm_sql-%%PORTVERSION%%.la
 lib/rlm_sql-%%PORTVERSION%%.so
 lib/rlm_sql.a
 lib/rlm_sql.la
 lib/rlm_sql.so
+%%EXPM%%lib/rlm_sqlcounter-%%PORTVERSION%%.la
+%%EXPM%%lib/rlm_sqlcounter-%%PORTVERSION%%.so
+%%EXPM%%lib/rlm_sqlcounter.a
+%%EXPM%%lib/rlm_sqlcounter.la
+%%EXPM%%lib/rlm_sqlcounter.so
 %%MYSQL%%lib/rlm_sql_mysql-%%PORTVERSION%%.so
 %%MYSQL%%lib/rlm_sql_mysql.a
 %%MYSQL%%lib/rlm_sql_mysql.la
@@ -179,6 +277,7 @@ lib/rlm_sql.so
 %%PGSQL%%lib/rlm_sql_postgresql-%%PORTVERSION%%.so
 %%PGSQL%%lib/rlm_sql_postgresql.a
 %%PGSQL%%lib/rlm_sql_postgresql.la
+%%PGSQL%%lib/rlm_sql_postgresql.so
 lib/rlm_unix-%%PORTVERSION%%.la
 lib/rlm_unix-%%PORTVERSION%%.so
 lib/rlm_unix.a
@@ -217,8 +316,10 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/proxy
 %%PORTDOCS%%%%DOCSDIR%%/radrelay
 %%PORTDOCS%%%%DOCSDIR%%/rfc/attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/rfc/draft-kamath-pppext-eap-mschapv2-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/draft-sterman-aaa-sip-00.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/leap.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/pppext-eap-sim-12.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1157.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1227.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc1448.txt
@@ -247,29 +348,31 @@ sbin/rc.radiusd
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2882.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc2924.txt
 %%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3162.txt
-%%PORTDOCS%%%%DOCSDIR%%/rlm_acct_unique
-%%PORTDOCS%%%%DOCSDIR%%/rlm_always
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3575.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3576.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3579.txt
+%%PORTDOCS%%%%DOCSDIR%%/rfc/rfc3580.txt
 %%PORTDOCS%%%%DOCSDIR%%/rlm_attr_filter
 %%PORTDOCS%%%%DOCSDIR%%/rlm_dbm
-%%PORTDOCS%%%%DOCSDIR%%/rlm_detail
 %%PORTDOCS%%%%DOCSDIR%%/rlm_digest
 %%PORTDOCS%%%%DOCSDIR%%/rlm_eap
-%%PORTDOCS%%%%DOCSDIR%%/rlm_expr
 %%PORTDOCS%%%%DOCSDIR%%/rlm_fastusers
 %%PORTDOCS%%%%DOCSDIR%%/rlm_krb5
 %%PORTDOCS%%%%DOCSDIR%%/rlm_ldap
-%%PORTDOCS%%%%DOCSDIR%%/rlm_mschap
 %%PORTDOCS%%%%DOCSDIR%%/rlm_pam
 %%PORTDOCS%%%%DOCSDIR%%/rlm_passwd
 %%PORTDOCS%%%%DOCSDIR%%/rlm_python
+%%PORTDOCS%%%%DOCSDIR%%/rlm_sim_triplets
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sql
 %%PORTDOCS%%%%DOCSDIR%%/rlm_sqlcounter
-%%PORTDOCS%%%%DOCSDIR%%/rlm_unix
 %%PORTDOCS%%%%DOCSDIR%%/rlm_x99_token
 %%PORTDOCS%%%%DOCSDIR%%/supervise-radiusd.txt
 %%PORTDOCS%%%%DOCSDIR%%/tuning_guide
 %%PORTDOCS%%%%DOCSDIR%%/variables.txt
 %%DATADIR%%/dictionary
+%%DATADIR%%/dictionary.3com
+%%DATADIR%%/dictionary.3gpp
+%%DATADIR%%/dictionary.3gpp2
 %%DATADIR%%/dictionary.acc
 %%DATADIR%%/dictionary.alcatel
 %%DATADIR%%/dictionary.alteon
@@ -278,6 +381,7 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.ascend
 %%DATADIR%%/dictionary.bay
 %%DATADIR%%/dictionary.bintec
+%%DATADIR%%/dictionary.bristol
 %%DATADIR%%/dictionary.cabletron
 %%DATADIR%%/dictionary.cisco
 %%DATADIR%%/dictionary.cisco.bbsm
@@ -290,31 +394,42 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.extreme
 %%DATADIR%%/dictionary.foundry
 %%DATADIR%%/dictionary.freeradius
+%%DATADIR%%/dictionary.gandalf
 %%DATADIR%%/dictionary.itk
 %%DATADIR%%/dictionary.juniper
+%%DATADIR%%/dictionary.karlnet
 %%DATADIR%%/dictionary.livingston
+%%DATADIR%%/dictionary.merit
 %%DATADIR%%/dictionary.microsoft
+%%DATADIR%%/dictionary.mikrotik
+%%DATADIR%%/dictionary.navini
 %%DATADIR%%/dictionary.netscreen
 %%DATADIR%%/dictionary.nokia
 %%DATADIR%%/dictionary.nomadix
+%%DATADIR%%/dictionary.propel
 %%DATADIR%%/dictionary.quintum
 %%DATADIR%%/dictionary.redback
 %%DATADIR%%/dictionary.redcreek
 %%DATADIR%%/dictionary.shasta
 %%DATADIR%%/dictionary.shiva
+%%DATADIR%%/dictionary.sonicwall
 %%DATADIR%%/dictionary.springtide
 %%DATADIR%%/dictionary.telebit
+%%DATADIR%%/dictionary.trapeze
 %%DATADIR%%/dictionary.tunnel
+%%DATADIR%%/dictionary.unix
 %%DATADIR%%/dictionary.usr
+%%DATADIR%%/dictionary.valemount
 %%DATADIR%%/dictionary.versanet
 %%DATADIR%%/dictionary.wispr
 %%DATADIR%%/dictionary.xedia
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm etc/raddb
+@dirrm etc/raddb/certs/demoCA
 @exec mkdir -p /var/log/raddb
 @exec chmod -R og= /var/log/raddb
 @unexec rm -fr /var/log/raddb
 @exec mkdir -p /var/run/radiusd
 @unexec rm -fr /var/run/radiusd
+@unexec echo "You should remove %D/etc/raddb if you don't need it anymore."