From nobody Mon Jun 24 17:57:10 2024 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 4W7FzB6jSsz5PMPS; Mon, 24 Jun 2024 17:57:10 +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 4W7FzB3p2tz4Zkc; Mon, 24 Jun 2024 17:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719251830; 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=P0rLDUl3nBVM0y4jU2z1dKrSyg/+Goklmk77dJ3RkZ4=; b=rgrEakSo5yhg5lrfb9JoADx3rLqEvPnGnZQlSRJ3IKFkROV+XBnPriafYs9MgBKlXzfqtN P26bAd5PTlx/DxMO4dPyIzmmi4ouP28/vKcl88tWPvGuEHd2WdTj9fr1FVNexkkbyBttIA xFAQkOTSuoI5hUEiKVnwdQ1uavw2gO959ksGdDYmDy7lvBHckBAi4ZCTQ0SktOGADezTsF +qUSnD8FAj/6eZPoui+JJr2cBk2oTWVqDCgp1egMfEgfhtttrm9fhemik97Wxwju/VW1B4 +UfOFll4cSuTC1xTpXzeRLk7EXBPZz6GG9xMmnFVjr+DASmO7StKOHh9e01TMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719251830; a=rsa-sha256; cv=none; b=fDcAE7e0XCXXOc19zULlH3Hu4SZUDTrxAj1kMmjdBXi3o3eotdThkaNseQ5cddhvTALFPo xCbCFEA+zdyec42u4fsFeKbZxavx6CpvEztDx5Svnk+pVL4bmyLB3h1pWspBzn25eu9Xt+ vPqo9RaD/BNYrd7oUU6J6/BSavLv1SJ9QEtkyVZ3TFMPtO3F5FYPlbKhxAJUVquvT7RGT7 eh/0Qg1V2oqVR3Isis1CNbHJRmgxP01N82PoFciho/4Bam4HPf1AuaazuxM/98svbCXi5S nEXqYjR/PiNYdI8ySgCX8TjrHIPI5H6zZQsqP/dj3JeB3z17UNiJHud1iUzauQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719251830; 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=P0rLDUl3nBVM0y4jU2z1dKrSyg/+Goklmk77dJ3RkZ4=; b=S1LAzi1HM76J+7ZSXcqj76tE7z+qepwlxVbl3zbQFLCcaFNE2GB6pvH+TNXHbGva+Ensya tkpTWCJNUWTtSf+SPao6go/BCBBCynnxhBN5tbJr0pFdA9afN2j6K2cAUslkWikVL8X+fJ p2afCKeX48y0iLS6JeLBlcb/T91dbnJGDR0R7f5kBVhQ6eNBuJtenDPBpOBkgixbpneotJ mWRuRV+zCYeaCg4/CJ6wocEkN3k+D1ST39TP0bU8L71J7TDYmQKwOS0NGmEhUP+2MkdtIv e0WnFK51q9roUCCP7DaVOWBcMbLIvSWbxJUCAgrbLnGW/PZpiP2Y+7vRYrFbyQ== 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 4W7FzB3LBSzSK1; Mon, 24 Jun 2024 17:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45OHvAjx010527; Mon, 24 Jun 2024 17:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45OHvAH6010524; Mon, 24 Jun 2024 17:57:10 GMT (envelope-from git) Date: Mon, 24 Jun 2024 17:57:10 GMT Message-Id: <202406241757.45OHvAH6010524@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 3f76bb7c6fbf - main - lang/python311: refresh LibreSSL patches 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f76bb7c6fbff9496a1bfeea991635a6f71ef1ac Auto-Submitted: auto-generated The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f76bb7c6fbff9496a1bfeea991635a6f71ef1ac commit 3f76bb7c6fbff9496a1bfeea991635a6f71ef1ac Author: Charlie Li AuthorDate: 2024-06-24 17:50:17 +0000 Commit: Charlie Li CommitDate: 2024-06-24 17:56:55 +0000 lang/python311: refresh LibreSSL patches LibreSSL 3.9 introduced X509_STORE_get1_objects(3) so modify the preprocessor guard to account. Prior to LibreSSL < 3.9 becoming EOL, an additional conditional was needed to copy LibreSSL 3.9's X509_STORE_get1_objects(3) as the included implementation for OpenSSL < 3.3 clashed with LibreSSL. Event: ARRL/RAC Field Day 2024 PR: 279390 --- lang/python311/files/libressl/patch-Modules___hashopenssl.c | 4 ++-- lang/python311/files/libressl/patch-Modules___ssl.c | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lang/python311/files/libressl/patch-Modules___hashopenssl.c b/lang/python311/files/libressl/patch-Modules___hashopenssl.c index 299694b4c1f3..d3211349ffe2 100644 --- a/lang/python311/files/libressl/patch-Modules___hashopenssl.c +++ b/lang/python311/files/libressl/patch-Modules___hashopenssl.c @@ -1,4 +1,4 @@ ---- Modules/_hashopenssl.c.orig 2023-02-07 13:37:51 UTC +--- Modules/_hashopenssl.c.orig 2024-04-02 08:25:04 UTC +++ Modules/_hashopenssl.c @@ -45,10 +45,21 @@ @@ -50,7 +50,7 @@ PY_HASH_ENTRY(NULL, NULL, NULL, 0), }; -@@ -873,9 +892,12 @@ py_evp_fromname(PyObject *module, const char *digestna +@@ -874,9 +893,12 @@ py_evp_fromname(PyObject *module, const char *digestna goto exit; } diff --git a/lang/python311/files/libressl/patch-Modules___ssl.c b/lang/python311/files/libressl/patch-Modules___ssl.c new file mode 100644 index 000000000000..7f6034a637d4 --- /dev/null +++ b/lang/python311/files/libressl/patch-Modules___ssl.c @@ -0,0 +1,11 @@ +--- Modules/_ssl.c.orig 2024-04-02 08:25:04 UTC ++++ Modules/_ssl.c +@@ -4541,7 +4541,7 @@ set_sni_callback(PySSLContext *self, PyObject *arg, vo + return 0; + } + +-#if OPENSSL_VERSION_NUMBER < 0x30300000L ++#if OPENSSL_VERSION_NUMBER < 0x30300000L && !defined(LIBRESSL_VERSION_NUMBER) + static X509_OBJECT *x509_object_dup(const X509_OBJECT *obj) + { + int ok;