CVS commit: pkgsrc/net

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Apr  5 09:16:43 UTC 2023

Modified Files:
        pkgsrc/net/freeradius: DEINSTALL INSTALL Makefile Makefile.common PLIST
            config.mk distinfo
        pkgsrc/net/freeradius-freetds: Makefile
        pkgsrc/net/freeradius-perl: Makefile
        pkgsrc/net/freeradius-python: Makefile
        pkgsrc/net/freeradius-rest: Makefile
        pkgsrc/net/freeradius-sqlite3: Makefile

Log Message:
freeradius: updated to 3.2.2

Version 3.2.2

FEATURE IMPROVEMENTS

The "configure" process now gives a much clearer report when it's finished. Patches by Matthew Newton.
Fallback to "uname -n" on missing "hostname".
Export thread details in radmin "stats threads".
Improve queries for processing radacct into periodic usage data Fix from Nick Porter.
Update dictionary.juniper.
Add dictionary.calix.
Fix dictionary.rfc6519 DS-Lite-Tunnel-Name to be "octets".
Update documentation for robust-proxy-accounting, and be more aggressive about sending packets.
Add per-module README.md files in the source.
Add default Visual Studio configuration for developers.
Postgres can now automatically use alternate queries for errors other than duplicate keys.
%{listen:TLS-PSK-Identity} is now set when using PSK and psk_query This helps the server track the identity of the client which is connecting.
Include thread stats in Status-Server attributes.
Mark rlm_unbound stable and add to packages. Patches by Nick Porter.
Remove broken/unsupported Dockerfiles for centos8 and debian9.
Ensure Docker containers have stable uid/gid. Patches from Terry Burton.

BUG FIXES

Preliminary support for non-blocking TLS sockets.
Fix support for partial certificate chains after adding reload support.
Fix handling of debug_condition.
Clean up home server states, and re-sync with the dictionaries.
Correct certificate order when creating TLS-* attributes
Update use of isalpha() etc. so broken configurations have less impact on the server.
Outgoing TLS sockets now set SNI correctly from the "hostname" configuration item.
Support Apple Homebrew on the M1.
Better error messages when %{listen:TLS-...} is used.
Getting statistics via Status-Server can now be done within a virtual server.
Make TTLS+MS-CHAP work with TLS 1.3.
Fix md5 xlat memory leak when using OpenSSL 3. Fix by Terry Burton.

Version 3.2.1

FEATURE IMPROVEMENTS

Add dictionary.ciena, dictionary.nile, and DHCPv4 dictionaries,.
Add simultaneous-use queries for MS SQL.
Add radmin command for "stats pool <module-name>" Which prints out statistics about the connection pools.
Client statistics now shows "conflicts", to count conflicting packets.
New optional "lightweight accounting-on/off" strategy. When refreshing queries.conf you should also add the new nasreload table and corresponding GRANTs to your DB schema.
Add TLS-Client-Cert-X509v3-Certificate-Policies, which helps with Eduroam. Suggested by Stefan Winter.
Allow auth+acct for TCP sockets, too.
Add rlm_cache_redis. See raddb/mods-available/cache for details.
Allow radmin to look up home servers by name, too.
Ensure that dynamic clients don't create loops on duplicates Reported by Sam Yee.
Removed rlm_sqlhpwippool. There was no documentation, no configuration, and the module was ~15 years old with no one using it.
Marked rlm_python3 as stable.
Add sigalgs_list. See raddb/mods-available/eap. Patch from Boris Lytochkin.
For rlm_linelog, when opening files in /dev, look at "permissions" to see whether to open them r/w.
More flexibility for dynamic home servers. See doc/configuration/dynamic_home_servers.md and raddb/home_servers/README.md.
Allow setting of application_name for PostgreSQL. See mods-available/sql.

BUG FIXES

