8 files changed, 39 insertions, 130 deletions

diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index fd2ca2ab305c..711248e6d578 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freeradius
-PORTVERSION?=	1.1.5
+PORTVERSION?=	1.1.6
 PORTREVISION?=	0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
@@ -30,10 +30,10 @@ LOGDIR?=	/var/log
 
 CONFLICTS=	gnu-radius-1.* openradius-0.* radiusd-cistron-1.*
 .ifdef(FREERADIUS_SLAVE_MYSQL)
-CONFLICTS+=	freeradius-1.*
+CONFLICTS+=	freeradius-[0-9].* freeradius-mysql-[02-9].*
 PKGNAMESUFFIX=	-mysql
 .else
-CONFLICTS+=	freeradius-mysql-1.*
+CONFLICTS+=	freeradius-mysql-[0-9].* freeradius-[02-9].*
 .endif
 
 USE_RC_SUBR=	radiusd.sh
@@ -71,9 +71,15 @@ CONFIGURE_ARGS=	--quiet \
 		--prefix=${PREFIX} \
 		--localstatedir=/var \
 		--mandir=${PREFIX}/man \
-		--with-system-libtool \
-		--with-docdir=${DOCSDIR} \
-		--with-logdir=${LOGDIR} \
+		--with-system-libtool
+.ifdef(NOPORTDOCS)
+CONFIGURE_ARGS+=--without-docdir
+PLIST_SUB+=	PORTDOCS="@comment "
+.else
+CONFIGURE_ARGS+=--with-docdir=${DOCSDIR}
+PLIST_SUB+=	PORTDOCS=""
+.endif
+CONFIGURE_ARGS+=--with-logdir=${LOGDIR} \
 		--with-large-files \
 		--with-openssl-includes=${OPENSSLINC} \
 		--with-openssl-libraries=${OPENSSLLIB} \
@@ -193,10 +199,6 @@ CONFIGURE_ARGS+=--with-rlm_perl
 PLIST_SUB+=	RLMPERL=""
 .endif
 
-.if defined(NOPORTDOCS)
-MAKE_ENV+=	NOPORTDOCS=yes
-.endif
-
 USE_LDCONFIG=	yes
 
 MAN1=		radclient.1 radeapclient.1 radlast.1 radtest.1 radwho.1 \
@@ -205,72 +207,42 @@ MAN5=		acct_users.5 clients.5 clients.conf.5 dictionary.5 naslist.5 \
 		radiusd.conf.5 rlm_acct_unique.5 rlm_always.5 \
 		rlm_attr_filter.5 rlm_attr_rewrite.5 rlm_chap.5 rlm_counter.5 \
 		rlm_detail.5 rlm_expr.5 rlm_files.5 rlm_mschap.5 rlm_pap.5 \
-		rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 users.5
+		rlm_passwd.5 rlm_realm.5 rlm_sql.5 rlm_sql_log.5 rlm_unix.5 \
+		users.5
 MAN8=		radiusd.8 radrelay.8 radsqlrelay.8 radwatch.8 rlm_ippool_tool.8
 
