From thompsa@fud.org.nz  Wed Aug 18 03:56:27 2004
Return-Path: <thompsa@fud.org.nz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 10DB316A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Aug 2004 03:56:27 +0000 (GMT)
Received: from avmta4-rme.xtra.co.nz (avmta4-rme.xtra.co.nz [210.86.15.159])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EB66B43D3F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 18 Aug 2004 03:56:23 +0000 (GMT)
	(envelope-from thompsa@fud.org.nz)
Received: from mta3-rme.xtra.co.nz ([210.86.15.142])
          by avmta4-rme.xtra.co.nz with ESMTP
          id <20040818035622.JURP13039.avmta4-rme.xtra.co.nz@mta3-rme.xtra.co.nz>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Wed, 18 Aug 2004 15:56:22 +1200
Received: from spoon.fud.org.nz ([203.96.106.191]) by mta3-rme.xtra.co.nz
          with ESMTP
          id <20040818035618.VWAT24839.mta3-rme.xtra.co.nz@spoon.fud.org.nz>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Wed, 18 Aug 2004 15:56:18 +1200
Received: by spoon.fud.org.nz (Postfix, from userid 1001)
	id C0FFB28464; Wed, 18 Aug 2004 15:55:13 +1200 (NZST)
Message-Id: <20040818035513.C0FFB28464@spoon.fud.org.nz>
Date: Wed, 18 Aug 2004 15:55:13 +1200 (NZST)
From: Andrew Thompson <andy@fud.org.nz>
Reply-To: Andrew Thompson <andy@fud.org.nz>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] update net/freeradius to 1.0.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         70603
>Category:       ports
>Synopsis:       [patch] update net/freeradius to 1.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Aug 18 04:00:42 GMT 2004
>Closed-Date:    Sun Aug 29 02:19:02 GMT 2004
>Last-Modified:  Sun Aug 29 02:19:02 GMT 2004
>Originator:     Andrew Thompson
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD spoon.fud.org.nz 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Mon Aug 16 20:06:31 NZST 2004 thompsa@spoon.fud.org.nz:/usr/obj/usr/src/sys/SPOON i386


	
>Description:
Update net/freeradius to 1.0.0 from 0.9.3 and take maintainership.

Please commit before ports freeze :)
	
>How-To-Repeat:
	
>Fix:

diff -urN net/freeradius.orig/Makefile net/freeradius/Makefile
--- net/freeradius.orig/Makefile	Tue Aug 17 19:43:20 2004
+++ net/freeradius/Makefile	Wed Aug 18 14:55:39 2004
@@ -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
@@ -33,6 +32,12 @@
 		--with-large-files
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
+.if defined(WITH_SNMP)
+BUILD_DEPENDS+=	${LOCALBASE}/bin/snmpwalk:${PORTSDIR}/net-mgmt/net-snmp
+.else
+CONFIGURE_ARGS+=--without-snmp
+.endif
+
 .if defined(WITH_OPENLDAP)
 USE_OPENLDAP=	YES
 PLIST_SUB+=	LDAP=""
@@ -58,32 +63,53 @@
 PLIST_SUB+=	PGSQL="@comment "
 .endif
 
+.if defined(WITH_EXPERIMENTAL)
+CONFIGURE_ARGS+=--with-experimental-modules
+PLIST_SUB+=	EXPM=""
+.else
+PLIST_SUB+=	EXPM="@comment "
+.endif
+
 .if defined(NOPORTDOCS)
 MAKE_ENV+=		NOPORTDOCS=yes
 .endif
 
-# rlm_x99_token seems broken
-CONFIGURE_ARGS+=--without-rlm_x99_token
-PLIST_SUB+=	TOKEN="@comment "
-
 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 \
-		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
+
+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.gandalf dictionary.juniper dictionary.karlnet \
+		dictionary.livingston dictionary.merit dictionary.microsoft \
+		dictionary.mikrotik dictionary.navini dictionary.nomadix \
+		dictionary.quintum dictionary.propel dictionary.redback \
+		dictionary.shasta dictionary.shiva dictionary.sonicwall \
+		dictionary.trapeze dictionary.tunnel dictionary.unix \
+		dictionary.usr dictionary.valemount dictionary.versanet
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "FreeRADIUS has the following tunable option(s):"
+	@${ECHO_MSG} "  WITH_SNMP          Build with SNMP support"
+	@${ECHO_MSG} "  WITH_OPENLDAP      Build with OpenLDAP support"
+	@${ECHO_MSG} "  WITH_MYSQL         Build with MySQL DB support"
+	@${ECHO_MSG} "  WITH_PGSQL         Build with PostgreSQL DB support"
+	@${ECHO_MSG} "  WITH_EXPERIMENTAL  Enable experimental modules"
+	@${ECHO_MSG} ""
 
 post-install:
 	@${MKDIR} ${PREFIX}/etc/raddb ${DATADIR}
diff -urN net/freeradius.orig/README.html net/freeradius/README.html
--- net/freeradius.orig/README.html	Tue Aug 17 19:43:20 2004
+++ net/freeradius/README.html	Wed Aug 18 14:44:35 2004
@@ -11,7 +11,7 @@
 
     <p>You are now in the directory for the port "net/freeradius".</p>
 
-    <p>The package name of this port is "freeradius-0.9.2".</p>
+    <p>The package name of this port is "freeradius-1.0.0".</p>
 
     <p>This is the one-line description for this port:</p>
     <hr>
diff -urN net/freeradius.orig/distinfo net/freeradius/distinfo
--- net/freeradius.orig/distinfo	Tue Aug 17 19:43:20 2004
+++ net/freeradius/distinfo	Tue Aug 17 19:55:07 2004
@@ -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 -urN net/freeradius.orig/files/patch-ab net/freeradius/files/patch-ab
--- net/freeradius.orig/files/patch-ab	Tue Aug 17 19:43:20 2004
+++ net/freeradius/files/patch-ab	Thu Jan  1 12:00:00 1970
@@ -1,19 +0,0 @@
---- 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, '\\');
-+	name = name == NULL ? user_name : name + 1;
-+
- 	SHA1Init(&Context);
- 	SHA1Update(&Context, peer_challenge, 16);
- 	SHA1Update(&Context, auth_challenge, 16);
--	SHA1Update(&Context, user_name, strlen(user_name));
-+	SHA1Update(&Context, name, strlen(name));
- 	SHA1Final(hash, &Context);
- 	memcpy(challenge, hash, 8);
- }
diff -urN net/freeradius.orig/files/patch-x99_rlm.c net/freeradius/files/patch-x99_rlm.c
--- net/freeradius.orig/files/patch-x99_rlm.c	Thu Jan  1 12:00:00 1970
+++ net/freeradius/files/patch-x99_rlm.c	Wed Aug 18 10:54:47 2004
@@ -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 -urN net/freeradius.orig/pkg-plist net/freeradius/pkg-plist
--- net/freeradius.orig/pkg-plist	Tue Aug 17 19:43:20 2004
+++ net/freeradius/pkg-plist	Wed Aug 18 14:56:40 2004
@@ -1,4 +1,5 @@
 bin/radclient
+bin/radeapclient
 bin/radlast
 bin/radrelay
 bin/radtest
@@ -13,6 +14,8 @@
 etc/raddb/clients
 etc/raddb/clients.conf
 etc/raddb/dictionary
+etc/raddb/eap.conf
+%%EXPM%%etc/raddb/example.pl
 etc/raddb/experimental.conf
 etc/raddb/hints
 etc/raddb/huntgroups
@@ -31,7 +34,31 @@
 etc/raddb/users
 etc/raddb/x99.conf
 etc/raddb/x99passwd.sample
+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/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 +89,21 @@
 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 +124,11 @@
 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 +139,36 @@
 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 +219,26 @@
 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 +249,26 @@
 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
@@ -184,11 +281,11 @@
 lib/rlm_unix.a
 lib/rlm_unix.la
 lib/rlm_unix.so
-%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.la
-%%TOKEN%%lib/rlm_x99_token-%%PORTVERSION%%.so
-%%TOKEN%%lib/rlm_x99_token.a
-%%TOKEN%%lib/rlm_x99_token.la
-%%TOKEN%%lib/rlm_x99_token.so
+lib/rlm_x99_token-%%PORTVERSION%%.la
+lib/rlm_x99_token-%%PORTVERSION%%.so
+lib/rlm_x99_token.a
+lib/rlm_x99_token.la
+lib/rlm_x99_token.so
 sbin/check-radiusd-config
 sbin/checkrad
 sbin/radiusd
@@ -217,8 +314,10 @@
 %%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 +346,31 @@
 %%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 +379,7 @@
 %%DATADIR%%/dictionary.ascend
 %%DATADIR%%/dictionary.bay
 %%DATADIR%%/dictionary.bintec
+%%DATADIR%%/dictionary.bristol
 %%DATADIR%%/dictionary.cabletron
 %%DATADIR%%/dictionary.cisco
 %%DATADIR%%/dictionary.cisco.bbsm
@@ -290,28 +392,40 @@
 %%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.usr