Correct test for open sessions in radacct for MS SQL.
The linelog module now opens /dev/stdout in "write-only" mode if the permissions are set to "u+w" (0002).
Various fixes to rlm_unbound from Nick Porter.
PEAP now correctly runs Post-Auth-Type Accept.
Create "TLS-Cert-*" for outbound Radsec, instead of TLS-Client-Cert-*. See sites-available/tls, and fix_cert_order.
Minor updates and fixes to CI, Dockerfiles and packaging.
Fix rlm_python3 build with python >= 3.10.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/freeradius/DEINSTALL
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/freeradius/INSTALL
cvs rdiff -u -r1.116 -r1.117 pkgsrc/net/freeradius/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/freeradius/Makefile.common
cvs rdiff -u -r1.36 -r1.37 pkgsrc/net/freeradius/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/freeradius/config.mk
cvs rdiff -u -r1.45 -r1.46 pkgsrc/net/freeradius/distinfo
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/freeradius-freetds/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/freeradius-perl/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/freeradius-python/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/freeradius-rest/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/freeradius-sqlite3/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/freeradius/DEINSTALL
diff -u pkgsrc/net/freeradius/DEINSTALL:1.4 pkgsrc/net/freeradius/DEINSTALL:1.5
--- pkgsrc/net/freeradius/DEINSTALL:1.4 Wed Jul 20 01:19:55 2022
+++ pkgsrc/net/freeradius/DEINSTALL     Wed Apr  5 09:16:42 2023
@@ -1,10 +1,10 @@
-# $NetBSD: DEINSTALL,v 1.4 2022/07/20 01:19:55 gutteridge Exp $
+# $NetBSD: DEINSTALL,v 1.5 2023/04/05 09:16:42 adam Exp $
 #
 # Remove default symlinks in ${PKG_SYSCONFDIR} for enabled modules/sites
 #
 
 SITES_ENABLED="default inner-tunnel"
-MODS_ENABLED="always attr_filter cache_eap chap date detail detail.log
+MODS_ENABLED="always attr_filter chap date 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 totp unix unpack utf8"

Index: pkgsrc/net/freeradius/INSTALL
diff -u pkgsrc/net/freeradius/INSTALL:1.3 pkgsrc/net/freeradius/INSTALL:1.4
--- pkgsrc/net/freeradius/INSTALL:1.3   Wed Jul 20 01:19:55 2022
+++ pkgsrc/net/freeradius/INSTALL       Wed Apr  5 09:16:42 2023
@@ -1,10 +1,10 @@
-# $NetBSD: INSTALL,v 1.3 2022/07/20 01:19:55 gutteridge Exp $
+# $NetBSD: INSTALL,v 1.4 2023/04/05 09:16:42 adam Exp $
 #
 # Create default symlinks in ${PKG_SYSCONFDIR} for enabled modules/sites
 #
 
 SITES_ENABLED="default inner-tunnel"
-MODS_ENABLED="always attr_filter cache_eap chap date detail detail.log
+MODS_ENABLED="always attr_filter chap date 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 totp unix unpack utf8"

Index: pkgsrc/net/freeradius/Makefile
diff -u pkgsrc/net/freeradius/Makefile:1.116 pkgsrc/net/freeradius/Makefile:1.117
--- pkgsrc/net/freeradius/Makefile:1.116        Wed Jul 20 01:19:55 2022
+++ pkgsrc/net/freeradius/Makefile      Wed Apr  5 09:16:42 2023
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.116 2022/07/20 01:19:55 gutteridge Exp $
+# $NetBSD: Makefile,v 1.117 2023/04/05 09:16:42 adam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/-server//}
-PKGREVISION=   3
 COMMENT=       Free RADIUS server implementation
 
 BUILD_DEFS+=           VARBASE

Index: pkgsrc/net/freeradius/Makefile.common
diff -u pkgsrc/net/freeradius/Makefile.common:1.11 pkgsrc/net/freeradius/Makefile.common:1.12
--- pkgsrc/net/freeradius/Makefile.common:1.11  Fri Nov 12 12:27:38 2021
+++ pkgsrc/net/freeradius/Makefile.common       Wed Apr  5 09:16:42 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.11 2021/11/12 12:27:38 adam Exp $
+# $NetBSD: Makefile.common,v 1.12 2023/04/05 09:16:42 adam Exp $
 # used by net/freeradius/Makefile.module
 
