Index: head/net/radiator/Makefile
===================================================================
--- head/net/radiator/Makefile	(revision 482964)
+++ head/net/radiator/Makefile	(revision 482965)
@@ -1,61 +1,61 @@
 # Created by: shan
 # $FreeBSD$
 
 PORTNAME=	Radiator
-PORTVERSION=	4.19
+PORTVERSION=	4.21
 CATEGORIES=	net
 MASTER_SITES=	# fetch manually
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	lyngbol@wheel.dk
 COMMENT=	Radiator Radius Server by Open System Consultants
 
 LICENSE=	radiator
 LICENSE_NAME=	Radiator
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	no-dist-mirror no-dist-sell no-pkg-mirror no-pkg-sell
 
 OPTIONS_DEFINE=	MYSQL
 MYSQL_DESC=	MySQL support
 
 USES=		perl5 shebangfix tar:tgz
 USE_PERL5=	configure
 USE_RC_SUBR=	radiator
 SHEBANG_FILES=	radhostname.pl
 
 RESTRICTED=	Commercial software
 
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTFILES})
 IGNORE=		will not be automatically fetched due to licensing\
 		restrictions.  You MUST manually fetch the UNIX version after\
 		purchasing the license at: http://www.open.com.au/ \
 		- once ${DISTFILES} has been downloaded, move it to\
 		${DISTDIR}/${DIST_SUBDIR} and then restart this build. \
 		(optionally download patches-${PORTVERSION}.tar.gz to the \
 		same directory as well)
 .endif
 
 .if ${PORT_OPTIONS:MMYSQL}
 RUN_DEPENDS+=	p5-DBD-mysql>=0:databases/p5-DBD-mysql
 .endif
 
 pre-configure:
 .if exists(${DISTDIR}/${DIST_SUBDIR}/patches-${PORTVERSION}.tar.gz)
 	${TAR} -xvzf ${DISTDIR}/${DIST_SUBDIR}/patches-${PORTVERSION}.tar.gz -C ${WRKSRC}
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/radius.cfg
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/radiator
 	${RM} ${STAGEDIR}${PREFIX}/lib/perl5/site_perl/radhostname.pl
 	${INSTALL_DATA} ${WRKSRC}/radius.cfg ${STAGEDIR}${PREFIX}/etc/radiator/radius.cfg.sample
 	${INSTALL_DATA} ${WRKSRC}/dictionary ${STAGEDIR}${PREFIX}/etc/radiator
 	${INSTALL_DATA} ${WRKSRC}/dictionary.ascend ${STAGEDIR}${PREFIX}/etc/radiator
 	${INSTALL_DATA} ${WRKSRC}/dictionary.cisco-vpn ${STAGEDIR}${PREFIX}/etc/radiator
 	${INSTALL_DATA} ${WRKSRC}/dictionary.sip ${STAGEDIR}${PREFIX}/etc/radiator
 
 .include <bsd.port.post.mk>