+%%DATADIR%%/dictionary.unix
+%%DATADIR%%/dictionary.valemount
 %%DATADIR%%/dictionary.versanet
 %%DATADIR%%/dictionary.wispr
 %%DATADIR%%/dictionary.xedia
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/rfc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm etc/raddb/certs/demoCA
+@dirrm etc/raddb/certs
 @dirrm etc/raddb
 @exec mkdir -p /var/log/raddb
 @exec chmod -R og= /var/log/raddb
	


>Release-Note:
>Audit-Trail:

From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: freebsd-gnats-submit@FreeBSD.org, andy@fud.org.nz
Cc:  
Subject: Re: ports/70603: [patch] update net/freeradius to 1.0.0
Date: Thu, 19 Aug 2004 16:08:25 +0200 (CEST)

   This message is in MIME format.  The first part should be readable text,
   while the remaining parts are likely unreadable without MIME-aware tools.
 
 --0-888684386-1092924505=:72256
 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
 
 Hi,
 
 attached is a better patch to update net/freeradius to 1.0.0
 Andrew's changes are merged plus the additional stuff i've done.
 
 - utilize OPTIONS
 - rcNG'ify radiusd.sh
 - get the right dependencies
 - pkg-plist adjusted ( %D/etc/raddb/certs will not get removed by a
    pkg_delete, to keep user installed certificates )
 
 regards
 Joerg
 --0-888684386-1092924505=:72256
 Content-Type: TEXT/PLAIN; charset=US-ASCII; name="freeradius-1_0_0.diff"
 Content-Transfer-Encoding: BASE64
 Content-ID: <20040819160825.X72256@hades.admin.frm2>
 Content-Description: 
 Content-Disposition: attachment; filename="freeradius-1_0_0.diff"
 
 SW5kZXg6IE1ha2VmaWxlDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQpSQ1Mg
 ZmlsZTogL2hvbWUvbmN2cy9wb3J0cy9uZXQvZnJlZXJhZGl1cy9NYWtlZmls
 ZSx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMjMNCmRpZmYgLXUgLXIxLjIz
 IE1ha2VmaWxlDQotLS0gTWFrZWZpbGUJMTEgSnVuIDIwMDQgMDI6MjQ6MDYg
 LTAwMDAJMS4yMw0KKysrIE1ha2VmaWxlCTE5IEF1ZyAyMDA0IDEzOjU4OjU0
 IC0wMDAwDQpAQCAtMiwxMiArMiwxMiBAQA0KICMgRGF0ZSBjcmVhdGVkOiAg
 ICAgICAgIE1heSA5IDIwMDINCiAjIFdob206ICAgICAgICAgICAgICAgICBC
 cmlhbiBTb21lcnMgPGJyaWFuQEZyZWVCU0Qub3JnPg0KICMNCi0jICRGcmVl
 QlNEJA0KKyMgJEZyZWVCU0Q6IHBvcnRzL25ldC9mcmVlcmFkaXVzL01ha2Vm
 aWxlLHYgMS4yMyAyMDA0LzA2LzExIDAyOjI0OjA2IG5vcmsgRXhwICQNCiAj
 DQogDQogUE9SVE5BTUU9CWZyZWVyYWRpdXMNCi1QT1JUVkVSU0lPTj0JMC45
 LjMNCi1QT1JUUkVWSVNJT049CTENCitQT1JUVkVSU0lPTj0JMS4wLjANCisj
 UE9SVFJFVklTSU9OPQkxDQogQ0FURUdPUklFUz0JbmV0DQogTUFTVEVSX1NJ
 VEVTPQlmdHA6Ly9mdHAuZnJlZXJhZGl1cy5vcmcvcHViL3JhZGl1cy8gXA0K
 IAkJZnRwOi8vZnRwLkF3ZnVsaGFrLm9yZy9wdWIvcmFkaXVzLw0KQEAgLTIx
 LDE5ICsyMSwzMiBAQA0KIA0KIENPTkZMSUNUUz0JZ251LXJhZGl1cy0xLiog
 b3BlbnJhZGl1cy0wLiogcmFkaXVzZC1jaXN0cm9uLTEuKg0KIA0KK1VTRV9S
 Q19TVUJSPQl5ZXMNCiBVU0VfTElCTFRETD0JeWVzDQogVVNFX0dNQUtFPQl5
 ZXMNCi1VU0VfUEVSTDVfQlVJTEQ9eWVzDQorVVNFX1BFUkw1PQl5ZXMNCitV
 U0VfT1BFTlNTTD0JeWVzDQogVVNFX0xJQlRPT0xfVkVSPTEzDQogQ09ORklH
 VVJFX0FSR1M9CS0tcHJlZml4PSR7UFJFRklYfSAtLXF1aWV0IC0td2l0aC1s
 b2dkaXI9JHtMT0dESVJ9IFwNCiAJCS0tbG9jYWxzdGF0ZWRpcj0vdmFyIFwN
 CiAJCS0tZGlzYWJsZS1sdGRsLWluc3RhbGwgXA0KIAkJLS13aXRoLWx0ZGwt
 aW5jbHVkZT0ke0xPQ0FMQkFTRX0vaW5jbHVkZSBcDQogCQktLXdpdGgtbHRk
 bC1saWI9JHtMT0NBTEJBU0V9L2xpYiBcDQotCQktLXdpdGgtbGFyZ2UtZmls
 ZXMNCisJCS0td2l0aC1sYXJnZS1maWxlcyAtLXdpdGhvdXQtcmxtX3NxbF91
 bml4b2RiYyBcDQorCQktLXdpdGhvdXQtcmxtX3NxbF9vcmFjbGUgLS13aXRo
 b3V0LXJsbV9zcWxfaW9kYmMgXA0KKwkJLS13aXRob3V0LXJsbV9zcWxfZGIy
 IC0td2l0aG91dC1ybG1fa3JiNQ0KKw0KIFBMSVNUX1NVQj0JUE9SVFZFUlNJ
 T049JHtQT1JUVkVSU0lPTn0NCiANCi0uaWYgZGVmaW5lZChXSVRIX09QRU5M
 REFQKQ0KK09QVElPTlM9CUxEQVAJCSJXaXRoIExEQVAgdXNlciBkYXRhYmFz
 ZSIgb2ZmIFwNCisJCU1ZU1FMCQkiV2l0aCBNeVNRTCB1c2VyIGRhdGFiYXNl
 IiBvZmYgXA0KKwkJUEdTUUwJCSJXaXRoIFBvc3RncmVTUUwgdXNlIGRhdGFi
 YXNlIiBvZmYgXA0KKwkJU05NUAkJIldpdGggU05NUCBzdXBwb3J0IiBvZmYg
 XA0KKwkJRVhQRVJJTUVOVEFMCSJCdWlsZCBleHBlcmltZW50YWwgbW9kdWxl
 cyIgb2ZmDQorDQorLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4NCisNCisu
 aWZkZWYoV0lUSF9MREFQKQ0KIFVTRV9PUEVOTERBUD0JWUVTDQogUExJU1Rf
 U1VCKz0JTERBUD0iIg0KIC5lbHNlDQpAQCAtNDEsNyArNTQsNyBAQA0KIFBM
 SVNUX1NVQis9CUxEQVA9IkBjb21tZW50ICINCiAuZW5kaWYNCiANCi0uaWYg
 ZGVmaW5lZChXSVRIX01ZU1FMKQ0KKy5pZmRlZihXSVRIX01ZU1FMKQ0KIFVT
 RV9NWVNRTD0JWUVTDQogUExJU1RfU1VCKz0JTVlTUUw9IiINCiAuZWxzZQ0K
 QEAgLTQ5LDcgKzYyLDcgQEANCiBQTElTVF9TVUIrPQlNWVNRTD0iQGNvbW1l
 bnQgIg0KIC5lbmRpZg0KIA0KLS5pZiBkZWZpbmVkKFdJVEhfUEdTUUwpIHx8
 IGRlZmluZWQoV0lUSF9QT1NUR1JFU1FMKQ0KKy5pZmRlZihXSVRIX1BHU1FM
 KQ0KIFBPU1RHUkVTUUxfUE9SVD89CWRhdGFiYXNlcy9wb3N0Z3Jlc3FsNw0K
 IExJQl9ERVBFTkRTKz0JcHEuMzoke1BPUlRTRElSfS8ke1BPU1RHUkVTUUxf
 UE9SVH0NCiBQTElTVF9TVUIrPQlQR1NRTD0iIg0KQEAgLTU4LDM4ICs3MSw2
 NiBAQA0KIFBMSVNUX1NVQis9CVBHU1FMPSJAY29tbWVudCAiDQogLmVuZGlm
 DQogDQorLmlmZGVmKFdJVEhfU05NUCkNCitCVUlMRF9ERVBFTkRTKz0JJHtM
 T0NBTEJBU0V9L2Jpbi9zbm1wd2Fsazoke1BPUlRTRElSfS9uZXQtbWdtdC9u
 ZXQtc25tcA0KKy5lbHNlDQorQ09ORklHVVJFX0FSR1MrPS0td2l0aG91dC1z
 bm1wDQorLmVuZGlmDQorDQorLmlmZGVmKFdJVEhfRVhQRVJJTUVOVEFMKQ0K
 K1VTRV9QWVRIT049CXllcw0KKyMgaGFjayB0byBnZXQgdGhlIGRlcGVuZGVu
 Y3kNCisuaW5jbHVkZSAiJHtQT1JUU0RJUn0vTWsvYnNkLnB5dGhvbi5tayIN
 CitDT05GSUdVUkVfQVJHUys9LS13aXRoLWV4cGVyaW1lbnRhbC1tb2R1bGVz
 DQorUExJU1RfU1VCKz1FWFBNPSIiDQorLmVsc2UNCitQTElTVF9TVUIrPUVY
 UE09IkBjb21tZW50ICINCisuZW5kaWYNCisNCiAuaWYgZGVmaW5lZChOT1BP
 UlRET0NTKQ0KIE1BS0VfRU5WKz0JCU5PUE9SVERPQ1M9eWVzDQogLmVuZGlm
 DQogDQogIyBybG1feDk5X3Rva2VuIHNlZW1zIGJyb2tlbg0KLUNPTkZJR1VS
 RV9BUkdTKz0tLXdpdGhvdXQtcmxtX3g5OV90b2tlbg0KLVBMSVNUX1NVQis9
 CVRPS0VOPSJAY29tbWVudCAiDQorI0NPTkZJR1VSRV9BUkdTKz0tLXdpdGhv
 dXQtcmxtX3g5OV90b2tlbg0KK1BMSVNUX1NVQis9CVRPS0VOPSIiDQogDQog
 SU5TVEFMTFNfU0hMSUI9CXllcw0KIA0KLU1BTjE9CQlyYWRjbGllbnQuMSBy
 YWRsYXN0LjEgcmFkdGVzdC4xIHJhZHdoby4xIHJhZHphcC4xDQorTUFOMT0J
 CXJhZGNsaWVudC4xIHJhZGVhcGNsaWVudC4xIHJhZGxhc3QuMSByYWR0ZXN0
 LjEgcmFkd2hvLjEgXA0KKwkJcmFkemFwLjENCiBNQU41PQkJYWNjdF91c2Vy
 cy41IGNsaWVudHMuNSBkaWN0aW9uYXJ5LjUgbmFzbGlzdC41IHJhZGl1c2Qu
 Y29uZi41IFwNCi0JCXVzZXJzLjUNCisJCXJsbV9hY2N0X3VuaXF1ZS41IHJs
 bV9hbHdheXMuNSBybG1fYXR0cl9maWx0ZXIuNSBcDQorCQlybG1fYXR0cl9y
 ZXdyaXRlLjUgcmxtX2NoYXAuNSBybG1fY291bnRlci41IHJsbV9kZXRhaWwu
 NSBcDQorCQlybG1fZXhwci41IHJsbV9maWxlcy41IHJsbV9tc2NoYXAuNSBy
 bG1fcGFwLjUgcmxtX3Bhc3N3ZC41IFwNCisJCXJsbV9yZWFsbS41IHJsbV9z
 cWwuNSBybG1fdW5peC41IHVzZXJzLjUNCiBNQU44PQkJcmFkaXVzZC44IHJh
 ZHJlbGF5LjggcmFkd2F0Y2guOCBybG1faXBwb29sX3Rvb2wuOA0KIA0KLURJ
 Q1RTPQkJZGljdGlvbmFyeS5hY2MgZGljdGlvbmFyeS5hbGNhdGVsIGRpY3Rp
 b25hcnkuYWx0ZW9uIFwNCi0JICAgICAgIAlkaWN0aW9uYXJ5LmFsdGlnYSBk
 aWN0aW9uYXJ5LmFwdGlzIGRpY3Rpb25hcnkuYXNjZW5kIFwNCi0JICAgICAg
 IAlkaWN0aW9uYXJ5LmJheSBkaWN0aW9uYXJ5LmNpc2NvIGRpY3Rpb25hcnku
 Y2lzY28uYmJzbSBcDQorRElDVFM9CQlkaWN0aW9uYXJ5LjNjb20gZGljdGlv
 bmFyeS4zZ3BwIGRpY3Rpb25hcnkuM2dwcDIgZGljdGlvbmFyeS5hY2MgXA0K
 KwkJZGljdGlvbmFyeS5hbGNhdGVsIGRpY3Rpb25hcnkuYWx0ZW9uIGRpY3Rp
 b25hcnkuYWx0aWdhIFwNCisJCWRpY3Rpb25hcnkuYXB0aXMgZGljdGlvbmFy
 eS5hc2NlbmQgZGljdGlvbmFyeS5iYXkgXA0KKwkJZGljdGlvbmFyeS5icmlz
 dG9sIGRpY3Rpb25hcnkuY2lzY28gZGljdGlvbmFyeS5jaXNjby5iYnNtIFwN
 CiAJCWRpY3Rpb25hcnkuY2lzY28udnBuMzAwMCBkaWN0aW9uYXJ5LmNpc2Nv
 LnZwbjUwMDAgXA0KIAkJZGljdGlvbmFyeS5jb2x1YnJpcyBkaWN0aW9uYXJ5
 LmNvbHVtYmlhX3VuaXZlcnNpdHkgXA0KIAkgICAgICAgCWRpY3Rpb25hcnku
 Y29tcGF0IGRpY3Rpb25hcnkuZXJ4IGRpY3Rpb25hcnkuZm91bmRyeSBcDQot
 CSAgICAgICAJZGljdGlvbmFyeS5mcmVlcmFkaXVzIGRpY3Rpb25hcnkuanVu
 aXBlciBcDQotCSAgICAgICAJZGljdGlvbmFyeS5saXZpbmdzdG9uIGRpY3Rp
 b25hcnkubWljcm9zb2Z0IFwNCi0JICAgICAgIAlkaWN0aW9uYXJ5Lm5vbWFk
 aXggZGljdGlvbmFyeS5xdWludHVtIGRpY3Rpb25hcnkucmVkYmFjayBcDQot
 CSAgICAgICAJZGljdGlvbmFyeS5zaGFzdGEgZGljdGlvbmFyeS5zaGl2YSBk
 aWN0aW9uYXJ5LnR1bm5lbCBcDQotCSAgICAgICAJZGljdGlvbmFyeS51c3Ig
 ZGljdGlvbmFyeS52ZXJzYW5ldA0KKwkgICAgICAgCWRpY3Rpb25hcnkuZnJl
 ZXJhZGl1cyBkaWN0aW9uYXJ5LmdhbmRhbGYgZGljdGlvbmFyeS5qdW5pcGVy
 IFwNCisJICAgICAgIAlkaWN0aW9uYXJ5LmthcmxuZXQgZGljdGlvbmFyeS5s
 aXZpbmdzdG9uIGRpY3Rpb25hcnkubWVyaXQgXA0KKwkJZGljdGlvbmFyeS5t
 aWNyb3NvZnQgZGljdGlvbmFyeS5taWtyb3RpayBkaWN0aW9uYXJ5Lm5hdmlu
 aSBcDQorCSAgICAgICAJZGljdGlvbmFyeS5ub21hZGl4IGRpY3Rpb25hcnku
 cHJvcGVsIGRpY3Rpb25hcnkucXVpbnR1bSBcDQorCQlkaWN0aW9uYXJ5LnJl
 ZGJhY2sgZGljdGlvbmFyeS5zaGFzdGEgZGljdGlvbmFyeS5zaGl2YSBcDQor
 CQlkaWN0aW9uYXJ5LnNvbmljd2FsbCBkaWN0aW9uYXJ5LnRyYXBlemUgZGlj
 dGlvbmFyeS50dW5uZWwgXA0KKwkgICAgICAgCWRpY3Rpb25hcnkudW5peCBk
 aWN0aW9uYXJ5LnVzciBkaWN0aW9uYXJ5LnZhbGVtb3VudCBcDQorCQlkaWN0
 aW9uYXJ5LnZlcnNhbmV0DQorDQorcG9zdC1wYXRjaDoNCisJQCR7U0VEfSAt
 ZSAic3wlJVBSRUZJWCUlfCR7UFJFRklYfXxnIiAtZSAic3wlJVJDX1NVQlIl
 JXwke1JDX1NVQlJ9fGciIFwNCisJCTwgJHtGSUxFU0RJUn0vcmFkaXVzZC5z
 aCA+ICR7V1JLRElSfS9yYWRpdXNkLnNoDQogDQogcG9zdC1pbnN0YWxsOg0K
 IAlAJHtNS0RJUn0gJHtQUkVGSVh9L2V0Yy9yYWRkYiAke0RBVEFESVJ9DQog
 LmZvciBkaWN0IGluICR7RElDVFN9DQogCSR7SU5TVEFMTF9EQVRBfSAke1dS
 S1NSQ30vc2hhcmUvJHtkaWN0fSAke0RBVEFESVJ9LyR7ZGljdH0NCiAuZW5k
 Zm9yDQotCSR7SU5TVEFMTF9TQ1JJUFR9ICR7RklMRVNESVJ9L3JhZGl1c2Qu
 c2ggJHtQUkVGSVh9L2V0Yy9yYy5kL3JhZGl1c2Quc2gNCisJJHtJTlNUQUxM
 X1NDUklQVH0gJHtXUktESVJ9L3JhZGl1c2Quc2ggJHtQUkVGSVh9L2V0Yy9y
 Yy5kL3JhZGl1c2Quc2gNCiANCi0uaW5jbHVkZSA8YnNkLnBvcnQubWs+DQor
 LmluY2x1ZGUgPGJzZC5wb3J0LnBvc3QubWs+DQpJbmRleDogZGlzdGluZm8N
 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9uY3Zz
 L3BvcnRzL25ldC9mcmVlcmFkaXVzL2Rpc3RpbmZvLHYNCnJldHJpZXZpbmcg
 cmV2aXNpb24gMS42DQpkaWZmIC11IC1yMS42IGRpc3RpbmZvDQotLS0gZGlz
 dGluZm8JMTcgTWFyIDIwMDQgMTg6Mjk6MzEgLTAwMDAJMS42DQorKysgZGlz
 dGluZm8JMTkgQXVnIDIwMDQgMTM6NTg6NTQgLTAwMDANCkBAIC0xLDIgKzEs
 MiBAQA0KLU1ENSAoZnJlZXJhZGl1cy0wLjkuMy50YXIuZ3opID0gMzZmMzNk
 OWRkMzA1YTJjOWYxMDg5YzMwYTlmZmYwYjgNCi1TSVpFIChmcmVlcmFkaXVz
 LTAuOS4zLnRhci5neikgPSAxODE5OTIyDQorTUQ1IChmcmVlcmFkaXVzLTEu
 MC4wLnRhci5neikgPSA0NzU1Mjk1ZTc4NmMyZDExOWM2NzQ5Y2M0ZGM2NmUx
 MA0KK1NJWkUgKGZyZWVyYWRpdXMtMS4wLjAudGFyLmd6KSA9IDIxOTk2MzEN
 CkluZGV4OiBwa2ctcGxpc3QNCj09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJD
 UyBmaWxlOiAvaG9tZS9uY3ZzL3BvcnRzL25ldC9mcmVlcmFkaXVzL3BrZy1w
 bGlzdCx2DQpyZXRyaWV2aW5nIHJldmlzaW9uIDEuOQ0KZGlmZiAtdSAtcjEu
 OSBwa2ctcGxpc3QNCi0tLSBwa2ctcGxpc3QJOSBEZWMgMjAwMyAxMDoxOToy
 NSAtMDAwMAkxLjkNCisrKyBwa2ctcGxpc3QJMTkgQXVnIDIwMDQgMTM6NTg6
 NTQgLTAwMDANCkBAIC0xLDQgKzEsNiBAQA0KK0B1bmV4ZWMgJUQvZXRjL3Jj
 LmQvcmFkaXVzZC5zaCBmb3JjZXN0b3AgMj4vZGV2L251bGwgfHwgdHJ1ZQ0K
 IGJpbi9yYWRjbGllbnQNCitiaW4vcmFkZWFwY2xpZW50DQogYmluL3JhZGxh
 c3QNCiBiaW4vcmFkcmVsYXkNCiBiaW4vcmFkdGVzdA0KQEAgLTgsMTIgKzEw
 LDMzIEBADQogYmluL3JsbV9kYm1fcGFyc2VyDQogYmluL3JsbV9pcHBvb2xf
 dG9vbA0KIGJpbi9zbWJlbmNyeXB0DQorZXRjL3JhZGRiL2NlcnRzL2RlbW9D
 QS9zZXJpYWwub2xkDQorZXRjL3JhZGRiL2NlcnRzL2RlbW9DQS9zZXJpYWwN
 CitldGMvcmFkZGIvY2VydHMvZGVtb0NBL2luZGV4LnR4dC5vbGQNCitldGMv
 cmFkZGIvY2VydHMvZGVtb0NBL2luZGV4LnR4dA0KK2V0Yy9yYWRkYi9jZXJ0
 cy9kZW1vQ0EvY2FjZXJ0LnBlbQ0KK2V0Yy9yYWRkYi9jZXJ0cy9yb290LnAx
 Mg0KK2V0Yy9yYWRkYi9jZXJ0cy9yb290LmRlcg0KK2V0Yy9yYWRkYi9jZXJ0
 cy9yYW5kb20NCitldGMvcmFkZGIvY2VydHMvbmV3cmVxLnBlbQ0KK2V0Yy9y
 YWRkYi9jZXJ0cy9uZXdjZXJ0LnBlbQ0KK2V0Yy9yYWRkYi9jZXJ0cy9kaA0K
 K2V0Yy9yYWRkYi9jZXJ0cy9jZXJ0LXNydi5wZW0NCitldGMvcmFkZGIvY2Vy
 dHMvY2VydC1zcnYucDEyDQorZXRjL3JhZGRiL2NlcnRzL2NlcnQtc3J2LmRl
 cg0KK2V0Yy9yYWRkYi9jZXJ0cy9jZXJ0LWNsdC5wZW0NCitldGMvcmFkZGIv
 Y2VydHMvY2VydC1jbHQucDEyDQorZXRjL3JhZGRiL2NlcnRzL2NlcnQtY2x0
 LmRlcg0KK2V0Yy9yYWRkYi9jZXJ0cy9yb290LnBlbQ0KK2V0Yy9yYWRkYi9j
 ZXJ0cy9SRUFETUUNCiBldGMvcmFkZGIvYWNjdF91c2Vycw0KIGV0Yy9yYWRk
 Yi9hdHRycw0KIGV0Yy9yYWRkYi9jbGllbnRzDQogZXRjL3JhZGRiL2NsaWVu
 dHMuY29uZg0KIGV0Yy9yYWRkYi9kaWN0aW9uYXJ5DQorJSVFWFBNJSVldGMv
 cmFkZGIvZXhhbXBsZS5wbA0KIGV0Yy9yYWRkYi9leHBlcmltZW50YWwuY29u
 Zg0KK2V0Yy9yYWRkYi9lYXAuY29uZg0KIGV0Yy9yYWRkYi9oaW50cw0KIGV0
 Yy9yYWRkYi9odW50Z3JvdXBzDQogZXRjL3JhZGRiL2xkYXAuYXR0cm1hcA0K
 QEAgLTMyLDYgKzU1LDExIEBADQogZXRjL3JhZGRiL3g5OS5jb25mDQogZXRj
 L3JhZGRiL3g5OXBhc3N3ZC5zYW1wbGUNCiBldGMvcmMuZC9yYWRpdXNkLnNo
 DQorbGliL2xpYmVhcC0lJVBPUlRWRVJTSU9OJSUubGENCitsaWIvbGliZWFw
 LSUlUE9SVFZFUlNJT04lJS5zbw0KK2xpYi9saWJlYXAubGENCitsaWIvbGli
 ZWFwLmENCitsaWIvbGliZWFwLnNvDQogbGliL2xpYnJhZGl1cy0lJVBPUlRW
 RVJTSU9OJSUubGENCiBsaWIvbGlicmFkaXVzLSUlUE9SVFZFUlNJT04lJS5z
 bw0KIGxpYi9saWJyYWRpdXMuYQ0KQEAgLTYyLDExICs5MCwyMSBAQA0KIGxp
 Yi9ybG1fY2hhcC5hDQogbGliL3JsbV9jaGFwLmxhDQogbGliL3JsbV9jaGFw
 LnNvDQorbGliL3JsbV9jaGVja3ZhbC0lJVBPUlRWRVJTSU9OJSUubGENCits
 aWIvcmxtX2NoZWNrdmFsLSUlUE9SVFZFUlNJT04lJS5zbw0KK2xpYi9ybG1f
 Y2hlY2t2YWwubGENCitsaWIvcmxtX2NoZWNrdmFsLmENCitsaWIvcmxtX2No
 ZWNrdmFsLnNvDQogbGliL3JsbV9jb3VudGVyLSUlUE9SVFZFUlNJT04lJS5s
 YQ0KIGxpYi9ybG1fY291bnRlci0lJVBPUlRWRVJTSU9OJSUuc28NCiBsaWIv
 cmxtX2NvdW50ZXIuYQ0KIGxpYi9ybG1fY291bnRlci5sYQ0KIGxpYi9ybG1f
 Y291bnRlci5zbw0KKyUlRVhQTSUlbGliL3JsbV9jcmFtLSUlUE9SVFZFUlNJ
 T04lJS5sYQ0KKyUlRVhQTSUlbGliL3JsbV9jcmFtLSUlUE9SVFZFUlNJT04l
 JS5zbw0KKyUlRVhQTSUlbGliL3JsbV9jcmFtLmENCislJUVYUE0lJWxpYi9y
 bG1fY3JhbS5sYQ0KKyUlRVhQTSUlbGliL3JsbV9jcmFtLnNvDQogbGliL3Js
 bV9kYm0tJSVQT1JUVkVSU0lPTiUlLmxhDQogbGliL3JsbV9kYm0tJSVQT1JU
 VkVSU0lPTiUlLnNvDQogbGliL3JsbV9kYm0uYQ0KQEAgLTg3LDYgKzEyNSwx
 MSBAQA0KIGxpYi9ybG1fZWFwLmENCiBsaWIvcmxtX2VhcC5sYQ0KIGxpYi9y
 bG1fZWFwLnNvDQorbGliL3JsbV9lYXBfZ3RjLSUlUE9SVFZFUlNJT04lJS5s
 YQ0KK2xpYi9ybG1fZWFwX2d0Yy0lJVBPUlRWRVJTSU9OJSUuc28NCitsaWIv
 cmxtX2VhcF9ndGMubGENCitsaWIvcmxtX2VhcF9ndGMuYQ0KK2xpYi9ybG1f
 ZWFwX2d0Yy5zbw0KIGxpYi9ybG1fZWFwX2xlYXAtJSVQT1JUVkVSU0lPTiUl
 LmxhDQogbGliL3JsbV9lYXBfbGVhcC0lJVBPUlRWRVJTSU9OJSUuc28NCiBs
 aWIvcmxtX2VhcF9sZWFwLmENCkBAIC05NywxMSArMTQwLDM2IEBADQogbGli
 L3JsbV9lYXBfbWQ1LmENCiBsaWIvcmxtX2VhcF9tZDUubGENCiBsaWIvcmxt
 X2VhcF9tZDUuc28NCitsaWIvcmxtX2VhcF9tc2NoYXB2Mi0lJVBPUlRWRVJT
 SU9OJSUubGENCitsaWIvcmxtX2VhcF9tc2NoYXB2Mi0lJVBPUlRWRVJTSU9O
 JSUuc28NCitsaWIvcmxtX2VhcF9tc2NoYXB2Mi5sYQ0KK2xpYi9ybG1fZWFw
 X21zY2hhcHYyLmENCitsaWIvcmxtX2VhcF9tc2NoYXB2Mi5zbw0KK2xpYi9y
 bG1fZWFwX3BlYXAtJSVQT1JUVkVSU0lPTiUlLmxhDQorbGliL3JsbV9lYXBf
 cGVhcC0lJVBPUlRWRVJTSU9OJSUuc28NCitsaWIvcmxtX2VhcF9wZWFwLmxh
 DQorbGliL3JsbV9lYXBfcGVhcC5hDQorbGliL3JsbV9lYXBfcGVhcC5zbw0K
 K2xpYi9ybG1fZWFwX3NpbS0lJVBPUlRWRVJTSU9OJSUubGENCitsaWIvcmxt
 X2VhcF9zaW0tJSVQT1JUVkVSU0lPTiUlLnNvDQorbGliL3JsbV9lYXBfc2lt
 LmxhDQorbGliL3JsbV9lYXBfc2ltLmENCitsaWIvcmxtX2VhcF9zaW0uc28N
 CiBsaWIvcmxtX2VhcF90bHMtJSVQT1JUVkVSU0lPTiUlLmxhDQogbGliL3Js
 bV9lYXBfdGxzLSUlUE9SVFZFUlNJT04lJS5zbw0KIGxpYi9ybG1fZWFwX3Rs
 cy5hDQogbGliL3JsbV9lYXBfdGxzLmxhDQogbGliL3JsbV9lYXBfdGxzLnNv
 DQorbGliL3JsbV9lYXBfdHRscy0lJVBPUlRWRVJTSU9OJSUubGENCitsaWIv
 cmxtX2VhcF90dGxzLSUlUE9SVFZFUlNJT04lJS5zbw0KK2xpYi9ybG1fZWFw
 X3R0bHMubGENCitsaWIvcmxtX2VhcF90dGxzLmENCitsaWIvcmxtX2VhcF90
 dGxzLnNvDQorJSVFWFBNJSVsaWIvcmxtX2V4YW1wbGUtJSVQT1JUVkVSU0lP
 TiUlLmxhDQorJSVFWFBNJSVsaWIvcmxtX2V4YW1wbGUtJSVQT1JUVkVSU0lP
 TiUlLnNvDQorJSVFWFBNJSVsaWIvcmxtX2V4YW1wbGUuYQ0KKyUlRVhQTSUl
 bGliL3JsbV9leGFtcGxlLmxhDQorJSVFWFBNJSVsaWIvcmxtX2V4YW1wbGUu
 c28NCiBsaWIvcmxtX2V4ZWMtJSVQT1JUVkVSU0lPTiUlLmxhDQogbGliL3Js
 bV9leGVjLSUlUE9SVFZFUlNJT04lJS5zbw0KIGxpYi9ybG1fZXhlYy5hDQpA
 QCAtMTUyLDExICsyMjAsMjYgQEANCiBsaWIvcmxtX3BhcC5hDQogbGliL3Js
 bV9wYXAubGENCiBsaWIvcmxtX3BhcC5zbw0KK2xpYi9ybG1fcGFzc3dkLSUl
 UE9SVFZFUlNJT04lJS5sYQ0KK2xpYi9ybG1fcGFzc3dkLSUlUE9SVFZFUlNJ
 T04lJS5zbw0KK2xpYi9ybG1fcGFzc3dkLmxhDQorbGliL3JsbV9wYXNzd2Qu
 YQ0KK2xpYi9ybG1fcGFzc3dkLnNvDQorJSVFWFBNJSVsaWIvcmxtX3Blcmwt
 JSVQT1JUVkVSU0lPTiUlLmxhDQorJSVFWFBNJSVsaWIvcmxtX3BlcmwtJSVQ
 T1JUVkVSU0lPTiUlLnNvDQorJSVFWFBNJSVsaWIvcmxtX3BlcmwuYQ0KKyUl
 RVhQTSUlbGliL3JsbV9wZXJsLmxhDQorJSVFWFBNJSVsaWIvcmxtX3Blcmwu
 c28NCiBsaWIvcmxtX3ByZXByb2Nlc3MtJSVQT1JUVkVSU0lPTiUlLmxhDQog
 bGliL3JsbV9wcmVwcm9jZXNzLSUlUE9SVFZFUlNJT04lJS5zbw0KIGxpYi9y
 bG1fcHJlcHJvY2Vzcy5hDQogbGliL3JsbV9wcmVwcm9jZXNzLmxhDQogbGli
 L3JsbV9wcmVwcm9jZXNzLnNvDQorJSVFWFBNJSVsaWIvcmxtX3B5dGhvbi0l
 JVBPUlRWRVJTSU9OJSUubGENCislJUVYUE0lJWxpYi9ybG1fcHl0aG9uLSUl
 UE9SVFZFUlNJT04lJS5zbw0KKyUlRVhQTSUlbGliL3JsbV9weXRob24uYQ0K
 KyUlRVhQTSUlbGliL3JsbV9weXRob24ubGENCislJUVYUE0lJWxpYi9ybG1f
 cHl0aG9uLnNvDQogbGliL3JsbV9yYWR1dG1wLSUlUE9SVFZFUlNJT04lJS5s
 YQ0KIGxpYi9ybG1fcmFkdXRtcC0lJVBPUlRWRVJTSU9OJSUuc28NCiBsaWIv
 cmxtX3JhZHV0bXAuYQ0KQEAgLTE2NywxMSArMjUwLDI2IEBADQogbGliL3Js
 bV9yZWFsbS5hDQogbGliL3JsbV9yZWFsbS5sYQ0KIGxpYi9ybG1fcmVhbG0u
 c28NCislJUVYUE0lJWxpYi9ybG1fc2ltX2ZpbGVzLSUlUE9SVFZFUlNJT04l
 JS5sYQ0KKyUlRVhQTSUlbGliL3JsbV9zaW1fZmlsZXMtJSVQT1JUVkVSU0lP
 TiUlLnNvDQorJSVFWFBNJSVsaWIvcmxtX3NpbV9maWxlcy5hDQorJSVFWFBN
 JSVsaWIvcmxtX3NpbV9maWxlcy5sYQ0KKyUlRVhQTSUlbGliL3JsbV9zaW1f
 ZmlsZXMuc28NCislJUVYUE0lJWxpYi9ybG1fc21iLSUlUE9SVFZFUlNJT04l
 JS5sYQ0KKyUlRVhQTSUlbGliL3JsbV9zbWItJSVQT1JUVkVSU0lPTiUlLnNv
 DQorJSVFWFBNJSVsaWIvcmxtX3NtYi5hDQorJSVFWFBNJSVsaWIvcmxtX3Nt
 Yi5sYQ0KKyUlRVhQTSUlbGliL3JsbV9zbWIuc28NCiBsaWIvcmxtX3NxbC0l
 JVBPUlRWRVJTSU9OJSUubGENCiBsaWIvcmxtX3NxbC0lJVBPUlRWRVJTSU9O
 JSUuc28NCiBsaWIvcmxtX3NxbC5hDQogbGliL3JsbV9zcWwubGENCiBsaWIv
 cmxtX3NxbC5zbw0KKyUlRVhQTSUlbGliL3JsbV9zcWxjb3VudGVyLSUlUE9S
 VFZFUlNJT04lJS5sYQ0KKyUlRVhQTSUlbGliL3JsbV9zcWxjb3VudGVyLSUl
 UE9SVFZFUlNJT04lJS5zbw0KKyUlRVhQTSUlbGliL3JsbV9zcWxjb3VudGVy
 LmENCislJUVYUE0lJWxpYi9ybG1fc3FsY291bnRlci5sYQ0KKyUlRVhQTSUl
 bGliL3JsbV9zcWxjb3VudGVyLnNvDQogJSVNWVNRTCUlbGliL3JsbV9zcWxf
 bXlzcWwtJSVQT1JUVkVSU0lPTiUlLnNvDQogJSVNWVNRTCUlbGliL3JsbV9z
 cWxfbXlzcWwuYQ0KICUlTVlTUUwlJWxpYi9ybG1fc3FsX215c3FsLmxhDQpA
 QCAtMTc5LDYgKzI3Nyw3IEBADQogJSVQR1NRTCUlbGliL3JsbV9zcWxfcG9z
 dGdyZXNxbC0lJVBPUlRWRVJTSU9OJSUuc28NCiAlJVBHU1FMJSVsaWIvcmxt
 X3NxbF9wb3N0Z3Jlc3FsLmENCiAlJVBHU1FMJSVsaWIvcmxtX3NxbF9wb3N0
 Z3Jlc3FsLmxhDQorJSVQR1NRTCUlbGliL3JsbV9zcWxfcG9zdGdyZXNxbC5z
 bw0KIGxpYi9ybG1fdW5peC0lJVBPUlRWRVJTSU9OJSUubGENCiBsaWIvcmxt
 X3VuaXgtJSVQT1JUVkVSU0lPTiUlLnNvDQogbGliL3JsbV91bml4LmENCkBA
 IC0yMTcsOCArMzE2LDEwIEBADQogJSVQT1JURE9DUyUlJSVET0NTRElSJSUv
 cHJveHkNCiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9yYWRyZWxheQ0KICUl
 UE9SVERPQ1MlJSUlRE9DU0RJUiUlL3JmYy9hdHRyaWJ1dGVzLmh0bWwNCisl
 JVBPUlRET0NTJSUlJURPQ1NESVIlJS9yZmMvZHJhZnQta2FtYXRoLXBwcGV4
 dC1lYXAtbXNjaGFwdjItMDAudHh0DQogJSVQT1JURE9DUyUlJSVET0NTRElS
 JSUvcmZjL2RyYWZ0LXN0ZXJtYW4tYWFhLXNpcC0wMC50eHQNCiAlJVBPUlRE
 T0NTJSUlJURPQ1NESVIlJS9yZmMvbGVhcC50eHQNCislJVBPUlRET0NTJSUl
 JURPQ1NESVIlJS9yZmMvcHBwZXh0LWVhcC1zaW0tMTIudHh0DQogJSVQT1JU
 RE9DUyUlJSVET0NTRElSJSUvcmZjL3JmYzExNTcudHh0DQogJSVQT1JURE9D
 UyUlJSVET0NTRElSJSUvcmZjL3JmYzEyMjcudHh0DQogJSVQT1JURE9DUyUl
 JSVET0NTRElSJSUvcmZjL3JmYzE0NDgudHh0DQpAQCAtMjQ3LDI5ICszNDgs
 MzEgQEANCiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9yZmMvcmZjMjg4Mi50
 eHQNCiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9yZmMvcmZjMjkyNC50eHQN
 CiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9yZmMvcmZjMzE2Mi50eHQNCi0l
 JVBPUlRET0NTJSUlJURPQ1NESVIlJS9ybG1fYWNjdF91bmlxdWUNCi0lJVBP
 UlRET0NTJSUlJURPQ1NESVIlJS9ybG1fYWx3YXlzDQorJSVQT1JURE9DUyUl
 JSVET0NTRElSJSUvcmZjL3JmYzM1NzUudHh0DQorJSVQT1JURE9DUyUlJSVE
 T0NTRElSJSUvcmZjL3JmYzM1NzYudHh0DQorJSVQT1JURE9DUyUlJSVET0NT
 RElSJSUvcmZjL3JmYzM1NzkudHh0DQorJSVQT1JURE9DUyUlJSVET0NTRElS
 JSUvcmZjL3JmYzM1ODAudHh0DQogJSVQT1JURE9DUyUlJSVET0NTRElSJSUv
 cmxtX2F0dHJfZmlsdGVyDQogJSVQT1JURE9DUyUlJSVET0NTRElSJSUvcmxt
 X2RibQ0KLSUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL3JsbV9kZXRhaWwNCiAl
 JVBPUlRET0NTJSUlJURPQ1NESVIlJS9ybG1fZGlnZXN0DQogJSVQT1JURE9D
 UyUlJSVET0NTRElSJSUvcmxtX2VhcA0KLSUlUE9SVERPQ1MlJSUlRE9DU0RJ
 UiUlL3JsbV9leHByDQogJSVQT1JURE9DUyUlJSVET0NTRElSJSUvcmxtX2Zh
 c3R1c2Vycw0KICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL3JsbV9rcmI1DQog
 JSVQT1JURE9DUyUlJSVET0NTRElSJSUvcmxtX2xkYXANCi0lJVBPUlRET0NT
 JSUlJURPQ1NESVIlJS9ybG1fbXNjaGFwDQogJSVQT1JURE9DUyUlJSVET0NT
 RElSJSUvcmxtX3BhbQ0KICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL3JsbV9w
 YXNzd2QNCiAlJVBPUlRET0NTJSUlJURPQ1NESVIlJS9ybG1fcHl0aG9uDQor
 JSVQT1JURE9DUyUlJSVET0NTRElSJSUvcmxtX3NpbV90cmlwbGV0cw0KICUl
 UE9SVERPQ1MlJSUlRE9DU0RJUiUlL3JsbV9zcWwNCiAlJVBPUlRET0NTJSUl
 JURPQ1NESVIlJS9ybG1fc3FsY291bnRlcg0KLSUlUE9SVERPQ1MlJSUlRE9D
 U0RJUiUlL3JsbV91bml4DQogJSVQT1JURE9DUyUlJSVET0NTRElSJSUvcmxt
 X3g5OV90b2tlbg0KICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL3N1cGVydmlz
 ZS1yYWRpdXNkLnR4dA0KICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL3R1bmlu
 Z19ndWlkZQ0KICUlUE9SVERPQ1MlJSUlRE9DU0RJUiUlL3ZhcmlhYmxlcy50
 eHQNCiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5DQorJSVEQVRBRElSJSUvZGlj
 dGlvbmFyeS4zY29tDQorJSVEQVRBRElSJSUvZGljdGlvbmFyeS4zZ3BwDQor
 JSVEQVRBRElSJSUvZGljdGlvbmFyeS4zZ3BwMg0KICUlREFUQURJUiUlL2Rp
 Y3Rpb25hcnkuYWNjDQogJSVEQVRBRElSJSUvZGljdGlvbmFyeS5hbGNhdGVs
 DQogJSVEQVRBRElSJSUvZGljdGlvbmFyeS5hbHRlb24NCkBAIC0yNzgsNiAr
 MzgxLDcgQEANCiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5LmFzY2VuZA0KICUl
 REFUQURJUiUlL2RpY3Rpb25hcnkuYmF5DQogJSVEQVRBRElSJSUvZGljdGlv
 bmFyeS5iaW50ZWMNCislJURBVEFESVIlJS9kaWN0aW9uYXJ5LmJyaXN0b2wN
 CiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5LmNhYmxldHJvbg0KICUlREFUQURJ
 UiUlL2RpY3Rpb25hcnkuY2lzY28NCiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5
 LmNpc2NvLmJic20NCkBAIC0yOTAsMzEgKzM5NCw0MiBAQA0KICUlREFUQURJ
 UiUlL2RpY3Rpb25hcnkuZXh0cmVtZQ0KICUlREFUQURJUiUlL2RpY3Rpb25h
 cnkuZm91bmRyeQ0KICUlREFUQURJUiUlL2RpY3Rpb25hcnkuZnJlZXJhZGl1
 cw0KKyUlREFUQURJUiUlL2RpY3Rpb25hcnkuZ2FuZGFsZg0KICUlREFUQURJ
 UiUlL2RpY3Rpb25hcnkuaXRrDQogJSVEQVRBRElSJSUvZGljdGlvbmFyeS5q
 dW5pcGVyDQorJSVEQVRBRElSJSUvZGljdGlvbmFyeS5rYXJsbmV0DQogJSVE
 QVRBRElSJSUvZGljdGlvbmFyeS5saXZpbmdzdG9uDQorJSVEQVRBRElSJSUv
 ZGljdGlvbmFyeS5tZXJpdA0KICUlREFUQURJUiUlL2RpY3Rpb25hcnkubWlj
 cm9zb2Z0DQorJSVEQVRBRElSJSUvZGljdGlvbmFyeS5taWtyb3Rpaw0KKyUl
 REFUQURJUiUlL2RpY3Rpb25hcnkubmF2aW5pDQogJSVEQVRBRElSJSUvZGlj
 dGlvbmFyeS5uZXRzY3JlZW4NCiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5Lm5v
 a2lhDQogJSVEQVRBRElSJSUvZGljdGlvbmFyeS5ub21hZGl4DQorJSVEQVRB
 RElSJSUvZGljdGlvbmFyeS5wcm9wZWwNCiAlJURBVEFESVIlJS9kaWN0aW9u
 YXJ5LnF1aW50dW0NCiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5LnJlZGJhY2sN
 CiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5LnJlZGNyZWVrDQogJSVEQVRBRElS
 JSUvZGljdGlvbmFyeS5zaGFzdGENCiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5
 LnNoaXZhDQorJSVEQVRBRElSJSUvZGljdGlvbmFyeS5zb25pY3dhbGwNCiAl
 JURBVEFESVIlJS9kaWN0aW9uYXJ5LnNwcmluZ3RpZGUNCiAlJURBVEFESVIl
 JS9kaWN0aW9uYXJ5LnRlbGViaXQNCislJURBVEFESVIlJS9kaWN0aW9uYXJ5
 LnRyYXBlemUNCiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5LnR1bm5lbA0KKyUl
 REFUQURJUiUlL2RpY3Rpb25hcnkudW5peA0KICUlREFUQURJUiUlL2RpY3Rp
 b25hcnkudXNyDQorJSVEQVRBRElSJSUvZGljdGlvbmFyeS52YWxlbW91bnQN
 CiAlJURBVEFESVIlJS9kaWN0aW9uYXJ5LnZlcnNhbmV0DQogJSVEQVRBRElS
 JSUvZGljdGlvbmFyeS53aXNwcg0KICUlREFUQURJUiUlL2RpY3Rpb25hcnku
 eGVkaWENCiBAZGlycm0gJSVEQVRBRElSJSUNCiAlJVBPUlRET0NTJSVAZGly
 cm0gJSVET0NTRElSJSUvcmZjDQogJSVQT1JURE9DUyUlQGRpcnJtICUlRE9D
 U0RJUiUlDQotQGRpcnJtIGV0Yy9yYWRkYg0KK0BkaXJybSBldGMvcmFkZGIv
 Y2VydHMvZGVtb0NBDQogQGV4ZWMgbWtkaXIgLXAgL3Zhci9sb2cvcmFkZGIN
 CiBAZXhlYyBjaG1vZCAtUiBvZz0gL3Zhci9sb2cvcmFkZGINCiBAdW5leGVj
 IHJtIC1mciAvdmFyL2xvZy9yYWRkYg0KIEBleGVjIG1rZGlyIC1wIC92YXIv
 cnVuL3JhZGl1c2QNCiBAdW5leGVjIHJtIC1mciAvdmFyL3J1bi9yYWRpdXNk
 DQorQHVuZXhlYyBlY2hvICJZb3Ugc2hvdWxkIHJlbW92ZSAlRC9ldGMvcmFk
 ZGIgaWYgeW91IGRvbid0IG5lZWQgaXQgYW55bW9yZS4iDQpJbmRleDogZmls
 ZXMvcGF0Y2gtYWINCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxl
 OiAvaG9tZS9uY3ZzL3BvcnRzL25ldC9mcmVlcmFkaXVzL2ZpbGVzL3BhdGNo
 LWFiLHYNCnJldHJpZXZpbmcgcmV2aXNpb24gMS4yDQpkaWZmIC11IC1yMS4y
 IHBhdGNoLWFiDQotLS0gZmlsZXMvcGF0Y2gtYWIJMjEgQXByIDIwMDMgMTM6
 MzU6MjEgLTAwMDAJMS4yDQorKysgZmlsZXMvcGF0Y2gtYWIJMTkgQXVnIDIw
 MDQgMTM6NTg6NTQgLTAwMDANCkBAIC0xLDkgKzEsOSBAQA0KLS0tLSBzcmMv
 bW9kdWxlcy9ybG1fbXNjaGFwL3JsbV9tc2NoYXAuYy5vcmlnCVR1ZSBBcHIg
 IDggMTE6NTM6MDUgMjAwMw0KLSsrKyBzcmMvbW9kdWxlcy9ybG1fbXNjaGFw
 L3JsbV9tc2NoYXAuYwlUdWUgQXByICA4IDExOjUzOjMyIDIwMDMNCi1AQCAt
 MjYwLDEwICsyNjAsMTUgQEANCistLS0gc3JjL21vZHVsZXMvcmxtX21zY2hh
 cC9ybG1fbXNjaGFwLmMub3JpZwlUaHUgQXVnIDE5IDEwOjIwOjI4IDIwMDQN
 CisrKysgc3JjL21vZHVsZXMvcmxtX21zY2hhcC9ybG1fbXNjaGFwLmMJVGh1
 IEF1ZyAxOSAxMDoyMToxNiAyMDA0DQorQEAgLTIyMCwxMCArMjIwLDE1IEBA
 DQogIAlTSEExX0NUWCBDb250ZXh0Ow0KICAJY2hhciBoYXNoWzIwXTsNCi0g
 CQ0KKyANCiArCWNvbnN0IGNoYXIgKm5hbWU7DQogKw0KICsJbmFtZSA9IHN0
 cmNocih1c2VyX25hbWUsICdcXCcpOw0KSW5kZXg6IGZpbGVzL3JhZGl1c2Qu
 c2gNCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAvaG9tZS9u
 Y3ZzL3BvcnRzL25ldC9mcmVlcmFkaXVzL2ZpbGVzL3JhZGl1c2Quc2gsdg0K
 cmV0cmlldmluZyByZXZpc2lvbiAxLjINCmRpZmYgLXUgLXIxLjIgcmFkaXVz
 ZC5zaA0KLS0tIGZpbGVzL3JhZGl1c2Quc2gJMTkgSnVuIDIwMDMgMDE6MjI6
 MjAgLTAwMDAJMS4yDQorKysgZmlsZXMvcmFkaXVzZC5zaAkxOSBBdWcgMjAw
 NCAxMzo1ODo1NCAtMDAwMA0KQEAgLTEsMzggKzEsMjcgQEANCiAjIS9iaW4v
 c2gNCiANCi0jIFJBRElVU0RfRkxBR1M9Jy14eHl6c2YgLWwgc3Rkb3V0Jw0K
 LVJBRElVU0RfRkxBR1M9DQorIyBQUk9WSURFIHJhZGl1c2QNCisjIFJFUVVJ
 UkU6IE5FVFdPUktJTkcgU0VSVkVSUw0KKyMgQkVGT1JFOiBEQUVNT04NCisj
 IEtFWVdPUkQ6IEZyZWVCU0Qgc2h1dGRvd24NCiANCi1pZiBbIC1yIC9ldGMv
 ZGVmYXVsdHMvcmMuY29uZiBdOyB0aGVuDQotCS4gL2V0Yy9kZWZhdWx0cy9y
 Yy5jb25mDQotCXNvdXJjZV9yY19jb25mcw0KLWVsaWYgWyAtciAvZXRjL3Jj
 LmNvbmYgXTsgdGhlbg0KLQkuIC9ldGMvcmMuY29uZg0KLWZpDQotDQotcHJv
 Zz0kKHJlYWxwYXRoICQwKSB8fCBleGl0IDENCi1kaXI9JHtwcm9nJS8qfQ0K
 LVBSRUZJWD0ke2RpciUvZXRjL3JjLmR9DQotDQotaWYgWyAuIiRkaXIiID0g
 LiIkcHJvZyIgLW8gLiIkUFJFRklYIiA9IC4iJGRpciIgXQ0KLXRoZW4NCi0J
 ZWNobyAiJDA6IENhbm5vdCBkZXRlcm1pbmUgdGhlIFBSRUZJWCIgPiYyDQot
 CWV4aXQgMQ0KLWZpDQotDQotY2FzZSAkMSBpbg0KLXN0YXJ0KQ0KLQkiJFBS
 RUZJWCIvc2Jpbi9yYWRpdXNkICRSQURJVVNEX0ZMQUdTICYmIGVjaG8gLW4g
 IiByYWRpdXNkIg0KLQk7Ow0KLXN0b3ApDQotCWlmIFsgLWYgL3Zhci9ydW4v
 cmFkaXVzZC9yYWRpdXNkLnBpZCBdOyB0aGVuDQotCQlraWxsIGBjYXQgL3Zh
 ci9ydW4vcmFkaXVzZC9yYWRpdXNkLnBpZGAgJiYgZWNobyAtbiAnIHJhZGl1
 c2QnDQotCWZpDQotCTs7DQotKikNCi0JZWNobyAiVXNhZ2U6IGBiYXNlbmFt
 ZSAkMGAge3N0YXJ0fHN0b3B9IiA+JjINCi0JZXhpdCA2NA0KLQk7Ow0KLWVz
 YWMNCisjDQorIyBBZGQgdGhlIGZvbGxvd2luZyBsaW5lcyB0byAvZXRjL3Jj
 LmNvbmYgdG8gZW5hYmxlIHJhZGl1c2Q6DQorIw0KKyMgcmFkaXVzZF9lbmFi
 bGU9IllFUyINCisjDQogDQotZXhpdCAwDQorLiAlJVJDX1NVQlIlJQ0KKw0K
 K25hbWU9cmFkaXVzZA0KK3JjdmFyPWBzZXRfcmN2YXJgDQorDQorY29tbWFu
 ZD0lJVBSRUZJWCUlL3NiaW4vcmFkaXVzZA0KK3JhZGl1c2RfY29uZmlnPSR7
 cmFkaXVzZF9jb25maWc6LSIlJVBSRUZJWCUlL2V0Yy9yYWRkYi9yYWRpdXNk
 LmNvbmYifQ0KK3JlcXVpcmVkX2ZpbGVzPSR7cmFkaXVzZF9jb25maWd9DQor
 cGlkZmlsZT0vdmFyL3J1bi9yYWRpdXNkL3JhZGl1c2QucGlkDQorDQorcmFk
 aXVzZF9lbmFibGU9JHtyYWRpdXNkX2VuYWJsZTotIk5PIn0NCisNCitsb2Fk
 X3JjX2NvbmZpZyAkbmFtZQ0KK3J1bl9yY19jb21tYW5kICIkMSINCg==
 
 --0-888684386-1092924505=:72256--