-DISTNAME=      freeradius-server-3.0.25
+DISTNAME=      freeradius-server-3.2.2
 CATEGORIES=    net
 MASTER_SITES=  ftp://ftp.freeradius.org/pub/freeradius/
 EXTRACT_SUFX=  .tar.bz2
@@ -34,5 +34,6 @@ PRINT_PLIST_AWK+=     {gsub(/\.${SOEXT}$$/, 
 .include "../../databases/gdbm/buildlink3.mk"
 .include "../../devel/talloc/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../net/unbound/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/atomic64.mk"

Index: pkgsrc/net/freeradius/PLIST
diff -u pkgsrc/net/freeradius/PLIST:1.36 pkgsrc/net/freeradius/PLIST:1.37
--- pkgsrc/net/freeradius/PLIST:1.36    Fri Nov 12 12:27:38 2021
+++ pkgsrc/net/freeradius/PLIST Wed Apr  5 09:16:42 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2021/11/12 12:27:38 adam Exp $
+@comment $NetBSD: PLIST,v 1.37 2023/04/05 09:16:42 adam Exp $
 bin/dhcpclient
 bin/map_unit
 bin/rad_counter
@@ -97,7 +97,6 @@ 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}
@@ -121,7 +120,6 @@ 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}
@@ -139,6 +137,7 @@ lib/rlm_sqlippool.${SOEXT}
 lib/rlm_test.${SOEXT}
 lib/rlm_totp.${SOEXT}
 lib/rlm_unix.${SOEXT}
+lib/rlm_unbound.${SOEXT}
 lib/rlm_unpack.${SOEXT}
 lib/rlm_utf8.${SOEXT}
 lib/rlm_wimax.${SOEXT}
@@ -170,6 +169,7 @@ man/man5/rlm_pap.5
 man/man5/rlm_passwd.5
 man/man5/rlm_realm.5
 man/man5/rlm_sql.5
+man/man5/rlm_unbound.5
 man/man5/rlm_unix.5
 man/man5/unlang.5
 man/man5/users.5
@@ -291,6 +291,7 @@ share/doc/freeradius/deployment/OS2
 share/doc/freeradius/deployment/performance-testing
 share/doc/freeradius/deployment/supervise-radiusd.rst
 share/doc/freeradius/deployment/tuning_guide
+share/doc/freeradius/developer/autotools.md
 share/doc/freeradius/developer/coding-methods.rst
 share/doc/freeradius/developer/contributing.rst
 share/doc/freeradius/developer/module_interface.rst
@@ -430,7 +431,7 @@ share/examples/freeradius/mods-available
 share/examples/freeradius/mods-available/always
 share/examples/freeradius/mods-available/attr_filter
 share/examples/freeradius/mods-available/cache
-share/examples/freeradius/mods-available/cache_eap
+share/examples/freeradius/mods-available/cache_auth
 share/examples/freeradius/mods-available/chap
 share/examples/freeradius/mods-available/couchbase
 share/examples/freeradius/mods-available/counter
@@ -456,8 +457,10 @@ share/examples/freeradius/mods-available
 share/examples/freeradius/mods-available/idn
 share/examples/freeradius/mods-available/inner-eap
 share/examples/freeradius/mods-available/ippool
+share/examples/freeradius/mods-available/json
 share/examples/freeradius/mods-available/krb5
 share/examples/freeradius/mods-available/ldap
+share/examples/freeradius/mods-available/ldap_google
 share/examples/freeradius/mods-available/linelog
 share/examples/freeradius/mods-available/logintime
 share/examples/freeradius/mods-available/mac2ip
@@ -466,7 +469,6 @@ share/examples/freeradius/mods-available
 share/examples/freeradius/mods-available/mschap
 share/examples/freeradius/mods-available/ntlm_auth
 share/examples/freeradius/mods-available/opendirectory
-share/examples/freeradius/mods-available/otp
 share/examples/freeradius/mods-available/pam
 share/examples/freeradius/mods-available/pap
 share/examples/freeradius/mods-available/passwd
@@ -510,6 +512,7 @@ share/examples/freeradius/mods-config/fi
 share/examples/freeradius/mods-config/perl/example.pl
 share/examples/freeradius/mods-config/preprocess/hints
 share/examples/freeradius/mods-config/preprocess/huntgroups