Index: head/net/radiator/distinfo
===================================================================
--- head/net/radiator/distinfo	(revision 482964)
+++ head/net/radiator/distinfo	(revision 482965)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1513158992
-SHA256 (Radiator/Radiator-4.19.tgz) = d7c6cdbaea3aa40f230ce6d783436ae5320e6ecbd3e44da94ef09b2d1fabf284
-SIZE (Radiator/Radiator-4.19.tgz) = 5840646
+TIMESTAMP = 1540407929
+SHA256 (Radiator/Radiator-4.21.tgz) = f302b1488a9df9c30607eddac8b11bf3d7fabdb4c638a19e4e4cb8822e3d1159
+SIZE (Radiator/Radiator-4.21.tgz) = 6290329
+SHA256 (Radiator/patches-4.21.tar.gz) = abd5bafa3226014140465d45abbb81e54337ee76ff099b8625dccde815343c19
+SIZE (Radiator/patches-4.21.tar.gz) = 369950
Index: head/net/radiator/pkg-plist
===================================================================
--- head/net/radiator/pkg-plist	(revision 482964)
+++ head/net/radiator/pkg-plist	(revision 482965)
@@ -1,276 +1,282 @@
 bin/builddbm
 bin/buildsql
 bin/radiusd
 bin/radpwtst
 etc/radiator/dictionary
 etc/radiator/dictionary.ascend
 etc/radiator/dictionary.cisco-vpn
 etc/radiator/dictionary.sip
 @sample etc/radiator/radius.cfg.sample
 %%SITE_PERL%%/Radius/AES.pm
 %%SITE_PERL%%/Radius/AES_GCM.pm
 %%SITE_PERL%%/Radius/ASN1.pm
 %%SITE_PERL%%/Radius/AcctLogEVENTLOG.pm
 %%SITE_PERL%%/Radius/AcctLogFILE.pm
 %%SITE_PERL%%/Radius/AcctLogGeneric.pm
 %%SITE_PERL%%/Radius/AcctLogSQL.pm
 %%SITE_PERL%%/Radius/AcctLogSYSLOG.pm
 %%SITE_PERL%%/Radius/AddressAllocatorDHCP.pm
 %%SITE_PERL%%/Radius/AddressAllocatorDHCPv6.pm
 %%SITE_PERL%%/Radius/AddressAllocatorGeneric.pm
 %%SITE_PERL%%/Radius/AddressAllocatorSQL.pm
 %%SITE_PERL%%/Radius/ApplePasswordServer.pm
 %%SITE_PERL%%/Radius/AttrList.pm
 %%SITE_PERL%%/Radius/AttrVal.pm
 %%SITE_PERL%%/Radius/AuthACE.pm
 %%SITE_PERL%%/Radius/AuthADSI.pm
 %%SITE_PERL%%/Radius/AuthCDB.pm
 %%SITE_PERL%%/Radius/AuthDBFILE.pm
 %%SITE_PERL%%/Radius/AuthDIAMETER.pm
 %%SITE_PERL%%/Radius/AuthDIGIPASS.pm
 %%SITE_PERL%%/Radius/AuthDIGIPASSGeneric.pm
 %%SITE_PERL%%/Radius/AuthDNSROAM.pm
 %%SITE_PERL%%/Radius/AuthDUO.pm
 %%SITE_PERL%%/Radius/AuthDYNADDRESS.pm
 %%SITE_PERL%%/Radius/AuthDYNAUTH.pm
 %%SITE_PERL%%/Radius/AuthEAPBALANCE.pm
 %%SITE_PERL%%/Radius/AuthEMERALD.pm
 %%SITE_PERL%%/Radius/AuthEMERALD4.pm
 %%SITE_PERL%%/Radius/AuthEXTERNAL.pm
 %%SITE_PERL%%/Radius/AuthFIDELIO.pm
 %%SITE_PERL%%/Radius/AuthFIDELIOHOTSPOT.pm
 %%SITE_PERL%%/Radius/AuthFILE.pm
 %%SITE_PERL%%/Radius/AuthFREERADIUSSQL.pm
 %%SITE_PERL%%/Radius/AuthGOSSIP.pm
 %%SITE_PERL%%/Radius/AuthGROUP.pm
 %%SITE_PERL%%/Radius/AuthGeneric.pm
 %%SITE_PERL%%/Radius/AuthHANDLER.pm
 %%SITE_PERL%%/Radius/AuthHASHBALANCE.pm
 %%SITE_PERL%%/Radius/AuthHEIMDALDIGEST.pm