-DICTS=		dictionary.3com dictionary.3gpp dictionary.3gpp2 dictionary.acc \
-		dictionary.airespace dictionary.alcatel dictionary.alteon \
-		dictionary.altiga dictionary.alvarion dictionary.aptis \
-		dictionary.aruba dictionary.ascend dictionary.asn dictionary.avaya \
-		dictionary.bay dictionary.bintec dictionary.bristol \
-		dictionary.cablelabs dictionary.cabletron dictionary.cisco \
-		dictionary.cisco.bbsm dictionary.cisco.vpn3000 dictionary.cisco.vpn5000 \
-		dictionary.colubris dictionary.columbia_university dictionary.compat \
-		dictionary.cosine dictionary.digium dictionary.epygi \
-		dictionary.ericsson dictionary.erx dictionary.extreme \
-		dictionary.fortinet dictionary.foundry dictionary.freeradius \
-		dictionary.freeradius.internal dictionary.gandalf dictionary.garderos \
-		dictionary.gemtek dictionary.hp dictionary.ipunplugged dictionary.issanni \
-		dictionary.itk dictionary.juniper dictionary.karlnet \
-		dictionary.livingston dictionary.localweb dictionary.lucent \
-		dictionary.merit dictionary.microsoft dictionary.mikrotik \
-		dictionary.motorola dictionary.navini dictionary.netscreen \
-		dictionary.nokia dictionary.nomadix dictionary.nortel dictionary.ntua \
-		dictionary.packeteer dictionary.patton \
-		dictionary.propel dictionary.quintum \
-		dictionary.redback dictionary.redcreek \
-		dictionary.rfc2865 dictionary.rfc2866 dictionary.rfc2867 \
-		dictionary.rfc2868 dictionary.rfc2869 dictionary.rfc3162 \
-		dictionary.rfc3576 dictionary.rfc3580 dictionary.rfc4590 \
-		dictionary.riverstone dictionary.roaringpenguin \
-		dictionary.schulzrinne-sipping dictionary.shasta dictionary.shiva \
-		dictionary.sofaware dictionary.sonicwall \
-		dictionary.springtide dictionary.starent dictionary.t_systems_nova \
-		dictionary.telebit dictionary.trapeze dictionary.tropos \
-		dictionary.unix dictionary.usr dictionary.valemount \
-		dictionary.versanet dictionary.walabi dictionary.waverider \
-		dictionary.wispr dictionary.xedia dictionary.xylan dictionary.zyxel
-
 SUB_LIST+=	REQUIRE="${_REQUIRE}"
 
 post-patch:
-# Patch Makefile / Makefile.in throughout the source tree to install in EXAMPLESDIR not raddb
-	@for i in `${FIND} -E ${WRKSRC} -regex '.*Makefile(\.in)?$$' -print` ; do \
-		${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" $${i}; \
-	done
-	@for i in `${FIND} -E ${WRKSRC} -regex '.*Makefile(\.in)?\.(orig|bak)$$' -print` ; do \
-		${RM} $${i}; \
-	done
+# Patch Makefile / Makefile.in throughout the source tree to install raddb
+# contents in ${EXAMPLESDIR}/raddb rather than the raddbdir from configure
+	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?$$' -exec \
+		${REINPLACE_CMD} -e "s:\$$(R)\$$(raddbdir):${EXAMPLESDIR}/raddb:g" {} \;
+# Clean up after the last operation (so as not to get unwanted files when installing doc/)
+	@${FIND} -E ${WRKSRC} -regex '.*/Makefile(\.in)?\.(orig|bak)$$' -delete
 .if ${OSVERSION} < 500000
 	@${REINPLACE_CMD} -e 's/-DNO_OPENSSL//' ${WRKSRC}/configure
 .endif
 
 post-install:
-	@${MKDIR} ${PREFIX}/etc/raddb ${DATADIR}
-.for dict in ${DICTS}
-	${INSTALL_DATA} ${WRKSRC}/share/${dict} ${DATADIR}/${dict}
-.endfor
-	for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type d -mindepth 1 -print \
-	| ${SED} -e 's:^${EXAMPLESDIR}/raddb/::g'`; do \
-		if [ ! -d ${PREFIX}/etc/raddb/$${i} ]; then \
-			${MKDIR} ${PREFIX}/etc/raddb/$${i}; \
+# Create (if necessary) ${PREFIX}/etc/raddb and subdirectories using
+# ${EXAMPLESDIR}/raddb as the model layout
+	@for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type d -print \
+	| ${SED} -e 's:^${EXAMPLESDIR}/raddb::g'`; do \
+		if [ ! -d ${PREFIX}/etc/raddb$${i} ]; then \
+			${MKDIR} ${PREFIX}/etc/raddb$${i}; \
 		fi; \
 	done
-	for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type f -print \
+# Copy all files from ${EXAMPLESDIR}/raddb to ${PREFIX}/etc/raddb if they
+# don't already exist in the destination location
+	@for i in `${FIND} ${EXAMPLESDIR}/raddb/ -type f -print \
 	| ${SED} -e 's:^${EXAMPLESDIR}/raddb/::g'`; do \
 		if [ ! -f ${PREFIX}/etc/raddb/$${i} ]; then \
 			${CP} -p ${EXAMPLESDIR}/raddb/$${i} ${PREFIX}/etc/raddb/$${i}; \
 		fi; \
 	done
+# Set ${PREFIX}/etc/raddb and all the files and folders in it to g-w,o-rwx
+# (FreeRADIUS will probably complain if this is not done)
+	@${CHMOD} -R g-w,o-rwx ${PREFIX}/etc/raddb
 
 .include <bsd.port.post.mk>
diff --git a/net/freeradius2/distinfo b/net/freeradius2/distinfo
index bbff34397971..5140f2b189d3 100644
--- a/net/freeradius2/distinfo
+++ b/net/freeradius2/distinfo
@@ -1,3 +1,3 @@
-MD5 (freeradius-1.1.5.tar.bz2) = e90c7976a3dcd80368ff3ed2b768b3a4
-SHA256 (freeradius-1.1.5.tar.bz2) = 02afff2d76edff01d2d94dc62f1168d49746a158e16c257083d22e8440e7ee96
-SIZE (freeradius-1.1.5.tar.bz2) = 2028582
+MD5 (freeradius-1.1.6.tar.bz2) = 2c29ab90cc30aa3b92fbd78030ccc198
+SHA256 (freeradius-1.1.6.tar.bz2) = 942917ed1002e2bf4ac023f379daa70e517ca2510753955e3754eb8a2d0e76ce
+SIZE (freeradius-1.1.6.tar.bz2) = 2059399
diff --git a/net/freeradius2/files/patch-doc::Makefile b/net/freeradius2/files/patch-doc::Makefile
deleted file mode 100644
index 233648f85883..000000000000
--- a/net/freeradius2/files/patch-doc::Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- doc/Makefile.orig	Sat Jul 15 18:16:51 2006
-+++ doc/Makefile	Fri Oct 27 11:22:45 2006
-@@ -17,6 +17,7 @@
- 	@rm -f *~
- 
- install:
-+#ifndef NOPORTDOCS 
- 	$(INSTALL) -d -m 755 $(R)$(docdir)
- 	for file in *[!~]; do \
- 		if [ -f $$file -a $$file != Makefile ]; then \
-@@ -24,6 +25,7 @@
- 		fi; \
- 	done
- 	@$(MAKE) $(MFLAGS) WHAT_TO_MAKE=$@ common
-+#endif
- 
- common: $(SUBDIRS)
- 
diff --git a/net/freeradius2/files/patch-raddb-Makefile-1.1.4_bug b/net/freeradius2/files/patch-raddb-Makefile-1.1.4_bug
deleted file mode 100644
index b5e12cff72a3..000000000000
--- a/net/freeradius2/files/patch-raddb-Makefile-1.1.4_bug
+++ /dev/null
@@ -1,11 +0,0 @@
---- raddb/Makefile.orig	Mon Apr 10 19:53:20 2006
-+++ raddb/Makefile	Sun Jan 14 23:10:15 2007
-@@ -7,7 +7,7 @@
- 	  experimental.conf hints huntgroups ldap.attrmap \
- 	  mssql.conf naslist naspasswd oraclesql.conf postgresql.conf \
- 	  preproxy_users proxy.conf radiusd.conf realms snmp.conf \
--	  sql.conf sqlippool.conf users otp.conf otppasswd.sample
-+	  sql.conf sqlippool.conf users otp.conf
- 
- all:
- 
diff --git a/net/freeradius2/files/patch-src-main-Makefile.in b/net/freeradius2/files/patch-src-main-Makefile.in
deleted file mode 100644
index 0e0f7e2e75a4..000000000000
--- a/net/freeradius2/files/patch-src-main-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/main/Makefile.in.orig	Wed Feb 14 15:44:23 2007
-+++ src/main/Makefile.in	Mon Mar 12 13:20:32 2007
-@@ -61,9 +61,9 @@
- 
- radiusd: $(SERVER_OBJS) $(MODULE_OBJS) ../lib/libradius.la
- 	$(LIBTOOL) --mode=link $(CC) -export-dynamic -dlopen self \
--		$(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
-+		$(CFLAGS) $(LDFLAGS) -pie $(LINK_MODE) -o $@ $(SERVER_OBJS)      \
- 		$(MODULE_LIBS) $(LIBS) $(SNMP_LIBS) $(PTHREADLIB) \
-		$(LIBLTDL) $(OPENSSL_LIBS)
- 
- radiusd.lo: radiusd.c ../include/request_list.h ../include/modules.h ../include/modcall.h ../include/modpriv.h
- 	$(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c radiusd.c
-
diff --git a/net/freeradius2/files/patch-src::modules::rlm_sql::rules.mak b/net/freeradius2/files/patch-src::modules::rlm_sql::rules.mak
deleted file mode 100644
index 3e954bcce06c..000000000000
--- a/net/freeradius2/files/patch-src::modules::rlm_sql::rules.mak
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/modules/rlm_sql/drivers/rules.mak.orig	Mon Mar 27 15:39:02 2006
-+++ src/modules/rlm_sql/drivers/rules.mak	Mon Mar 27 15:39:29 2006
-@@ -100,8 +100,8 @@
- 
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
--	-module $(LINK_MODE) $(LDFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
--	-rpath $(libdir) $^ $(RLM_SQL_LIBS)
-+	-module $(LINK_MODE) $(CFLAGS) $(RLM_SQL_LDFLAGS) -o $@ \
-+	-rpath $(libdir) $^ $(RLM_SQL_LIBS) $(LDFLAGS)
- 
- #######################################################################
- #
diff --git a/net/freeradius2/files/patch-src::modules::rules.mak b/net/freeradius2/files/patch-src::modules::rules.mak
deleted file mode 100644
index c8b92407c6b4..000000000000
--- a/net/freeradius2/files/patch-src::modules::rules.mak
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/modules/rules.mak.orig	Mon Mar 27 15:43:04 2006
-+++ src/modules/rules.mak	Mon Mar 27 15:44:11 2006
-@@ -112,7 +112,7 @@
- 
- $(TARGET).la: $(LT_OBJS)
- 	$(LIBTOOL) --mode=link $(CC) -release $(RADIUSD_VERSION) \
--	-module $(LINK_MODE) $(LDFLAGS) $(RLM_LDFLAGS) -o $@     \
-+	-module $(LINK_MODE) $(CFLAGS) $(RLM_CFLAGS) $(LDFLAGS) $(RLM_LDFLAGS) -o $@ \
- 	-rpath $(libdir) $^ $(top_builddir)/src/lib/libradius.la \
- 	$(RLM_LIBS) $(LIBS)
- 
diff --git a/net/freeradius2/pkg-plist b/net/freeradius2/pkg-plist
index 89a098e4893f..029716c16cac 100644
--- a/net/freeradius2/pkg-plist
+++ b/net/freeradius2/pkg-plist
@@ -60,6 +60,7 @@ bin/smbencrypt
 %%EXAMPLESDIR%%/raddb/users
 @exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type d -mindepth 1 -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -d %D/etc/raddb/${i} ]; then mkdir -p %D/etc/raddb/${i}; fi; done
 @exec for i in `find %D/%%EXAMPLESDIR%%/raddb/ -type f -print | sed -e 's:^%D/%%EXAMPLESDIR%%/raddb/::g'`; do if [ ! -f %D/etc/raddb/${i} ]; then cp -p %D/%%EXAMPLESDIR%%/raddb/${i} %D/etc/raddb/${i}; fi; done
+@exec chmod -R g-w,o-rwx %D/etc/raddb
 @dirrm %%EXAMPLESDIR%%/raddb/certs/demoCA
 @dirrm %%EXAMPLESDIR%%/raddb/certs
 @dirrm %%EXAMPLESDIR%%/raddb
@@ -491,7 +492,10 @@ sbin/rc.radiusd
 %%DATADIR%%/dictionary.rfc3162
 %%DATADIR%%/dictionary.rfc3576
 %%DATADIR%%/dictionary.rfc3580
+%%DATADIR%%/dictionary.rfc4372
 %%DATADIR%%/dictionary.rfc4590
+%%DATADIR%%/dictionary.rfc4675
+%%DATADIR%%/dictionary.rfc4679
 %%DATADIR%%/dictionary.riverstone
 %%DATADIR%%/dictionary.roaringpenguin
 %%DATADIR%%/dictionary.schulzrinne-sipping