+share/examples/freeradius/mods-config/realm/freeradius-naptr-to-home-server.sh
 share/examples/freeradius/mods-config/sql/counter/mysql/dailycounter.conf
 share/examples/freeradius/mods-config/sql/counter/mysql/expire_on_login.conf
 share/examples/freeradius/mods-config/sql/counter/mysql/monthlycounter.conf
@@ -596,7 +599,8 @@ share/examples/freeradius/mods-config/sq
 share/examples/freeradius/mods-config/sql/main/postgresql/queries.conf
 share/examples/freeradius/mods-config/sql/main/postgresql/schema.sql
 share/examples/freeradius/mods-config/sql/main/postgresql/setup.sql
-share/examples/freeradius/mods-config/sql/main/sqlite/process-radacct-refresh.sh
+share/examples/freeradius/mods-config/sql/main/sqlite/process-radacct-close-after-reload.pl
+share/examples/freeradius/mods-config/sql/main/sqlite/process-radacct-new-data-usage-period.sh
 share/examples/freeradius/mods-config/sql/main/sqlite/process-radacct-schema.sql
 share/examples/freeradius/mods-config/sql/main/sqlite/queries.conf
 share/examples/freeradius/mods-config/sql/main/sqlite/schema.sql
@@ -609,7 +613,6 @@ share/examples/freeradius/mods-config/sq
 share/examples/freeradius/mods-config/unbound/default.conf
 share/examples/freeradius/mods-enabled/always
 share/examples/freeradius/mods-enabled/attr_filter
-share/examples/freeradius/mods-enabled/cache_eap
 share/examples/freeradius/mods-enabled/chap
 share/examples/freeradius/mods-enabled/date
 share/examples/freeradius/mods-enabled/detail
@@ -656,6 +659,7 @@ share/examples/freeradius/radiusd.conf
 share/examples/freeradius/sites-available/README
 share/examples/freeradius/sites-available/abfab-tls
 share/examples/freeradius/sites-available/abfab-tr-idp
+share/examples/freeradius/sites-available/aws-nlb
 share/examples/freeradius/sites-available/buffered-sql
 share/examples/freeradius/sites-available/challenge
 share/examples/freeradius/sites-available/channel_bindings
@@ -670,6 +674,7 @@ share/examples/freeradius/sites-availabl
 share/examples/freeradius/sites-available/dhcp.relay
 share/examples/freeradius/sites-available/dynamic-clients
 share/examples/freeradius/sites-available/example
+share/examples/freeradius/sites-available/google-ldap-auth
 share/examples/freeradius/sites-available/inner-tunnel
 share/examples/freeradius/sites-available/originate-coa
 share/examples/freeradius/sites-available/proxy-inner-tunnel
@@ -678,6 +683,7 @@ share/examples/freeradius/sites-availabl
 share/examples/freeradius/sites-available/soh
 share/examples/freeradius/sites-available/status
 share/examples/freeradius/sites-available/tls
+share/examples/freeradius/sites-available/tls-cache
 share/examples/freeradius/sites-available/totp
 share/examples/freeradius/sites-available/virtual.example.com
 share/examples/freeradius/sites-available/vmps
@@ -694,6 +700,7 @@ share/freeradius/dictionary.acc
 share/freeradius/dictionary.acme
 share/freeradius/dictionary.actelis
 share/freeradius/dictionary.adtran
+share/freeradius/dictionary.adva
 share/freeradius/dictionary.aerohive
 share/freeradius/dictionary.airespace
 share/freeradius/dictionary.alcatel
@@ -728,11 +735,13 @@ share/freeradius/dictionary.bskyb
 share/freeradius/dictionary.bt
 share/freeradius/dictionary.cablelabs
 share/freeradius/dictionary.cabletron
+share/freeradius/dictionary.calix
 share/freeradius/dictionary.cambium
 share/freeradius/dictionary.camiant
 share/freeradius/dictionary.centec
 share/freeradius/dictionary.checkpoint
 share/freeradius/dictionary.chillispot
