git: 3f76bb7c6fbf - main - lang/python311: refresh LibreSSL patches

From: Charlie Li <vishwin_at_FreeBSD.org>
Date: Mon, 24 Jun 2024 17:57:10 UTC
The branch main has been updated by vishwin:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3f76bb7c6fbff9496a1bfeea991635a6f71ef1ac

commit 3f76bb7c6fbff9496a1bfeea991635a6f71ef1ac
Author:     Charlie Li <vishwin@FreeBSD.org>
AuthorDate: 2024-06-24 17:50:17 +0000
Commit:     Charlie Li <vishwin@FreeBSD.org>
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;