Update "freeradius2" package to version 2.1.8. Changes since version 2.1.7:

- Feature improvements
  * Print more descriptive error message for too many EAP sessions.
    This gives hints on what to do when "failed to store handler"
  * Commands received from radmin are now printed on stdout when
    in debugging mode.
  * Allow accounting packets to be written to a detail file, even
    if they were read from a different detail file.
  * Added OpenSSL license exception (src/LICENSE.openssl)
- Bug fixes
  * DHCP sockets can now set the broadcast flag before binding to a
    socket.  You need to set "broadcast = yes" in the DHCP listener.
  * Be more restrictive on string parsing in the config files
  * Fix password length in scripts/create-users.pl
  * Be more flexible about parsing the detail file.  This allows
    it to read files where the attributes have been edited.
  * Ensure that requests read from the detail file are cleaned up
    (i.e. don't leak) if they are proxied without a response.
  * Write the PID file after opening sockets, not before
    (closes bug #29)
  * Proxying large numbers of packets no longer gives error
    "unable to open proxy socket".
  * Avoid mutex locks in libc after fork
  * Retry packet from detail file if there was no response.
  * Allow old-style dictionary formats, where the vendor name is the
    last field in an ATTRIBUTE definition.
  * Removed all recursive use of mutexes.  Some systems just don't
    support this.
  * Allow !* to work as documented.
  * make templates work (see templates.conf)
  * Enabled "allow_core_dumps" to work again
  * Print better errors when reading invalid dictionaries
  * Sign client certificates with CA, rather than server certs.
  * Fix potential crash in rlm_passwd when file was closed
  * Fixed corner cases in conditional dynamic expansion.
  * Use InnoDB for MySQL IP Pools, to gain transactional support
  * Apply patch to libltdl for CVE-2009-3736.
  * Fixed a few issues found by LLVM's static checker
  * Keep track of "bad authenticators" for accounting packets
  * Keep track of "dropped packets" for auth/acct packets
  * Synced the "debian" directory with upstream
  * Made "unlang" use unsigned 32-bit integers, to match the
    dictionaries.

While here fix broken user destination directory installation as well.

4 files changed, 37 insertions, 28 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index dc5a2bc02bb..bf20838df5b 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2010/01/17 12:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2010/05/23 17:28:44 tron Exp $
 
 DISTNAME=	freeradius-server-${RADVER}
 PKGNAME=	${DISTNAME:S/-server//}
-PKGREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/freeradius/
 EXTRACT_SUFX=	.tar.bz2
@@ -10,16 +9,17 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freeradius.org/
 COMMENT=	Free RADIUS server implementation
+LICENSE=	gnu-gpl-v2
 
-.include "../../mk/bsd.prefs.mk"
-
-PKG_DESTDIR_SUPPORT=	user-destdir
 CONFLICTS+=		radiusd-cistron-[0-9]*
 CONFLICTS+=		freeradius<2.0
 USE_TOOLS+=		gmake perl:run
-USE_LIBTOOL=		YES
-USE_OLD_DES_API=	YES
-MAKE_JOBS_SAFE=		NO
+USE_LIBTOOL=		yes
+USE_OLD_DES_API=	yes
+MAKE_JOBS_SAFE=		no
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+.include "../../mk/bsd.prefs.mk"
 
 BUILD_DEFS=		VARBASE
 FILES_SUBST+=		RADIUS_USER=${RADIUS_USER}
@@ -45,21 +45,23 @@ OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd \
 OWN_DIRS_PERMS+=	${VARBASE}/log/radiusd/radacct \
 			${RADIUS_USER} ${RADIUS_GROUP} 0750
 
-RADVER=			2.1.7
-EGDIR=			${PREFIX}/share/examples/freeradius
+RADVER=			2.1.8
+EGDIR=			${DESTDIR}${PREFIX}/share/examples/freeradius
 
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
-GNU_CONFIGURE=		YES
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
 CONFIGURE_ARGS+=	--quiet
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log/radiusd
 CONFIGURE_ARGS+=	--with-ltdl-lib=${PREFIX}/lib
 CONFIGURE_ARGS+=	--with-ltdl-include=${PREFIX}/include
+CONFIGURE_ARGS+=	--without-rlm_python
 CONFIGURE_ARGS+=	--without-rlm_smb
 CONFIGURE_ARGS+=	--without-rlm_sql_oracle
 CONFIGURE_ARGS+=	--without-rlm_sql_unixodbc
+MAKE_ENV+=		R=${DESTDIR:Q}
 
 REPLACE_PERL=		scripts/radsqlrelay
 
@@ -124,6 +126,15 @@ CONF_FILES_PERMS+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} \
 			${RADIUS_USER} ${RADIUS_GROUP} 0640
 .endfor
 
+.for d in ${EGDIRS}
+INSTALLATION_DIRS+=	${PKG_SYSCONFDIR}/${d}
+.endfor
+
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/certs ${RADIUS_USER} \
+			${RADIUS_GROUP} 750
+OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/certs/demoCA ${RADIUS_USER} \
+			${RADIUS_GROUP} 750
+
 .include "../../mk/pthread.buildlink3.mk"
 
 .if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} == "none"
@@ -151,16 +162,11 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 .for d in ${EGDIRS}
 	${INSTALL_DATA_DIR} ${EGDIR}/${d}
-	${MKDIR} ${PKG_SYSCONFDIR}/${d}
 .endfor
 .for f in ${EGFILES}
 	${INSTALL_DATA} ${WRKSRC}/raddb/${f} ${EGDIR}/${f}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/src/modules/rlm_perl/example.pl ${EGDIR}
-	${CHOWN} ${RADIUS_USER}:${RADIUS_GROUP} ${PKG_SYSCONFDIR}/certs
-	${CHOWN} ${RADIUS_USER}:${RADIUS_GROUP} ${PKG_SYSCONFDIR}/certs/demoCA
-	${CHMOD} 0750 ${PKG_SYSCONFDIR}/certs
-	${CHMOD} 0750 ${PKG_SYSCONFDIR}/certs/demoCA
 
 .include "../../devel/libltdl/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/freeradius2/PLIST b/net/freeradius2/PLIST
index 481f5861c92..7001927ebbf 100644
--- a/net/freeradius2/PLIST
+++ b/net/freeradius2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/10/11 09:18:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2010/05/23 17:28:44 tron Exp $
 bin/radclient
 bin/radconf2xml
 bin/radeapclient
@@ -416,9 +416,11 @@ share/freeradius/dictionary.3com
 share/freeradius/dictionary.3gpp
 share/freeradius/dictionary.3gpp2
 share/freeradius/dictionary.acc
+share/freeradius/dictionary.acme
 share/freeradius/dictionary.airespace
 share/freeradius/dictionary.alcatel
 share/freeradius/dictionary.alcatel.esam
+share/freeradius/dictionary.alcatel.sr
 share/freeradius/dictionary.alteon
 share/freeradius/dictionary.altiga
 share/freeradius/dictionary.alvarion
@@ -427,6 +429,7 @@ share/freeradius/dictionary.aptis
 share/freeradius/dictionary.aruba
 share/freeradius/dictionary.ascend
 share/freeradius/dictionary.asn
+share/freeradius/dictionary.audiocodes
 share/freeradius/dictionary.avaya
 share/freeradius/dictionary.azaire
 share/freeradius/dictionary.bay
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index c842e26e9c8..bd02e0c0df0 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2009/10/11 09:18:25 adam Exp $
+$NetBSD: distinfo,v 1.8 2010/05/23 17:28:44 tron Exp $
 
-SHA1 (freeradius-server-2.1.7.tar.bz2) = a146e8f6e1c41db27cdf1080201311b1281d39c7
-RMD160 (freeradius-server-2.1.7.tar.bz2) = ebbbae51b3f43de752fe8f8ffc80213868884b7a
-Size (freeradius-server-2.1.7.tar.bz2) = 2544164 bytes
+SHA1 (freeradius-server-2.1.8.tar.bz2) = f01a8add62b790033cc861d55dc0d09a4678beac
+RMD160 (freeradius-server-2.1.8.tar.bz2) = 9ad8e19eda1b7da89fde3d0e345a0cc6b13eba88
+Size (freeradius-server-2.1.8.tar.bz2) = 2544696 bytes
 SHA1 (patch-aa) = 90c0c676ea668e36851eeffc0f1703624d703339
 SHA1 (patch-ab) = 7a23eb75a9818b073263fd36cbf17b692fa19a9f
 SHA1 (patch-ae) = aa43b83ba991f510cee40cb65c3621e9d559d6dd
diff --git a/net/freeradius2/options.mk b/net/freeradius2/options.mk
index 52d6453a7e1..7ffabc7ab61 100644
--- a/net/freeradius2/options.mk
+++ b/net/freeradius2/options.mk
@@ -1,12 +1,12 @@
-# $NetBSD: options.mk,v 1.3 2009/09/29 09:34:09 adam Exp $
+# $NetBSD: options.mk,v 1.4 2010/05/23 17:28:44 tron Exp $
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.freeradius
-PKG_SUPPORTED_OPTIONS=	ldap mysql pgsql snmp kerberos pam freeradius-simul-use
-PKG_SUPPORTED_OPTIONS+=	perl
-PKG_SUGGESTED_OPTIONS=	gdbm freeradius-simul-use
+PKG_OPTIONS_VAR=		PKG_OPTIONS.freeradius
+PKG_SUPPORTED_OPTIONS=		freeradius-simul-use kerberos ldap mysql
+PKG_SUPPORTED_OPTIONS+=		pam perl pgsql snmp
 PKG_OPTIONS_OPTIONAL_GROUPS=	dbm odbc
-PKG_OPTIONS_GROUP.dbm=	bdb gdbm
-PKG_OPTIONS_GROUP.odbc=	iodbc unixodbc
+PKG_OPTIONS_GROUP.dbm=		bdb gdbm
+PKG_OPTIONS_GROUP.odbc=		iodbc unixodbc
+PKG_SUGGESTED_OPTIONS=		freeradius-simul-use gdbm
 
 .include "../../mk/bsd.options.mk"