+share/freeradius/dictionary.ciena
 share/freeradius/dictionary.cisco
 share/freeradius/dictionary.cisco.asa
 share/freeradius/dictionary.cisco.bbsm
@@ -746,6 +755,7 @@ share/freeradius/dictionary.columbia_uni
 share/freeradius/dictionary.compat
 share/freeradius/dictionary.compatible
 share/freeradius/dictionary.cosine
+share/freeradius/dictionary.covaro
 share/freeradius/dictionary.dante
 share/freeradius/dictionary.dellemc
 share/freeradius/dictionary.dhcp
@@ -768,6 +778,7 @@ share/freeradius/dictionary.fortinet
 share/freeradius/dictionary.foundry
 share/freeradius/dictionary.freedhcp
 share/freeradius/dictionary.freeradius
+share/freeradius/dictionary.freeradius.evs5
 share/freeradius/dictionary.freeradius.internal
 share/freeradius/dictionary.freeswitch
 share/freeradius/dictionary.gandalf
@@ -795,6 +806,7 @@ share/freeradius/dictionary.localweb
 share/freeradius/dictionary.lucent
 share/freeradius/dictionary.manzara
 share/freeradius/dictionary.meinberg
+share/freeradius/dictionary.mellanox
 share/freeradius/dictionary.meraki
 share/freeradius/dictionary.merit
 share/freeradius/dictionary.meru
@@ -807,9 +819,11 @@ share/freeradius/dictionary.motorola.ill
 share/freeradius/dictionary.motorola.wimax
 share/freeradius/dictionary.navini
 share/freeradius/dictionary.net
+share/freeradius/dictionary.netelastic
 share/freeradius/dictionary.netscreen
 share/freeradius/dictionary.networkphysics
 share/freeradius/dictionary.nexans
+share/freeradius/dictionary.nile
 share/freeradius/dictionary.nokia
 share/freeradius/dictionary.nokia.conflict
 share/freeradius/dictionary.nomadix

Index: pkgsrc/net/freeradius/config.mk
diff -u pkgsrc/net/freeradius/config.mk:1.5 pkgsrc/net/freeradius/config.mk:1.6
--- pkgsrc/net/freeradius/config.mk:1.5 Wed Jul 20 01:19:55 2022
+++ pkgsrc/net/freeradius/config.mk     Wed Apr  5 09:16:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: config.mk,v 1.5 2022/07/20 01:19:55 gutteridge Exp $
+# $NetBSD: config.mk,v 1.6 2023/04/05 09:16:42 adam Exp $
 
 # cd ${DESTDIR}${EGDIR}/raddb; find . -type f | sort | sed 's,^./,EGFILES+=\t,'
 #
@@ -22,7 +22,7 @@ EGFILES+=     mods-available/abfab_psk_sql
 EGFILES+=      mods-available/always
 EGFILES+=      mods-available/attr_filter
 EGFILES+=      mods-available/cache
-EGFILES+=      mods-available/cache_eap
+EGFILES+=      mods-available/cache_auth
 EGFILES+=      mods-available/chap
 EGFILES+=      mods-available/couchbase
 EGFILES+=      mods-available/counter
@@ -48,8 +48,10 @@ EGFILES+=    mods-available/files
 EGFILES+=      mods-available/idn
 EGFILES+=      mods-available/inner-eap
 EGFILES+=      mods-available/ippool
+EGFILES+=      mods-available/json
 EGFILES+=      mods-available/krb5
 EGFILES+=      mods-available/ldap
+EGFILES+=      mods-available/ldap_google
 EGFILES+=      mods-available/linelog
 EGFILES+=      mods-available/logintime
 EGFILES+=      mods-available/mac2ip
@@ -58,7 +60,6 @@ EGFILES+=     mods-available/moonshot-target
 EGFILES+=      mods-available/mschap
 EGFILES+=      mods-available/ntlm_auth
 EGFILES+=      mods-available/opendirectory
-EGFILES+=      mods-available/otp
 EGFILES+=      mods-available/pam
 EGFILES+=      mods-available/pap
 EGFILES+=      mods-available/passwd