State-Changed-From-To: open->feedback 
State-Changed-By: vs 
State-Changed-When: Thu Aug 19 15:57:21 GMT 2004 
State-Changed-Why:  
For WITH_SNMP, you need a LIB_DEPENDS-line, I guess (see 
marked line), while you only use BUILD_DEPENDS=snmpwalk. 
Maybe the dependencies for the other options need reviewing as well? 

freeradius@menelaos [17:56:37]> ldd /usr/local/sbin/radiusd 
/usr/local/sbin/radiusd: 
libcrypt.so.2 => /usr/lib/libcrypt.so.2 (0x2808b000) 
libcipher.so.2 => /usr/lib/libcipher.so.2 (0x280a5000) 
libcrypto.so.3 => /usr/local/lib/libcrypto.so.3 (0x280b9000) 
libssl.so.3 => /usr/local/lib/libssl.so.3 (0x281a6000) 
libradius-1.0.0.so => /usr/local/lib/libradius-1.0.0.so (0x281d4000) 
***     libsnmp.so.4 => /usr/local/lib/libsnmp.so.4 (0x281e7000) 
libltdl.so.4 => /usr/local/lib/libltdl.so.4 (0x28241000) 
libc_r.so.4 => /usr/lib/libc_r.so.4 (0x28248000) 
libc.so.4 => /usr/lib/libc.so.4 (0x282ff000) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70603 