+%%SITE_PERL%%/Radius/AuthHOTSPOT.pm
+%%SITE_PERL%%/Radius/AuthHOTSPOTFIDELIO.pm
 %%SITE_PERL%%/Radius/AuthHTGROUP.pm
 %%SITE_PERL%%/Radius/AuthIMAP.pm
 %%SITE_PERL%%/Radius/AuthINTERNAL.pm
 %%SITE_PERL%%/Radius/AuthIPASS.pm
 %%SITE_PERL%%/Radius/AuthKRB5.pm
 %%SITE_PERL%%/Radius/AuthLDAP.pm
 %%SITE_PERL%%/Radius/AuthLDAP2.pm
 %%SITE_PERL%%/Radius/AuthLDAPDIGIPASS.pm
 %%SITE_PERL%%/Radius/AuthLDAPRADIUS.pm
 %%SITE_PERL%%/Radius/AuthLDAPSDK.pm
 %%SITE_PERL%%/Radius/AuthLDAP_APS.pm
 %%SITE_PERL%%/Radius/AuthLOADBALANCE.pm
 %%SITE_PERL%%/Radius/AuthLSA.pm
 %%SITE_PERL%%/Radius/AuthLogEVENTLOG.pm
 %%SITE_PERL%%/Radius/AuthLogFILE.pm
 %%SITE_PERL%%/Radius/AuthLogGeneric.pm
 %%SITE_PERL%%/Radius/AuthLogSQL.pm
 %%SITE_PERL%%/Radius/AuthLogSYSLOG.pm
 %%SITE_PERL%%/Radius/AuthMOBILEIP.pm
 %%SITE_PERL%%/Radius/AuthMULTICAST.pm
 %%SITE_PERL%%/Radius/AuthNISPLUS.pm
 %%SITE_PERL%%/Radius/AuthNT.pm
 %%SITE_PERL%%/Radius/AuthNTLM.pm
 %%SITE_PERL%%/Radius/AuthOPIE.pm
 %%SITE_PERL%%/Radius/AuthOTP.pm
 %%SITE_PERL%%/Radius/AuthPAM.pm
 %%SITE_PERL%%/Radius/AuthPLATYPUS.pm
 %%SITE_PERL%%/Radius/AuthPOP3.pm
 %%SITE_PERL%%/Radius/AuthPORTLIMITCHECK.pm
 %%SITE_PERL%%/Radius/AuthPRESENCESQL.pm
 %%SITE_PERL%%/Radius/AuthRADIATORLB.pm
 %%SITE_PERL%%/Radius/AuthRADIATORPROXY.pm
 %%SITE_PERL%%/Radius/AuthRADIUS.pm
 %%SITE_PERL%%/Radius/AuthRADIUSBYATTR.pm
 %%SITE_PERL%%/Radius/AuthRADKEY.pm
 %%SITE_PERL%%/Radius/AuthRADMIN.pm
 %%SITE_PERL%%/Radius/AuthRADSEC.pm
 %%SITE_PERL%%/Radius/AuthRATELIMIT.pm
 %%SITE_PERL%%/Radius/AuthRATELIMITSOURCE.pm
 %%SITE_PERL%%/Radius/AuthRODOPI.pm
 %%SITE_PERL%%/Radius/AuthROUNDROBIN.pm
 %%SITE_PERL%%/Radius/AuthRSAAM.pm
 %%SITE_PERL%%/Radius/AuthRSAMOBILE.pm
 %%SITE_PERL%%/Radius/AuthSAFEWORD.pm
 %%SITE_PERL%%/Radius/AuthSAML2.pm
 %%SITE_PERL%%/Radius/AuthSASLAUTHD.pm
 %%SITE_PERL%%/Radius/AuthSIP2.pm
 %%SITE_PERL%%/Radius/AuthSOAP.pm
 %%SITE_PERL%%/Radius/AuthSQL.pm
 %%SITE_PERL%%/Radius/AuthSQLAUTHBY.pm
 %%SITE_PERL%%/Radius/AuthSQLDIGIPASS.pm
 %%SITE_PERL%%/Radius/AuthSQLHOTP.pm
 %%SITE_PERL%%/Radius/AuthSQLMOTP.pm
 %%SITE_PERL%%/Radius/AuthSQLRADIUS.pm
 %%SITE_PERL%%/Radius/AuthSQLTOTP.pm
 %%SITE_PERL%%/Radius/AuthSQLYUBIKEY.pm
 %%SITE_PERL%%/Radius/AuthSYSTEM.pm
 %%SITE_PERL%%/Radius/AuthTACACSPLUS.pm
 %%SITE_PERL%%/Radius/AuthTEST.pm
 %%SITE_PERL%%/Radius/AuthUNIX.pm
 %%SITE_PERL%%/Radius/AuthURL.pm
 %%SITE_PERL%%/Radius/AuthVOLUMEBALANCE.pm
 %%SITE_PERL%%/Radius/AuthWIMAX.pm
 %%SITE_PERL%%/Radius/AuthYUBIKEYBASE.pm
 %%SITE_PERL%%/Radius/AuthYUBIKEYGENERIC.pm
 %%SITE_PERL%%/Radius/AuthYUBIKEYVALIDATIONSERVER.pm
 %%SITE_PERL%%/Radius/BigInt.pm
 %%SITE_PERL%%/Radius/Client.pm
 %%SITE_PERL%%/Radius/ClientListLDAP.pm
 %%SITE_PERL%%/Radius/ClientListSQL.pm
 %%SITE_PERL%%/Radius/Configurable.pm
 %%SITE_PERL%%/Radius/Context.pm
 %%SITE_PERL%%/Radius/DES.pm
 %%SITE_PERL%%/Radius/DHCP.pm
 %%SITE_PERL%%/Radius/DHCPPeer.pm
 %%SITE_PERL%%/Radius/DHCPv6.pm
 %%SITE_PERL%%/Radius/DHCPv6Client.pm
 %%SITE_PERL%%/Radius/DiaAttrList.pm
 %%SITE_PERL%%/Radius/DiaClient.pm
 %%SITE_PERL%%/Radius/DiaDict.pm
 %%SITE_PERL%%/Radius/DiaDict_4.pm
 %%SITE_PERL%%/Radius/DiaMsg.pm
 %%SITE_PERL%%/Radius/DiaPeer.pm
 %%SITE_PERL%%/Radius/DiaStatsLogFILE.pm
 %%SITE_PERL%%/Radius/DiaStatsLogGeneric.pm
 %%SITE_PERL%%/Radius/DiaStatsLogREDIS.pm
 %%SITE_PERL%%/Radius/DiaStatsLogSQL.pm
 %%SITE_PERL%%/Radius/DiaUtil.pm
 %%SITE_PERL%%/Radius/Diameter.pm
 %%SITE_PERL%%/Radius/Dictionary.pm
 %%SITE_PERL%%/Radius/Documentation.pm
 %%SITE_PERL%%/Radius/EAP.pm
 %%SITE_PERL%%/Radius/EAP_13.pm
 %%SITE_PERL%%/Radius/EAP_16776957_4244372217.pm
 %%SITE_PERL%%/Radius/EAP_17.pm
 %%SITE_PERL%%/Radius/EAP_21.pm
 %%SITE_PERL%%/Radius/EAP_25.pm
 %%SITE_PERL%%/Radius/EAP_26.pm
 %%SITE_PERL%%/Radius/EAP_38.pm
 %%SITE_PERL%%/Radius/EAP_4.pm
 %%SITE_PERL%%/Radius/EAP_43.pm
 %%SITE_PERL%%/Radius/EAP_46.pm
 %%SITE_PERL%%/Radius/EAP_47.pm
 %%SITE_PERL%%/Radius/EAP_5.pm
 %%SITE_PERL%%/Radius/EAP_52.pm
 %%SITE_PERL%%/Radius/EAP_6.pm
 %%SITE_PERL%%/Radius/Fidelio.pm
 %%SITE_PERL%%/Radius/Gossip.pm
 %%SITE_PERL%%/Radius/GossipRedis.pm
 %%SITE_PERL%%/Radius/GossipUDP.pm
 %%SITE_PERL%%/Radius/HOTP.pm
 %%SITE_PERL%%/Radius/HTTPRequest.pm
 %%SITE_PERL%%/Radius/Handler.pm
 %%SITE_PERL%%/Radius/IEEEfp.pm
 %%SITE_PERL%%/Radius/Ldap.pm
 %%SITE_PERL%%/Radius/Log.pm
 %%SITE_PERL%%/Radius/LogEMERALD.pm
 %%SITE_PERL%%/Radius/LogEVENTLOG.pm
 %%SITE_PERL%%/Radius/LogFILE.pm
 %%SITE_PERL%%/Radius/LogFormat.pm
 %%SITE_PERL%%/Radius/LogGeneric.pm
 %%SITE_PERL%%/Radius/LogSQL.pm
 %%SITE_PERL%%/Radius/LogSYSLOG.pm
 %%SITE_PERL%%/Radius/Logger.pm
 %%SITE_PERL%%/Radius/MSCHAP.pm
 %%SITE_PERL%%/Radius/MessageLogFILE.pm
 %%SITE_PERL%%/Radius/MessageLogGeneric.pm
 %%SITE_PERL%%/Radius/Mib.pm
 %%SITE_PERL%%/Radius/Monitor.pm
 %%SITE_PERL%%/Radius/Nas.pm
 %%SITE_PERL%%/Radius/Nas/Ascend.pm
 %%SITE_PERL%%/Radius/Nas/AscendSNMP.pm
 %%SITE_PERL%%/Radius/Nas/Bay.pm
 %%SITE_PERL%%/Radius/Nas/Bay4000SNMP.pm
 %%SITE_PERL%%/Radius/Nas/Bay5399SNMP.pm
 %%SITE_PERL%%/Radius/Nas/Bay8000SNMP.pm
 %%SITE_PERL%%/Radius/Nas/BayFinger.pm
 %%SITE_PERL%%/Radius/Nas/Brocade.pm
 %%SITE_PERL%%/Radius/Nas/Cisco.pm
 %%SITE_PERL%%/Radius/Nas/CiscoSessionMIB.pm
 %%SITE_PERL%%/Radius/Nas/CiscoVPDN.pm
 %%SITE_PERL%%/Radius/Nas/Colubris.pm
 %%SITE_PERL%%/Radius/Nas/Computone.pm
 %%SITE_PERL%%/Radius/Nas/Cyclades.pm
 %%SITE_PERL%%/Radius/Nas/Generic.pm
 %%SITE_PERL%%/Radius/Nas/Hiper.pm
 %%SITE_PERL%%/Radius/Nas/Juniper.pm
 %%SITE_PERL%%/Radius/Nas/Livingston.pm
 %%SITE_PERL%%/Radius/Nas/MikroTik.pm
 %%SITE_PERL%%/Radius/Nas/NasGeneric.pm
 %%SITE_PERL%%/Radius/Nas/NomadixSNMP.pm
 %%SITE_PERL%%/Radius/Nas/NortelCVX1800.pm
 %%SITE_PERL%%/Radius/Nas/Patton.pm
 %%SITE_PERL%%/Radius/Nas/Ping.pm
 %%SITE_PERL%%/Radius/Nas/Portmaster3.pm
 %%SITE_PERL%%/Radius/Nas/Portmaster4.pm
 %%SITE_PERL%%/Radius/Nas/Portslave.pm
 %%SITE_PERL%%/Radius/Nas/PortslaveLinux.pm
 %%SITE_PERL%%/Radius/Nas/PortslaveMoxa.pm
 %%SITE_PERL%%/Radius/Nas/Redback.pm
 %%SITE_PERL%%/Radius/Nas/Shiva.pm
 %%SITE_PERL%%/Radius/Nas/Tigris.pm
 %%SITE_PERL%%/Radius/Nas/TigrisNew.pm
 %%SITE_PERL%%/Radius/Nas/TigrisOld.pm
 %%SITE_PERL%%/Radius/Nas/TotalControl.pm
 %%SITE_PERL%%/Radius/Nas/TotalControlSNMP.pm
 %%SITE_PERL%%/Radius/Nas/Vyatta.pm
 %%SITE_PERL%%/Radius/Nas/Xyplex.pm
 %%SITE_PERL%%/Radius/Nas/ZTE.pm
 %%SITE_PERL%%/Radius/Nas/ignore.pm
 %%SITE_PERL%%/Radius/Nas/unknown.pm