@@ -102,6 +103,7 @@ EGFILES+=   mods-config/files/pre-proxy
 EGFILES+=      mods-config/perl/example.pl
 EGFILES+=      mods-config/preprocess/hints
 EGFILES+=      mods-config/preprocess/huntgroups
+EGFILES+=      mods-config/realm/freeradius-naptr-to-home-server.sh
 EGFILES+=      mods-config/sql/counter/mysql/dailycounter.conf
 EGFILES+=      mods-config/sql/counter/mysql/expire_on_login.conf
 EGFILES+=      mods-config/sql/counter/mysql/monthlycounter.conf
@@ -188,7 +190,8 @@ EGFILES+=   mods-config/sql/main/postgresq
 EGFILES+=      mods-config/sql/main/postgresql/queries.conf
 EGFILES+=      mods-config/sql/main/postgresql/schema.sql
 EGFILES+=      mods-config/sql/main/postgresql/setup.sql
-EGFILES+=      mods-config/sql/main/sqlite/process-radacct-refresh.sh
+EGFILES+=      mods-config/sql/main/sqlite/process-radacct-close-after-reload.pl
+EGFILES+=      mods-config/sql/main/sqlite/process-radacct-new-data-usage-period.sh
 EGFILES+=      mods-config/sql/main/sqlite/process-radacct-schema.sql
 EGFILES+=      mods-config/sql/main/sqlite/queries.conf
 EGFILES+=      mods-config/sql/main/sqlite/schema.sql
@@ -217,6 +220,7 @@ EGFILES+=   radiusd.conf
 EGFILES+=      sites-available/README
 EGFILES+=      sites-available/abfab-tls
 EGFILES+=      sites-available/abfab-tr-idp
+EGFILES+=      sites-available/aws-nlb
 EGFILES+=      sites-available/buffered-sql
 EGFILES+=      sites-available/challenge
 EGFILES+=      sites-available/channel_bindings
@@ -231,6 +235,7 @@ EGFILES+=   sites-available/dhcp
 EGFILES+=      sites-available/dhcp.relay
 EGFILES+=      sites-available/dynamic-clients
 EGFILES+=      sites-available/example
+EGFILES+=      sites-available/google-ldap-auth
 EGFILES+=      sites-available/inner-tunnel
 EGFILES+=      sites-available/originate-coa
 EGFILES+=      sites-available/proxy-inner-tunnel
@@ -239,6 +244,7 @@ EGFILES+=   sites-available/robust-proxy-a
 EGFILES+=      sites-available/soh
 EGFILES+=      sites-available/status
 EGFILES+=      sites-available/tls
+EGFILES+=      sites-available/tls-cache
 EGFILES+=      sites-available/totp
 EGFILES+=      sites-available/virtual.example.com
 EGFILES+=      sites-available/vmps

Index: pkgsrc/net/freeradius/distinfo
diff -u pkgsrc/net/freeradius/distinfo:1.45 pkgsrc/net/freeradius/distinfo:1.46
--- pkgsrc/net/freeradius/distinfo:1.45 Fri Nov 12 12:27:38 2021
+++ pkgsrc/net/freeradius/distinfo      Wed Apr  5 09:16:42 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.45 2021/11/12 12:27:38 adam Exp $
+$NetBSD: distinfo,v 1.46 2023/04/05 09:16:42 adam Exp $
 
-BLAKE2s (freeradius-server-3.0.25.tar.bz2) = d595c12daeef4e1f1a03a0092efde9b932d2e4526e1de59082462148e03ec7bc
-SHA512 (freeradius-server-3.0.25.tar.bz2) = 984bb65c86c541c91708370340ac6157b4d4d89a4ae7cbc690a9f17ead0e63fb20180333cdc33093877f84b6d40445495d881ae677858cbf60fcfd990fb02ba4
-Size (freeradius-server-3.0.25.tar.bz2) = 3402380 bytes
+BLAKE2s (freeradius-server-3.2.2.tar.bz2) = eef8ac7eeedb073226c8d79160568b360488338b03d6618ca5e7e9ad7cffece9
+SHA512 (freeradius-server-3.2.2.tar.bz2) = 91dc574560a1f75cafa8bc78c0676f0e3dae7154ecbb395e0e1f6738f78d8bcfe1bff122364452798fd0434c4056fd946799b8f29a1141398bf0542a37870689
+Size (freeradius-server-3.2.2.tar.bz2) = 3418998 bytes
 SHA1 (patch-ai) = e32ffd24b93e2cef2e72ef9a8ea59d49e1571dc0
 SHA1 (patch-configure.ac) = ffec1f851d23f560797c12eba5092f2940e4d662
 SHA1 (patch-raddb_radiusd.conf.in) = 353cbed35013777bf055a77cc610b50a637ae7b7

Index: pkgsrc/net/freeradius-freetds/Makefile
diff -u pkgsrc/net/freeradius-freetds/Makefile:1.19 pkgsrc/net/freeradius-freetds/Makefile:1.20
--- pkgsrc/net/freeradius-freetds/Makefile:1.19 Wed Oct 26 10:31:47 2022
+++ pkgsrc/net/freeradius-freetds/Makefile      Wed Apr  5 09:16:42 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2022/10/26 10:31:47 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2023/04/05 09:16:42 adam Exp $
 
-PKGREVISION= 2
 .include "../../net/freeradius/Makefile.module"
 
 PKGNAME=       ${DISTNAME:S/-server/-freetds/}

Index: pkgsrc/net/freeradius-perl/Makefile
diff -u pkgsrc/net/freeradius-perl/Makefile:1.11 pkgsrc/net/freeradius-perl/Makefile:1.12
--- pkgsrc/net/freeradius-perl/Makefile:1.11    Tue Jun 28 11:34:59 2022
+++ pkgsrc/net/freeradius-perl/Makefile Wed Apr  5 09:16:43 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.11 2022/06/28 11:34:59 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2023/04/05 09:16:43 adam Exp $
 
-PKGREVISION= 1
 .include "../../net/freeradius/Makefile.module"
 
 PKGNAME=       ${DISTNAME:S/-server/-perl/}

Index: pkgsrc/net/freeradius-python/Makefile
diff -u pkgsrc/net/freeradius-python/Makefile:1.7 pkgsrc/net/freeradius-python/Makefile:1.8
--- pkgsrc/net/freeradius-python/Makefile:1.7   Thu Sep  1 20:23:23 2022
+++ pkgsrc/net/freeradius-python/Makefile       Wed Apr  5 09:16:43 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.7 2022/09/01 20:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/04/05 09:16:43 adam Exp $
 
-PKGREVISION= 2
 .include "../../net/freeradius/Makefile.module"
 
 PKGNAME=       ${DISTNAME:S/-server/-python/}

Index: pkgsrc/net/freeradius-rest/Makefile
diff -u pkgsrc/net/freeradius-rest/Makefile:1.25 pkgsrc/net/freeradius-rest/Makefile:1.26
--- pkgsrc/net/freeradius-rest/Makefile:1.25    Wed Oct 26 10:31:47 2022
+++ pkgsrc/net/freeradius-rest/Makefile Wed Apr  5 09:16:43 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.25 2022/10/26 10:31:47 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2023/04/05 09:16:43 adam Exp $
 
-PKGREVISION= 2
 .include "../../net/freeradius/Makefile.module"
 
 PKGNAME=       ${DISTNAME:S/-server/-rest/}

Index: pkgsrc/net/freeradius-sqlite3/Makefile
diff -u pkgsrc/net/freeradius-sqlite3/Makefile:1.19 pkgsrc/net/freeradius-sqlite3/Makefile:1.20
--- pkgsrc/net/freeradius-sqlite3/Makefile:1.19 Wed Nov 23 16:20:50 2022
+++ pkgsrc/net/freeradius-sqlite3/Makefile      Wed Apr  5 09:16:43 2023
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.19 2022/11/23 16:20:50 adam Exp $
+# $NetBSD: Makefile,v 1.20 2023/04/05 09:16:43 adam Exp $
 
-PKGREVISION= 3
 .include "../../net/freeradius/Makefile.module"
 
 PKGNAME=       ${DISTNAME:S/-server/-sqlite3/}