From dcada9a32616dcd109532b674de2311c1da0fb20 Mon Sep 17 00:00:00 2001 From: jperkin Date: Tue, 25 Sep 2018 12:16:36 +0000 Subject: [PATCH] freeradius*: Update to 3.0.17. Provided by Coy Hile in joyent/pkgsrc#131. Fixes an issue where the module builds would fail if they found a system LDAP. Fix print-PLIST while here. FreeRADIUS 3.0.17 Tue 17 Apr 2018 14:00:00 EDT urgency=low Feature improvements * Add CURLOPT_CAINFO. Patch from Nicolas C. #2167 * "stats home server" now supports "src IPADDR", to specify home server also by source IP. Fixes #2169. * Add Dockerfiles for a selection of common systems. * Increase number of permitted file descriptors, for systems with many home servers. * Add TLS-Client-Cert-X509v3-Extended-Key-Usage-OIDs. Patch from Isaac Boukris. Fixes #2205. * Update main READMEs. Patches from Matthew Newton. * Added dictionary.mimosa Bug fixes * Don't call post-proxy twice when proxying to a virtual server. Matthew Newton, #2161. * Use "raw" string value for shared secrets and dynamic clients. It now parses strings with backslashes and "special characters" correctly. Fixes #2168. * Fix RuntimeDirectory for RedHat, from Alan Buxey. * Relax checks in 'if' parser from Isaac Bourkis * Minor cleanups for %{debug_attr:&request} from Isaac Boukris. * Be more aggressive about cleaning up cached certificate attributes, due to deficiencies in OpenSSL. Reported by Nicolas Reich. * Be more accepting when parsing IPv6 addresses. Bug noted by Klara Mall. * Fix double free in rlm_sql. Fixes #2180. * rlm_detail now writes empty Access-Accept packets. * rlm_python can now create tagged attributes. * Don't crash on duplicate realm + authhost / accthost. Bug found by Richard Palmer. * Allow partial certificate chain to trusted CA. Fixes #2162 * Treat SSL_read() returning zero as error. Fixes #2164. * detail writer now checks if the file was renamed or deleted. * Add User-Name to Access-Accept if EAP-Message exists, not Stripped-User-Name. * RedHat Systemd updates. Fixes #2184 * Use correct API for State variable in rlm_securid. * Remove broken radclient option "-i". * Fix "users" file (and hints, etc). So that it does not get confused about entry ordering with multiple $INCLUDEs. * Fix rlm_sql to expand the un-escaped string, not the raw string. * Link default and inner-tunnel only if they exist. Fixes #2206. * Don't use both IP_PKTINFO and IP_SENDSRCADDR. * Always install signal handler for SIGINT (needed by Docker). * Fix intermediate CA flow for OCSP. Fixes #2160. Intermediate certs which are not self-signed will now be checked. * sqlippool now returns "fail" if it fails IP allocation. * Fix rlm_yubikey to look for correct attribute in replay attack check. --- net/freeradius-freetds/Makefile | 3 ++- net/freeradius-iodbc/Makefile | 3 ++- net/freeradius-krb5/Makefile | 3 ++- net/freeradius-memcached/Makefile | 3 ++- net/freeradius-mysql/Makefile | 3 ++- net/freeradius-perl/Makefile | 3 ++- net/freeradius-python/Makefile | 3 ++- net/freeradius-sqlite3/Makefile | 3 ++- net/freeradius-unixodbc/Makefile | 3 ++- net/freeradius-yubikey/Makefile | 3 ++- net/freeradius/Makefile | 3 ++- net/freeradius/Makefile.common | 4 ++-- net/freeradius/PLIST | 12 +++++++----- net/freeradius/distinfo | 12 ++++++------ net/freeradius/patches/patch-src_lib_udpfromto.c | 13 +------------ 15 files changed, 38 insertions(+), 36 deletions(-) diff --git a/net/freeradius-freetds/Makefile b/net/freeradius-freetds/Makefile index 7575b5a3e7b4..5d8d2f3da969 100644 --- a/net/freeradius-freetds/Makefile +++ b/net/freeradius-freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2018/04/17 22:29:45 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2018/09/25 12:16:36 jperkin Exp $ PKGREVISION= 1 .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-iodbc/Makefile b/net/freeradius-iodbc/Makefile index 68375addd876..46814e6c73a5 100644 --- a/net/freeradius-iodbc/Makefile +++ b/net/freeradius-iodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:28 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $ .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-krb5/Makefile b/net/freeradius-krb5/Makefile index 5442ceabfce5..6239bb04402a 100644 --- a/net/freeradius-krb5/Makefile +++ b/net/freeradius-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:28 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $ .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-memcached/Makefile b/net/freeradius-memcached/Makefile index 76bcbe207245..2af1e57f4ac8 100644 --- a/net/freeradius-memcached/Makefile +++ b/net/freeradius-memcached/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:28 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $ .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-mysql/Makefile b/net/freeradius-mysql/Makefile index 94d9433c8c17..b98498e36b6c 100644 --- a/net/freeradius-mysql/Makefile +++ b/net/freeradius-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:28 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:36 jperkin Exp $ .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-perl/Makefile b/net/freeradius-perl/Makefile index 9fd136903d91..fde34c03d6f9 100644 --- a/net/freeradius-perl/Makefile +++ b/net/freeradius-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2018/08/22 09:45:52 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2018/09/25 12:16:36 jperkin Exp $ PKGREVISION= 1 .include "../../net/freeradius/Makefile.module" @@ -8,6 +8,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 diff --git a/net/freeradius-python/Makefile b/net/freeradius-python/Makefile index a8df2109d2a8..c0155acac89d 100644 --- a/net/freeradius-python/Makefile +++ b/net/freeradius-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:29 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:37 jperkin Exp $ .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-sqlite3/Makefile b/net/freeradius-sqlite3/Makefile index 2a508114bab6..664f9dacfc38 100644 --- a/net/freeradius-sqlite3/Makefile +++ b/net/freeradius-sqlite3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2018/07/20 03:34:23 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2018/09/25 12:16:37 jperkin Exp $ PKGREVISION= 2 .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-unixodbc/Makefile b/net/freeradius-unixodbc/Makefile index 3ff7ca0c8980..b0a4ea20116b 100644 --- a/net/freeradius-unixodbc/Makefile +++ b/net/freeradius-unixodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:29 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:37 jperkin Exp $ .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius-yubikey/Makefile b/net/freeradius-yubikey/Makefile index 9c1025ceb24a..0584ed1cc99c 100644 --- a/net/freeradius-yubikey/Makefile +++ b/net/freeradius-yubikey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2017/08/26 10:07:29 fhajny Exp $ +# $NetBSD: Makefile,v 1.2 2018/09/25 12:16:37 jperkin Exp $ .include "../../net/freeradius/Makefile.module" @@ -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 diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 262fb321940a..6f4f8862da9a 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.96 2018/08/22 09:45:52 wiz Exp $ +# $NetBSD: Makefile,v 1.97 2018/09/25 12:16:36 jperkin Exp $ PKGREVISION= 1 .include "Makefile.common" @@ -48,6 +48,7 @@ OPSYSVARS+= SOEXT SOEXT.Darwin= dylib SOEXT.*= so PLIST_SUBST+= SOEXT=${SOEXT} +PRINT_PLIST_AWK+= {gsub(/\.${SOEXT}$$/, ".$${SOEXT}");} FILES_SUBST+= RADIUS_USER=${RADIUS_USER} RADIUS_GROUP=${RADIUS_GROUP} MESSAGE_SUBST+= BOOTSTRAP=${PKG_SYSCONFDIR:Q}/certs/bootstrap diff --git a/net/freeradius/Makefile.common b/net/freeradius/Makefile.common index ae3f7c7a6bc4..8a9eb25e0cfb 100644 --- a/net/freeradius/Makefile.common +++ b/net/freeradius/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.2 2018/04/12 01:21:07 nonaka Exp $ +# $NetBSD: Makefile.common,v 1.3 2018/09/25 12:16:36 jperkin 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 diff --git a/net/freeradius/PLIST b/net/freeradius/PLIST index b2dfdcd7498a..56d4a5027001 100644 --- a/net/freeradius/PLIST +++ b/net/freeradius/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.29 2018/04/12 01:21:07 nonaka Exp $ +@comment $NetBSD: PLIST,v 1.30 2018/09/25 12:16:36 jperkin Exp $ bin/dhcpclient bin/map_unit bin/rad_counter @@ -78,10 +78,10 @@ include/freeradius/tls.h include/freeradius/token.h include/freeradius/udpfromto.h include/freeradius/vqp.h -lib/libfreeradius-dhcp.so -lib/libfreeradius-eap.so -lib/libfreeradius-radius.so -lib/libfreeradius-server.so +lib/libfreeradius-dhcp.${SOEXT} +lib/libfreeradius-eap.${SOEXT} +lib/libfreeradius-radius.${SOEXT} +lib/libfreeradius-server.${SOEXT} lib/proto_dhcp.${SOEXT} lib/proto_vmps.${SOEXT} lib/rlm_always.${SOEXT} @@ -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 diff --git a/net/freeradius/distinfo b/net/freeradius/distinfo index 00e0e339bcc8..b70929ef33d6 100644 --- a/net/freeradius/distinfo +++ b/net/freeradius/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.35 2018/04/12 01:21:07 nonaka Exp $ +$NetBSD: distinfo,v 1.36 2018/09/25 12:16:36 jperkin 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 diff --git a/net/freeradius/patches/patch-src_lib_udpfromto.c b/net/freeradius/patches/patch-src_lib_udpfromto.c index 28220060978c..e2f2b3b317ad 100644 --- a/net/freeradius/patches/patch-src_lib_udpfromto.c +++ b/net/freeradius/patches/patch-src_lib_udpfromto.c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_lib_udpfromto.c,v 1.2 2018/03/31 20:10:49 joerg Exp $ +$NetBSD: patch-src_lib_udpfromto.c,v 1.3 2018/09/25 12:16:36 jperkin Exp $ Only use IP_PKTINFO if the configure checks for the necessary members passed. Use either IP_PKTINFO or IP_SENDSRCADDR, but not both. @@ -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; -