From nobody Sat Jan 14 14:20:39 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 4NvL6b4hPTz2p9vb; Sat, 14 Jan 2023 14:20:39 +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 4NvL6b4GvCz3MTy; Sat, 14 Jan 2023 14:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673706039; 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=Bw7y5iFkvWZk8nx3Ccxd3nlrArDuWuidHxL48diuUF4=; b=q6aP2vpRtwaHZqfcNINlbDq/jxyQOXbzjD+gLXJXQDpeEYXNy4Y6PvNv8ybKp2L1xnPM0N MTjYxejxbL4Pw0yO4QmHaYeQG4A5XJbTNGBqn2tIuhkPzIU14oLv7+h+OCAXYU37YtN1fF BHWETVuAuquNTui4JwR08PyJFVtJrXhoZIa7+0JNU9wYfKN3lpVi7TIAc4KZ6pD6fNjFsz qcdTwykqgS3UrLr6DlMu3jrn3nCd/sQPRIMsth5mrZRyCFP4xKRzy/PtcYOJk9KTzXH6TP 7UuEcazH4PMmXASupaY1YUvFMVhzSHkjRyint0dEMrdAG++/dIujWXRURXrj3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673706039; 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=Bw7y5iFkvWZk8nx3Ccxd3nlrArDuWuidHxL48diuUF4=; b=tEldyYokgbfK79UB4zefHLpXILaEcizAcyQGpJsC9XOFKtdi8XI/2vZmiFKaEVg9zGyGZf AMPGHeR0yT+a+fOh/WiEd23T45hMtGkMt52GUwiabRup53YNl5F8J+MJosRlz7KTevGkWa jf2KhNLJWwgFlABZyjNB3kJWLWuUknSqbmiMZ4ZcMuu11zD+TQFz5TKEvlARSpWgijMq/R 1Cjp1VVBbNWqBfKCrMXrjLOKmDmLXi84w57DLHHVwNBZwcTpzeSWQ3PoVL9WMFyQEQmWTj L3yOEmEIAOl8QEcjRqWj91gt0JL0DWKaWPbduFSHEEqJ5QSyB2Sk1vUPZuTHuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673706039; a=rsa-sha256; cv=none; b=dYpZcz+hQt8RghEC7En+kyda9hQ7D30qlCSrc9sEt8zEqOMBAcOQIi2QbaphMVjPwfGrUm DAEosKS/HMFmjyz+Hw7Hn9oN2cVDmcpQZAORdQjIEgVEiRo3BpLPwdb8jxl74iSOGgpeaV WzmGyBXtcpiKCoIIr1+PP5RiW1t2/knuK0M9ocVn214eKzeAAjXqfHpWFkAZJ5vuY89A6e X/lTX0ccS75IIu/pvVoyOxUGryVPzoXg976CNz2mIfYPU4Vn3fg0IquWpaJrUoTEBEZ3Ci MzxGNDD0XpPf7uErs3DFDVr23vA4yqtW2yzamTdbd/DsRxqW3tjL0w25ShPo7A== 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 4NvL6b3KFkzqnV; Sat, 14 Jan 2023 14:20:39 +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 30EEKds8099978; Sat, 14 Jan 2023 14:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30EEKdnU099977; Sat, 14 Jan 2023 14:20:39 GMT (envelope-from git) Date: Sat, 14 Jan 2023 14:20:39 GMT Message-Id: <202301141420.30EEKdnU099977@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: 6fe12ab2c86d - main - net/freeradius3: Fix certificate parsing 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: 6fe12ab2c86d2ac9801365840193637256d51f71 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zi: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fe12ab2c86d2ac9801365840193637256d51f71 commit 6fe12ab2c86d2ac9801365840193637256d51f71 Author: Ryan Steinmetz AuthorDate: 2023-01-14 14:17:43 +0000 Commit: Ryan Steinmetz CommitDate: 2023-01-14 14:20:02 +0000 net/freeradius3: Fix certificate parsing - Bump PORTREVISION - Attempt fix for OPNSense packaging PR: 268951 Obtained from: upstream/3d08027f30c6d9c1eaccf7d60c68c8f7d78017c3 --- net/freeradius3/Makefile | 3 ++- net/freeradius3/files/patch-src_main_tls.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 1ea59d825cc5..8c665fb6f8df 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -2,6 +2,7 @@ PORTNAME= freeradius DISTVERSION= 3.2.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_${DISTVERSION:S/./_/g}/ \ https://freeradius.org/ftp/pub/radius/%SUBDIR%/ \ @@ -314,6 +315,6 @@ post-build: @${FIND} ${WRKSRC}/build/bin -type f -exec ${STRIP_CMD} {} \; post-install: - ${MKDIR} ${STAGEDIR}/var/run/radiusd + ${MKDIR} ${STAGEDIR}/var/run/radiusd ${STAGEDIR}/var/log/radacct .include diff --git a/net/freeradius3/files/patch-src_main_tls.c b/net/freeradius3/files/patch-src_main_tls.c new file mode 100644 index 000000000000..f4e200d29657 --- /dev/null +++ b/net/freeradius3/files/patch-src_main_tls.c @@ -0,0 +1,18 @@ +--- 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); + } +