From nobody Mon Mar 13 13:05:38 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PZxjG61twz3xh5q; Mon, 13 Mar 2023 13:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PZxjG5XgQz3qdX; Mon, 13 Mar 2023 13:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678712738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQf15bJMyAFJi/64YjUJar2vDr7Pwlakawlf8DOwBSU=; b=Vc7QmbiMKyDikn/NwgfIZDz+7Y9MzmASExtS5BxgFpcG2hykP/MX0xzcXHMPjo1uJFpyu6 0J06UYYzwqf6oi5CO2111uQilQeR5bl88j8o6SOCwwy18kbma0BYqOmSBa5Xrfpd5kQ6hM DTsdKvkBdwjMiSVB4Lk2xKk83TEcIhtDeSmdQzciArmMVDxiQPbp7l9mFyO3aZ8dX7F2FD frBH/MNoH5W4b4O017PEPx8EUc3ZjA9Nx23Qf8dHQLRc/zuCouVeQ3Z3suOx5pPh7moSFl h7G3SmpNpBp7qAZYj8rqP7YLRsm1qkS/lX//PIWmH02kt8F50Shn7lHIpWfhvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678712738; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQf15bJMyAFJi/64YjUJar2vDr7Pwlakawlf8DOwBSU=; b=nOowtDulljknMqZhbQ3EHSYlWlP5Qg7sSIsZ2Mp8YuglHoRUinsaHPrI62dG7ayLGcKLE6 Va/Ly/24ogzepwZa+NjRVXmn0/MB7nySyFtoOLxcNRHHCI+QaRjhY3prj69kjyYiWYAbcH FLi2RBGzDqB9Jf2AR1/oTTctfAld4SrcKtLSxHhbYMOvnSvaIR3jr96ckFqhtZE41cEdGG 6C41ytmlKMXgUVsw4PXTVwROGXrXJBtlMYR+lQT8zLYhh8GzFrGDEPMx2gZrqwr1GvmB0B 2E6V5835dPQGM9rSTTj8W802pIDX7ojgiWwWH8Qg7pm2qMhTzNhRVCL7ljSK+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678712738; a=rsa-sha256; cv=none; b=Iu9l5A4LgztCCW4QmrmmA+pXoVSD28kvRVqlnS0fV8mVvdmeMsBJc2au0P2ZfBZQghIrrS k/88UqsIwFHwsKEUUiBBW2pWEBuRcNklgiy1cSDz2DgDjDcUtwKx1cIiJapQkV3J3NNpGm 5ZfyjlPSwaegLicOBuGHlvUdyAHCyDYYvfmcIKLpU201MZbwENH4oTc8xJOzSx9OVr62fz UiuygdvPNZDssVohD4NF27xfqbI8MXgDSczw6glu7rwE1Vbbj7nGAVtFdn5f+rEl1TcsHO Kj5DmzGs86A3KYJHQ20LONaGCNPH8piwvQyidZXaM96p+N5f9Tj2yU1SFfFEcw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PZxjG4bc2ztrL; Mon, 13 Mar 2023 13:05:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32DD5cQj061779; Mon, 13 Mar 2023 13:05:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32DD5cIh061778; Mon, 13 Mar 2023 13:05:38 GMT (envelope-from git) Date: Mon, 13 Mar 2023 13:05:38 GMT Message-Id: <202303131305.32DD5cIh061778@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ryan Steinmetz Subject: git: 92115109ec7f - main - net/freeradius3: Update to 3.2.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 92115109ec7f3174d4809a0873a997abb5a77534 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=92115109ec7f3174d4809a0873a997abb5a77534 commit 92115109ec7f3174d4809a0873a997abb5a77534 Author: Ryan Steinmetz AuthorDate: 2023-03-13 13:02:03 +0000 Commit: Ryan Steinmetz 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