git: 92115109ec7f - main - net/freeradius3: Update to 3.2.2

The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=92115109ec7f3174d4809a0873a997abb5a77534

commit 92115109ec7f3174d4809a0873a997abb5a77534
Author:     Ryan Steinmetz <zi@FreeBSD.org>
AuthorDate: 2023-03-13 13:02:03 +0000
Commit:     Ryan Steinmetz <zi@FreeBSD.org>
CommitDate: 2023-03-13 13:05:35 +0000

    net/freeradius3: Update to 3.2.2
---
 net/freeradius3/Makefile                   | 11 +++++------
 net/freeradius3/distinfo                   |  6 +++---
 net/freeradius3/files/patch-src_main_tls.c | 18 ------------------
 net/freeradius3/pkg-plist                  |  1 +
 4 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index fc2798cdbcc3..f09d225de839 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	freeradius
-DISTVERSION=	3.2.1
-PORTREVISION=	1
+DISTVERSION=	3.2.2
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${DISTVERSION:S/./_/g}/ \
 		https://freeradius.org/ftp/pub/radius/%SUBDIR%/ \
@@ -25,10 +24,10 @@ LIB_DEPENDS=	libgdbm.so:databases/gdbm \
 
 FLAVORS=	default ldap mysql pgsql sqlite3
 FLAVOR?=	${FLAVORS:[1]}
-ldap_PKGNAMESUFFIX=	-ldap
-mysql_PKGNAMESUFFIX=	-mysql
-pgsql_PKGNAMESUFFIX=	-pgsql
-sqlite3_PKGNAMESUFFIX=	-sqlite3
+ldap_PKGNAMESUFFIX=	3-ldap
+mysql_PKGNAMESUFFIX=	3-mysql
+pgsql_PKGNAMESUFFIX=	3-pgsql
+sqlite3_PKGNAMESUFFIX=	3-sqlite3
 
 LOGDIR?=	/var/log
 KRB5_CONFIG?=	/usr/bin/krb5-config --libs
diff --git a/net/freeradius3/distinfo b/net/freeradius3/distinfo
index cb1f17ef334c..9135502b464a 100644
--- a/net/freeradius3/distinfo
+++ b/net/freeradius3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665076845
-SHA256 (freeradius-server-3.2.1.tar.bz2) = 32cd4eae3c24af2893aa5feff643bc9ac0755341b2b7e8dd622c6e9a23e9f256
-SIZE (freeradius-server-3.2.1.tar.bz2) = 3399164
+TIMESTAMP = 1676582221
+SHA256 (freeradius-server-3.2.2.tar.bz2) = 8b31cb10b7b5ecfb03e22a9756e49484f98410e697798f3fd0ce1b3a135ba1fe
+SIZE (freeradius-server-3.2.2.tar.bz2) = 3418998
diff --git a/net/freeradius3/files/patch-src_main_tls.c b/net/freeradius3/files/patch-src_main_tls.c
deleted file mode 100644
index f4e200d29657..000000000000
--- a/net/freeradius3/files/patch-src_main_tls.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/main/tls.c.orig	2022-10-03 21:51:59 UTC
-+++ src/main/tls.c
-@@ -3015,7 +3015,14 @@ int cbtls_verify(int ok, X509_STORE_CTX *ctx)
- 	 */
- 	if (lookup > 1) {
- 		if (!my_ok) lookup = 1;
--	} else {
-+
-+	} else if (lookup == 0) {
-+		/*
-+		 *	This flag is only set for outbound
-+		 *	connections.  And then allows us to remap SSL
-+		 *	offset 0 (server) to our offset 1 (also
-+		 *	server).
-+		 */
- 		lookup = (SSL_get_ex_data(ssl, FR_TLS_EX_INDEX_FIX_CERT_ORDER) != NULL);
- 	}
- 
diff --git a/net/freeradius3/pkg-plist b/net/freeradius3/pkg-plist
index ca24e1c120bf..eec5e6e88fb1 100644
--- a/net/freeradius3/pkg-plist
+++ b/net/freeradius3/pkg-plist
@@ -929,6 +929,7 @@ sbin/radmin
 %%DATADIR%%/dictionary.bt
 %%DATADIR%%/dictionary.cablelabs
 %%DATADIR%%/dictionary.cabletron
+%%DATADIR%%/dictionary.calix
 %%DATADIR%%/dictionary.cambium
 %%DATADIR%%/dictionary.camiant
 %%DATADIR%%/dictionary.centec