From: Andrew Thompson <andy@fud.org.nz>
To: Volker Stolz <vs@FreeBSD.org>
Cc: freebsd-ports-bugs@FreeBSD.org, Joerg.Pulz@frm2.tum.de
Subject: Re: ports/70603: [patch] update net/freeradius to 1.0.0
Date: Fri, 20 Aug 2004 11:12:24 +1200

 Here is a new patch that includes Joergs improvements and the proper
 snmp dependancies.
 
 Please commit if you are happy with it.
 
 Also available @ http://www.fud.org.nz/~andy/freeradius.diff
 
 
 
 
 diff -urN net/freeradius.orig/Makefile net/freeradius/Makefile
 --- net/freeradius.orig/Makefile	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/Makefile	Fri Aug 20 10:57:39 2004
 @@ -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 @@
  
  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 @@
  PLIST_SUB+=	LDAP="@comment "
  .endif
  
 -.if defined(WITH_MYSQL)
 +.ifdef(WITH_MYSQL)
  USE_MYSQL=	YES
  PLIST_SUB+=	MYSQL=""
  .else
 @@ -49,7 +61,7 @@
  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 @@
  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
  .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 -urN net/freeradius.orig/distinfo net/freeradius/distinfo
 --- net/freeradius.orig/distinfo	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/distinfo	Fri Aug 20 09:30:23 2004
 @@ -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 -urN net/freeradius.orig/files/patch-ab net/freeradius/files/patch-ab
 --- net/freeradius.orig/files/patch-ab	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/files/patch-ab	Fri Aug 20 09:37:54 2004
 @@ -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 -urN net/freeradius.orig/files/patch-x99_rlm.c net/freeradius/files/patch-x99_rlm.c
 --- net/freeradius.orig/files/patch-x99_rlm.c	Thu Jan  1 12:00:00 1970
 +++ net/freeradius/files/patch-x99_rlm.c	Fri Aug 20 09:23:39 2004
 @@ -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 -urN net/freeradius.orig/files/radiusd.sh net/freeradius/files/radiusd.sh
 --- net/freeradius.orig/files/radiusd.sh	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/files/radiusd.sh	Fri Aug 20 09:38:31 2004
 @@ -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
 -
 -prog=$(realpath $0) || exit 1
 -dir=${prog%/*}
 -PREFIX=${dir%/etc/rc.d}
 -
 -if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
 -then
 -	echo "$0: Cannot determine the PREFIX" >&2
 -	exit 1
 -fi
 -
 -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
 +#
 +# Add the following lines to /etc/rc.conf to enable radiusd:
 +#
 +# radiusd_enable="YES"
 +#
  
 -exit 0
 +. %%RC_SUBR%%
 +
 +name=radiusd
 +rcvar=`set_rcvar`
 +
 +command=%%PREFIX%%/sbin/radiusd
 +radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/radiusd.conf"}
 +required_files=${radiusd_config}
 +pidfile=/var/run/radiusd/radiusd.pid
 +
 +radiusd_enable=${radiusd_enable:-"NO"}
 +
 +load_rc_config $name
 +run_rc_command "$1"
 diff -urN net/freeradius.orig/pkg-plist net/freeradius/pkg-plist
 --- net/freeradius.orig/pkg-plist	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/pkg-plist	Fri Aug 20 09:35:03 2004
 @@ -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_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/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.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.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.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.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.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 @@
  %%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 @@
  %%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 @@
  %%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 @@
  %%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 @@
  %%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."

From: Andrew Thompson <andy@fud.org.nz>
To: Volker Stolz <vs@FreeBSD.org>
Cc: freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/70603: [patch] update net/freeradius to 1.0.0
Date: Fri, 20 Aug 2004 11:12:24 +1200

 Here is a new patch that includes Joergs improvements and the proper
 snmp dependancies.
 
 Please commit if you are happy with it.
 
 Also available @ http://www.fud.org.nz/~andy/freeradius.diff
 
 
 
 
 diff -urN net/freeradius.orig/Makefile net/freeradius/Makefile
 --- net/freeradius.orig/Makefile	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/Makefile	Fri Aug 20 10:57:39 2004
 @@ -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 @@
  
  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 @@
  PLIST_SUB+=	LDAP="@comment "
  .endif
  
 -.if defined(WITH_MYSQL)
 +.ifdef(WITH_MYSQL)
  USE_MYSQL=	YES
  PLIST_SUB+=	MYSQL=""
  .else
 @@ -49,7 +61,7 @@
  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 @@
  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
  .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 -urN net/freeradius.orig/distinfo net/freeradius/distinfo
 --- net/freeradius.orig/distinfo	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/distinfo	Fri Aug 20 09:30:23 2004
 @@ -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 -urN net/freeradius.orig/files/patch-ab net/freeradius/files/patch-ab
 --- net/freeradius.orig/files/patch-ab	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/files/patch-ab	Fri Aug 20 09:37:54 2004
 @@ -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 -urN net/freeradius.orig/files/patch-x99_rlm.c net/freeradius/files/patch-x99_rlm.c
 --- net/freeradius.orig/files/patch-x99_rlm.c	Thu Jan  1 12:00:00 1970
 +++ net/freeradius/files/patch-x99_rlm.c	Fri Aug 20 09:23:39 2004
 @@ -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 -urN net/freeradius.orig/files/radiusd.sh net/freeradius/files/radiusd.sh
 --- net/freeradius.orig/files/radiusd.sh	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/files/radiusd.sh	Fri Aug 20 09:38:31 2004
 @@ -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
 -
 -prog=$(realpath $0) || exit 1
 -dir=${prog%/*}
 -PREFIX=${dir%/etc/rc.d}
 -
 -if [ ."$dir" = ."$prog" -o ."$PREFIX" = ."$dir" ]
 -then
 -	echo "$0: Cannot determine the PREFIX" >&2
 -	exit 1
 -fi
 -
 -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
 +#
 +# Add the following lines to /etc/rc.conf to enable radiusd:
 +#
 +# radiusd_enable="YES"
 +#
  
 -exit 0
 +. %%RC_SUBR%%
 +
 +name=radiusd
 +rcvar=`set_rcvar`
 +
 +command=%%PREFIX%%/sbin/radiusd
 +radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/radiusd.conf"}
 +required_files=${radiusd_config}
 +pidfile=/var/run/radiusd/radiusd.pid
 +
 +radiusd_enable=${radiusd_enable:-"NO"}
 +
 +load_rc_config $name
 +run_rc_command "$1"
 diff -urN net/freeradius.orig/pkg-plist net/freeradius/pkg-plist
 --- net/freeradius.orig/pkg-plist	Fri Aug 20 09:04:36 2004
 +++ net/freeradius/pkg-plist	Fri Aug 20 09:35:03 2004
 @@ -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_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/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.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.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.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.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.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 @@
  %%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 @@
  %%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 @@
  %%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 @@
  %%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 @@
  %%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."
 _______________________________________________
 freebsd-ports-bugs@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
 To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org"

From: Joerg Pulz <Joerg.Pulz@frm2.tum.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Andrew Thompson <andy@fud.org.nz>
Subject: Re: ports/70603: [patch] update net/freeradius to 1.0.0
Date: Fri, 20 Aug 2004 08:22:27 +0200 (CEST)

 On Fri, 20 Aug 2004, Andrew Thompson wrote:
 
 > Thanks for the improvements, they look good.
 >
 > Volker sent an email about the dependancies, do you know the correct way
 > to do it?
 
 hi,
 
 please see below for a correct libsnmp dependency.
 i couldn't figure that out before, as i have no snmp stuff installed and don't
 really need it. anyway, here comes the correct solution.
 
 .ifdef(WITH_SNMP)
 LIB_DEPENDS+=	snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
 .else
 CONFIGURE_ARGS+=--without-snmp
 .endif
 
 regards
 Joerg
State-Changed-From-To: feedback->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Aug 29 02:18:50 GMT 2004 
State-Changed-Why:  
Welcome new maintainer! 
Commited, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=70603 
>Unformatted:
