ports/186086: [PATCH] net/freeradius3: fails to start with default configuration

[Dave Duchscher]

>Number:         186086
>Category:       ports
>Synopsis:       [PATCH] net/freeradius3: fails to start with default configuration
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jan 24 21:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Dave Duchscher <daved at tamu.edu>
>Release:        FreeBSD 8.4-RELEASE-p7 amd64
>Organization:
>Environment:
System: FreeBSD freebsd-8-4-amd64-build.net.tamu.edu 8.4-RELEASE-p7 FreeBSD 8.4-RELEASE-p7 #0: Wed Jan 15 16:31:24 UTC 2014
>Description:

freeradius3 fails to start with the default configuration failing with
the message:

Errors reading dictionary:  dict_init: /usr/local/share/freeradius/dictionary.dhcp[208]: Type "tlv" can only be for "format=1,1".

The port disables dhcp but the default configuration still requires
its presence.

http://lists.freebsd.org/pipermail/freebsd-stable/2014-January/077075.html

Port maintainer (zi at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:

Install port and run radiusd -XC

>Fix:

Comment out dictionary.dhcp and remove dhcp module from
etc/raddb/mods-enabled.

--- freeradius3-3.0.0_2.patch begins here ---
diff -ruN /usr/ports/net/freeradius3/Makefile ./Makefile
--- /usr/ports/net/freeradius3/Makefile	2013-10-14 16:00:29.000000000 -0500
+++ ./Makefile	2014-01-24 13:43:02.000000000 -0600
@@ -207,6 +207,7 @@
 CONFIGURE_ARGS+=--with-dhcp
 .else
 CONFIGURE_ARGS+=--without-dhcp --without-rlm_dhcp --without-proto_dhcp
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-raddb_all.mk
 .endif
 
 # DHCP is still experimental
@@ -412,15 +413,14 @@
 		${WRKSRC}/src/modules/rlm_krb5/configure
 .endif
 # If DHCP is enabled, enable the DHCP dictionary
-.if ${PORT_OPTIONS:MDHCP}
-	@${REINPLACE_CMD} -Ee 's:^#(.+ dictionary\.dhcp)$$:\1:g' \
+.if empty(PORT_OPTIONS:MDHCP)
+	@${REINPLACE_CMD} -Ee 's:^(.+ dictionary\.dhcp)$$:#\1:g' \
 		${WRKSRC}/share/dictionary
+	@${RM} -fr ${WRKSRC}/src/modules/proto_dhcp/
 # Clean up (so as not to get an unwanted file in share)
 	@${FIND} -E ${WRKSRC}/share \
 		-regex '.*/dictionary\.(orig|bak)$$' \
 		-delete
-.else
-	@${RM} -fr ${WRKSRC}/src/modules/proto_dhcp/
 .endif
 .if empty(PORT_OPTIONS:MRUBY)
 	@${RM} -fr ${WRKSRC}/src/modules/rlm_ruby/
diff -ruN /usr/ports/net/freeradius3/files/extra-patch-raddb_all.mk ./files/extra-patch-raddb_all.mk
--- /usr/ports/net/freeradius3/files/extra-patch-raddb_all.mk	1969-12-31 18:00:00.000000000 -0600
+++ ./files/extra-patch-raddb_all.mk	2014-01-24 11:12:26.000000000 -0600
@@ -0,0 +1,11 @@
+--- raddb/all.mk.orig	2014-01-24 11:11:42.000000000 -0600
++++ raddb/all.mk	2014-01-24 11:11:53.000000000 -0600
+@@ -8,7 +8,7 @@
+ LOCAL_SITES :=		$(addprefix raddb/sites-enabled/,$(DEFAULT_SITES))
+ 
+ DEFAULT_MODULES :=	always attr_filter cache_eap chap \
+-			detail detail.log digest dhcp dynamic_clients eap \
++			detail detail.log digest dynamic_clients eap \
+ 			echo exec expiration expr files linelog logintime \
+ 			mschap ntlm_auth pap passwd preprocess radutmp realm \
+ 			replicate soh sradutmp unix utf8
--- freeradius3-3.0.0_2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: