Update freeradius to v3.0.17 and fix module builds

net/freeradius-freetds/Makefile

@@ -8,6 +8,7 @@ COMMENT=		Free RADIUS FreeTDS support
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_sql_freetds
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_freetds.so ${DESTDIR}${PREFIX}/lib

net/freeradius-iodbc/Makefile

@@ -7,6 +7,7 @@ COMMENT=		Free RADIUS iODBC support
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_sql_iodbc
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_iodbc.so ${DESTDIR}${PREFIX}/lib

net/freeradius-krb5/Makefile

@@ -7,6 +7,7 @@ COMMENT=		Free RADIUS rlm_krb5 module
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_krb5
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_krb5.so ${DESTDIR}${PREFIX}/lib

net/freeradius-memcached/Makefile

@@ -7,6 +7,7 @@ COMMENT=		Free RADIUS support for memcached
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_cache_memcached
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_cache_memcached.so ${DESTDIR}${PREFIX}/lib

net/freeradius-mysql/Makefile

@@ -7,6 +7,7 @@ COMMENT=		Free RADIUS MySQL support
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_sql_mysql
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_mysql.so ${DESTDIR}${PREFIX}/lib

net/freeradius-perl/Makefile

@@ -7,6 +7,7 @@ COMMENT=		Free RADIUS rlm_perl module
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_perl
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_perl.so ${DESTDIR}${PREFIX}/lib

net/freeradius-python/Makefile

@@ -9,6 +9,7 @@ CATEGORIES=		net
 PYTHON_VERSIONS_ACCEPTED=	27
 
 CONFIGURE_ARGS+=    --with-rlm_python
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_python.so ${DESTDIR}${PREFIX}/lib

net/freeradius-sqlite3/Makefile

@@ -8,6 +8,7 @@ COMMENT=		Free RADIUS SQLite support
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_sql_iodbc
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_sqlite.so ${DESTDIR}${PREFIX}/lib

net/freeradius-unixodbc/Makefile

@@ -7,6 +7,7 @@ COMMENT=		Free RADIUS UNIXODBC support
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_sql_unixodbc
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_sql_unixodbc.so ${DESTDIR}${PREFIX}/lib

net/freeradius-yubikey/Makefile

@@ -7,6 +7,7 @@ COMMENT=		Free RADIUS rlm_yubikey module
 CATEGORIES=		net
 
 CONFIGURE_ARGS+=    --with-rlm_yubikey
+CONFIGURE_ARGS+=    --without-rlm_ldap
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/build/lib/.libs/rlm_yubikey.so ${DESTDIR}${PREFIX}/lib

net/freeradius/Makefile.common

@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.2 2018/04/12 01:21:07 nonaka Exp $
 # used by net/freeradius/Makefile.module
 
-DISTNAME=		freeradius-server-3.0.16
+DISTNAME=		freeradius-server-3.0.17
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.freeradius.org/pub/freeradius/
 EXTRACT_SUFX=		.tar.bz2

net/freeradius/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2018/04/12 01:21:07 nonaka Exp $
+@comment $NetBSD$
 bin/dhcpclient
 bin/map_unit
 bin/rad_counter
@@ -82,58 +82,58 @@ lib/libfreeradius-dhcp.so
 lib/libfreeradius-eap.so
 lib/libfreeradius-radius.so
 lib/libfreeradius-server.so
-lib/proto_dhcp.${SOEXT}
-lib/proto_vmps.${SOEXT}
-lib/rlm_always.${SOEXT}
-lib/rlm_attr_filter.${SOEXT}
-lib/rlm_cache.${SOEXT}
-lib/rlm_cache_rbtree.${SOEXT}
-lib/rlm_chap.${SOEXT}
-lib/rlm_counter.${SOEXT}
-lib/rlm_cram.${SOEXT}
-lib/rlm_date.${SOEXT}
-lib/rlm_detail.${SOEXT}
-lib/rlm_dhcp.${SOEXT}
-lib/rlm_digest.${SOEXT}
-lib/rlm_dynamic_clients.${SOEXT}
-lib/rlm_eap.${SOEXT}
-lib/rlm_eap_fast.${SOEXT}
-lib/rlm_eap_gtc.${SOEXT}
-lib/rlm_eap_leap.${SOEXT}
-lib/rlm_eap_md5.${SOEXT}
-lib/rlm_eap_mschapv2.${SOEXT}
-lib/rlm_eap_peap.${SOEXT}
-lib/rlm_eap_pwd.${SOEXT}
-lib/rlm_eap_sim.${SOEXT}
-lib/rlm_eap_tls.${SOEXT}
-lib/rlm_eap_ttls.${SOEXT}
-lib/rlm_exec.${SOEXT}
-lib/rlm_expiration.${SOEXT}
-lib/rlm_expr.${SOEXT}
-lib/rlm_files.${SOEXT}
-lib/rlm_ippool.${SOEXT}
-lib/rlm_linelog.${SOEXT}
-lib/rlm_logintime.${SOEXT}
-lib/rlm_mschap.${SOEXT}
-lib/rlm_otp.${SOEXT}
-lib/rlm_pam.${SOEXT}
-lib/rlm_pap.${SOEXT}
-lib/rlm_passwd.${SOEXT}
-lib/rlm_preprocess.${SOEXT}
-lib/rlm_radutmp.${SOEXT}
-lib/rlm_realm.${SOEXT}
-lib/rlm_replicate.${SOEXT}
-lib/rlm_soh.${SOEXT}
-lib/rlm_sometimes.${SOEXT}
-lib/rlm_sql.${SOEXT}
-lib/rlm_sql_null.${SOEXT}
-lib/rlm_sqlcounter.${SOEXT}
-lib/rlm_sqlippool.${SOEXT}
-lib/rlm_test.${SOEXT}
-lib/rlm_unix.${SOEXT}
-lib/rlm_unpack.${SOEXT}
-lib/rlm_utf8.${SOEXT}
-lib/rlm_wimax.${SOEXT}
+lib/proto_dhcp.so
+lib/proto_vmps.so
+lib/rlm_always.so
+lib/rlm_attr_filter.so
+lib/rlm_cache.so
+lib/rlm_cache_rbtree.so
+lib/rlm_chap.so
+lib/rlm_counter.so
+lib/rlm_cram.so
+lib/rlm_date.so
+lib/rlm_detail.so
+lib/rlm_dhcp.so
+lib/rlm_digest.so
+lib/rlm_dynamic_clients.so
+lib/rlm_eap.so
+lib/rlm_eap_fast.so
+lib/rlm_eap_gtc.so
+lib/rlm_eap_leap.so
+lib/rlm_eap_md5.so
+lib/rlm_eap_mschapv2.so
+lib/rlm_eap_peap.so
+lib/rlm_eap_pwd.so
+lib/rlm_eap_sim.so
+lib/rlm_eap_tls.so
+lib/rlm_eap_ttls.so
+lib/rlm_exec.so
+lib/rlm_expiration.so
+lib/rlm_expr.so
+lib/rlm_files.so
+lib/rlm_ippool.so
+lib/rlm_linelog.so
+lib/rlm_logintime.so
+lib/rlm_mschap.so
+lib/rlm_otp.so
+lib/rlm_pam.so
+lib/rlm_pap.so
+lib/rlm_passwd.so
+lib/rlm_preprocess.so
+lib/rlm_radutmp.so
+lib/rlm_realm.so
+lib/rlm_replicate.so
+lib/rlm_soh.so
+lib/rlm_sometimes.so
+lib/rlm_sql.so
+lib/rlm_sql_null.so
+lib/rlm_sqlcounter.so
+lib/rlm_sqlippool.so
+lib/rlm_test.so
+lib/rlm_unix.so
+lib/rlm_unpack.so
+lib/rlm_utf8.so
+lib/rlm_wimax.so
 man/man1/dhcpclient.1
 man/man1/rad_counter.1
 man/man1/radclient.1
@@ -653,6 +653,7 @@ share/freeradius/dictionary.meru
 share/freeradius/dictionary.microsemi
 share/freeradius/dictionary.microsoft
 share/freeradius/dictionary.mikrotik
+share/freeradius/dictionary.mimosa
 share/freeradius/dictionary.motorola
 share/freeradius/dictionary.motorola.illegal
 share/freeradius/dictionary.motorola.wimax
@@ -721,6 +722,7 @@ share/freeradius/dictionary.shiva
 share/freeradius/dictionary.siemens
 share/freeradius/dictionary.slipstream
 share/freeradius/dictionary.sofaware
+share/freeradius/dictionary.softbank
 share/freeradius/dictionary.sonicwall
 share/freeradius/dictionary.springtide
 share/freeradius/dictionary.starent

net/freeradius/distinfo

@@ -1,11 +1,11 @@
 $NetBSD: distinfo,v 1.35 2018/04/12 01:21:07 nonaka Exp $
 
-SHA1 (freeradius-server-3.0.16.tar.bz2) = a7d1a88e112ce41ad08bd8beb66a5bdf36cac755
-RMD160 (freeradius-server-3.0.16.tar.bz2) = 0acbc54bc135ac18dc22c09f492b57eef8160a7b
-SHA512 (freeradius-server-3.0.16.tar.bz2) = fc26e8655e8155ad8b3d4e796a43fa9954f413195f0210e7e94c6b67e0b43d765e7886d9835fe56de0a70d13bba47868dd274f9e8a5669fdb2478a269b48ed10
-Size (freeradius-server-3.0.16.tar.bz2) = 3054887 bytes
+SHA1 (freeradius-server-3.0.17.tar.bz2) = a0d4372ee124cbee6b90a4463ff068afe70e06ca
+RMD160 (freeradius-server-3.0.17.tar.bz2) = c335fe2ef39ca2311ac85b2ec3d5941bbbb5e6e6
+SHA512 (freeradius-server-3.0.17.tar.bz2) = f4510d8e77eb7c72a21fbfad851f13460ff4b5a35f0b7bea6102076ceb71188a63b277fb7e4fcd9c3033b396b63e1bf0e455cc03608d7ab1380d1662407cb399
+Size (freeradius-server-3.0.17.tar.bz2) = 3075724 bytes
 SHA1 (patch-ai) = e32ffd24b93e2cef2e72ef9a8ea59d49e1571dc0
 SHA1 (patch-configure.ac) = ffec1f851d23f560797c12eba5092f2940e4d662
 SHA1 (patch-main_command.c) = 1c79b29eb13df341906c710c8dd41860a27473dd
 SHA1 (patch-main_util.c) = b9cefdb9bc30df0906184e8c0bb883e5258767c3
-SHA1 (patch-src_lib_udpfromto.c) = c8fce29e2b481820f1cc2196577f7d38bb549e1c
+SHA1 (patch-src_lib_udpfromto.c) = 2457f0a7223b1f3ef86d0af020290b26380e6319

net/freeradius/patches/patch-src_lib_udpfromto.c

@@ -19,14 +19,3 @@ passed. Use either IP_PKTINFO or IP_SENDSRCADDR, but not both.
  		struct cmsghdr *cmsg;
  		struct in_pktinfo *pkt;
 
-@@ -405,9 +405,7 @@ int sendfromto(int s, void *buf, size_t 
- 		pkt = (struct in_pktinfo *) CMSG_DATA(cmsg);
- 		memset(pkt, 0, sizeof(*pkt));
- 		pkt->ipi_spec_dst = s4->sin_addr;
--#  endif
--
--#  ifdef IP_SENDSRCADDR
-+#  elif defined(IP_SENDSRCADDR)
- 		struct cmsghdr *cmsg;
- 		struct in_addr *in;
-