-%%SITE_PERL%%/Radius/OSC_IMV.pm
 %%SITE_PERL%%/Radius/PBKDF.pm
 %%SITE_PERL%%/Radius/Predicate.pm
 %%SITE_PERL%%/Radius/RDict.pm
 %%SITE_PERL%%/Radius/RadSec.pm
 %%SITE_PERL%%/Radius/Radius.pm
 %%SITE_PERL%%/Radius/RadiusDiameterGateway.pm
 %%SITE_PERL%%/Radius/RadiusProxyAlg.pm
 %%SITE_PERL%%/Radius/RadpwtstGui.pm
 %%SITE_PERL%%/Radius/Rcrypt.pm
 %%SITE_PERL%%/Radius/Realm.pm
 %%SITE_PERL%%/Radius/Resolver.pm
 %%SITE_PERL%%/Radius/RuntimeChecks.pm
 %%SITE_PERL%%/Radius/SIP2.pm
 %%SITE_PERL%%/Radius/SMS/Internode.pm
 %%SITE_PERL%%/Radius/SNMP.pm
 %%SITE_PERL%%/Radius/SNMPAgent.pm
 %%SITE_PERL%%/Radius/SOAPRequest.pm
 %%SITE_PERL%%/Radius/Select.pm
+%%SITE_PERL%%/Radius/ServGeneric.pm
+%%SITE_PERL%%/Radius/ServINTERNAL.pm
+%%SITE_PERL%%/Radius/ServSQL.pm
 %%SITE_PERL%%/Radius/ServerConfig.pm
 %%SITE_PERL%%/Radius/ServerDIAMETER.pm
 %%SITE_PERL%%/Radius/ServerHTTP.pm
 %%SITE_PERL%%/Radius/ServerRADIUS.pm
 %%SITE_PERL%%/Radius/ServerRADSEC.pm
 %%SITE_PERL%%/Radius/ServerTACACSPLUS.pm
