Date: Sat, 30 Sep 2023 00:49:13 GMT From: Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: dd8664c0de02 - main - security/py-nassl: Update to 5.1.0 Message-ID: <202309300049.38U0nDRh008084@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd8664c0de022fd7201f22c7c97ff4cf80cc1349 commit dd8664c0de022fd7201f22c7c97ff4cf80cc1349 Author: Po-Chuan Hsieh <sunpoet@FreeBSD.org> AuthorDate: 2023-09-30 00:22:46 +0000 Commit: Po-Chuan Hsieh <sunpoet@FreeBSD.org> CommitDate: 2023-09-30 00:44:38 +0000 security/py-nassl: Update to 5.1.0 Changes: https://github.com/nabla-c0d3/nassl/commits/release --- security/py-nassl/Makefile | 2 +- security/py-nassl/distinfo | 6 +++--- security/py-nassl/files/patch-openssl | 29 +++++++++++++++++------------ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/security/py-nassl/Makefile b/security/py-nassl/Makefile index 8a6b7ad2df12..df45eb2343c6 100644 --- a/security/py-nassl/Makefile +++ b/security/py-nassl/Makefile @@ -1,5 +1,5 @@ PORTNAME= nassl -PORTVERSION= 5.0.1 +PORTVERSION= 5.1.0 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-nassl/distinfo b/security/py-nassl/distinfo index 42765f02f677..662092bb441e 100644 --- a/security/py-nassl/distinfo +++ b/security/py-nassl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679498808 -SHA256 (nabla-c0d3-nassl-5.0.1_GH0.tar.gz) = 53302410923e5c1afd54c7f48051f15459eeacbd7005b719d2a5db12ede83042 -SIZE (nabla-c0d3-nassl-5.0.1_GH0.tar.gz) = 214659 +TIMESTAMP = 1696001396 +SHA256 (nabla-c0d3-nassl-5.1.0_GH0.tar.gz) = 20f1aa7be2dea3dad4b7765f830eac807ee9a514be5b8b16aeefbcceff9a6484 +SIZE (nabla-c0d3-nassl-5.1.0_GH0.tar.gz) = 212992 diff --git a/security/py-nassl/files/patch-openssl b/security/py-nassl/files/patch-openssl index 584bd6dd83be..030fccdf40cd 100644 --- a/security/py-nassl/files/patch-openssl +++ b/security/py-nassl/files/patch-openssl @@ -1,4 +1,4 @@ ---- nassl/_nassl/nassl_SSL.c.orig 2022-11-20 14:28:29 UTC +--- nassl/_nassl/nassl_SSL.c.orig 2023-09-24 06:39:12 UTC +++ nassl/_nassl/nassl_SSL.c @@ -1034,6 +1034,7 @@ static PyObject *nassl_SSL_get_dh_info(nassl_SSL_Objec return return_dict; @@ -16,7 +16,7 @@ #endif else { ---- nassl/_nassl/nassl_SSL_CTX.c.orig 2022-11-20 14:28:29 UTC +--- nassl/_nassl/nassl_SSL_CTX.c.orig 2023-09-24 06:39:12 UTC +++ nassl/_nassl/nassl_SSL_CTX.c @@ -88,8 +88,10 @@ static PyObject* nassl_SSL_CTX_new(PyTypeObject *type, // Replicate the pre-1.1.0 OpenSSL API to avoid breaking _nassl's API @@ -29,7 +29,7 @@ SSL_CTX_set_max_proto_version(sslCtx, 0); break; #endif ---- nassl/ssl_client.py.orig 2022-11-20 14:28:29 UTC +--- nassl/ssl_client.py.orig 2023-09-24 06:39:12 UTC +++ nassl/ssl_client.py @@ -429,6 +429,25 @@ class SslClient(BaseSslClient): # The default client uses the modern OpenSSL @@ -57,7 +57,7 @@ def write_early_data(self, data: bytes) -> int: """Returns the number of (encrypted) bytes sent.""" if self._is_handshake_completed: ---- setup.py.orig 2022-11-20 14:28:29 UTC +--- setup.py.orig 2023-09-24 06:39:12 UTC +++ setup.py @@ -2,29 +2,25 @@ import copy import sys @@ -95,7 +95,7 @@ "nassl.ocsp_response", "nassl.cert_chain_verifier", ], -@@ -71,58 +67,21 @@ BASE_NASSL_EXT_SETUP = { +@@ -71,63 +67,20 @@ BASE_NASSL_EXT_SETUP = { ], } @@ -115,6 +115,11 @@ -else: - BASE_NASSL_EXT_SETUP["extra_compile_args"].append("-Wall") - +- if CURRENT_PLATFORM in SupportedPlatformEnum.all_linux_platforms(): +- # Hide internal OpenSSL symbols to avoid "symbol confusion" when Python loads the system's OpenSSL libraries +- # https://github.com/nabla-c0d3/nassl/issues/95 +- BASE_NASSL_EXT_SETUP["extra_link_args"].append("-Wl,--exclude-libs=ALL") +- - if CURRENT_PLATFORM == SupportedPlatformEnum.LINUX_64: - # Explicitly disable executable stack on Linux 64 to address issues with Ubuntu on Windows - # https://github.com/nabla-c0d3/nassl/issues/28 @@ -141,7 +146,7 @@ - } -) - - # The configure the setup for modern nassl +-# The configure the setup for modern nassl -modern_openssl_config = ModernOpenSslBuildConfig(CURRENT_PLATFORM) - MODERN_NASSL_EXT_SETUP = copy.deepcopy(BASE_NASSL_EXT_SETUP) @@ -161,7 +166,7 @@ ], } ) -@@ -131,18 +90,11 @@ MODERN_NASSL_EXT_SETUP["sources"].append( +@@ -136,18 +89,11 @@ MODERN_NASSL_EXT_SETUP["sources"].append( ) # API only available in modern nassl @@ -182,7 +187,7 @@ ) ---- tests/SSL_CTX_test.py.orig 2022-11-20 14:28:29 UTC +--- tests/SSL_CTX_test.py.orig 2023-09-24 06:39:12 UTC +++ tests/SSL_CTX_test.py @@ -2,11 +2,11 @@ import tempfile @@ -198,7 +203,7 @@ class TestCommonSSL_CTX: def test_new(self, nassl_module): assert nassl_module.SSL_CTX(OpenSslVersionEnum.SSLV23.value) ---- tests/SSL_test.py.orig 2022-11-20 14:28:29 UTC +--- tests/SSL_test.py.orig 2023-09-24 06:39:12 UTC +++ tests/SSL_test.py @@ -1,11 +1,10 @@ import pytest @@ -248,7 +253,7 @@ - test_ssl.set_connect_state() - with pytest.raises(_nassl.OpenSSLError, match="ssl handshake failure"): - test_ssl.write("tests") ---- tests/X509_test.py.orig 2022-11-20 14:28:29 UTC +--- tests/X509_test.py.orig 2023-09-24 06:39:12 UTC +++ tests/X509_test.py @@ -1,10 +1,9 @@ import pytest @@ -262,7 +267,7 @@ class TestX509: def test_from_pem(self, nassl_module): # Given a PEM-formatted certificate ---- tests/ocsp_response_test.py.orig 2022-11-20 14:28:29 UTC +--- tests/ocsp_response_test.py.orig 2023-09-24 06:39:12 UTC +++ tests/ocsp_response_test.py @@ -5,7 +5,6 @@ import pytest import socket @@ -281,7 +286,7 @@ class TestCommonOcspResponseOnline: def test(self, ssl_client_cls): # Given a website that support OCSP stapling ---- tests/ssl_client_test.py.orig 2022-11-20 14:28:29 UTC +--- tests/ssl_client_test.py.orig 2023-09-24 06:39:12 UTC +++ tests/ssl_client_test.py @@ -4,7 +4,6 @@ from pathlib import Path import pytest
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202309300049.38U0nDRh008084>