+%%SITE_PERL%%/Radius/Service.pm
 %%SITE_PERL%%/Radius/SessDBM.pm
 %%SITE_PERL%%/Radius/SessGeneric.pm
 %%SITE_PERL%%/Radius/SessINTERNAL.pm
 %%SITE_PERL%%/Radius/SessNULL.pm
 %%SITE_PERL%%/Radius/SessREDIS.pm
 %%SITE_PERL%%/Radius/SessSQL.pm
+%%SITE_PERL%%/Radius/Session.pm
 %%SITE_PERL%%/Radius/SimpleClient.pm
 %%SITE_PERL%%/Radius/SqlDb.pm
 %%SITE_PERL%%/Radius/StateMachine.pm
 %%SITE_PERL%%/Radius/StatsLogFILE.pm
 %%SITE_PERL%%/Radius/StatsLogGeneric.pm
 %%SITE_PERL%%/Radius/StatsLogREDIS.pm
 %%SITE_PERL%%/Radius/StatsLogSQL.pm
 %%SITE_PERL%%/Radius/Stream.pm
 %%SITE_PERL%%/Radius/StreamServer.pm
 %%SITE_PERL%%/Radius/StreamTLS.pm
+%%SITE_PERL%%/Radius/Subscription.pm
 %%SITE_PERL%%/Radius/TLS.pm
 %%SITE_PERL%%/Radius/TLSConfig.pm
-%%SITE_PERL%%/Radius/TNC.pm
 %%SITE_PERL%%/Radius/TOTP.pm
 %%SITE_PERL%%/Radius/TacacsClient.pm
 %%SITE_PERL%%/Radius/Tacacsplus.pm
 %%SITE_PERL%%/Radius/User.pm
 %%SITE_PERL%%/Radius/Util.pm
 %%SITE_PERL%%/Radius/UtilClient.pm
 %%SITE_PERL%%/Radius/UtilSocket6.pm
 %%SITE_PERL%%/Radius/VSA.pm
 %%SITE_PERL%%/Radius/VSA/VendorGeneric.pm
 %%SITE_PERL%%/Radius/WiMAX.pm
 %%SITE_PERL%%/Radius/WiMAXTLV.pm
 %%SITE_PERL%%/Radius/Win32Service.pm