From nobody Mon Jan 30 13:10:51 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 4P57pg57Zxz3cb4T; Mon, 30 Jan 2023 13:10:51 +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 4P57pg4FQbz3nNq; Mon, 30 Jan 2023 13:10:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084251; 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=rna88vLamQwRD74hnTavA+b57hV1plSsyZqV0Q/ubwI=; b=sB3SKUt1x5ERZV9WVFLJzbWb1IIgXFdFoJSC2jLR0KCvQg/fOr9CxR5DBs1txAcPS8SX5q lCIHfQHeov9LC9wi1Jlz20Cx2s5O/CQYNdvUygEBaX8x55ek6UZBEfiM/i7i4DhlnWPAz2 ZLxm9Mv6xfR8Hgo1P8sdP69AZt2iPp8hfWM4B8en9XkR/ikmwjh91SLzwWk9lweS//gdZg 54q7OKeFmi1mnsDJJo5MsJD37EcGVNQXL6tA8JeNgHMVWSPMVp9JQoJ2eZ19vKr9GZz4ig RWj75DgJxcZvJhh9MlkkSChWkl9Gbs+OhjySEAjyVKf4XSjzAekhEJjomAUIFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675084251; 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=rna88vLamQwRD74hnTavA+b57hV1plSsyZqV0Q/ubwI=; b=OyClO1wkpqL9vycsRmp767YElOKMc/9gAiFjMUsf+HQ1dq+oH1HhrYfy64VGii+cmW7xTs QfnrzuyF52uEKZ1ey/2x5eeLmWxSYFqQQvwZhtx8r4ekqrd9dhdqy1ZRP74Pb2nOY8vD0C OL12lFluFGaHSE4+Y+MZHH7z0gT7our3HEH0PNIFfRfD9VUhv0LupVg5FVbXu9jM2W26bc oYy45TkKqj0DI+c9WXQUHYFoty70t66X6YTE3uaSBXc8oGhrRiR18Tz05xdClwDpJAtCEt RA1BGw4Fh2VwJ5UukurzoWBxAfw6UgY48tuureHkbW+3i3h1Ixj/fz2qHhErzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675084251; a=rsa-sha256; cv=none; b=jXfdqX36hERYMwQ+tAaVzgGZlzhXPDwAg2f5w1thLwi4mcM5MG2iTcf2BOweW5yeqPCdLD t+9N9l2rq9jRfyMA5bt1BAL7B2+DK+hpm5uuK00zm5VOxSTMLCy7wEimN9/RC1BajBuFM4 k8zpqgCDPNg6exADICUGykfxbulzxIen5bxe6WR+3cfZdDrMWdvEKndKUp/mvAeQZxy7O9 Gb9jbtAfuBXGMlHdyLBE1/0LOtdPzSOThIMTogTTtP82+SFl5qO5GsAr7+yyjxP2DfwiOl T8HuGmeGH5OcaxZbfs72nMrLsU2mVuLz+zhqT2n0jAwnAvke7ZhVJHHJBMeyLw== 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 4P57pg3BClz18SJ; Mon, 30 Jan 2023 13:10:51 +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 30UDApRC068077; Mon, 30 Jan 2023 13:10:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30UDApd1068076; Mon, 30 Jan 2023 13:10:51 GMT (envelope-from git) Date: Mon, 30 Jan 2023 13:10:51 GMT Message-Id: <202301301310.30UDApd1068076@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 177600dea594 - main - security/py-nassl: Update to 5.0.0 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: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 177600dea5946bc6f05ba0b87152db53996d0b05 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=177600dea5946bc6f05ba0b87152db53996d0b05 commit 177600dea5946bc6f05ba0b87152db53996d0b05 Author: Po-Chuan Hsieh AuthorDate: 2023-01-30 12:34:07 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-01-30 13:00:16 +0000 security/py-nassl: Update to 5.0.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 | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/security/py-nassl/Makefile b/security/py-nassl/Makefile index 253922235353..fd80067d2213 100644 --- a/security/py-nassl/Makefile +++ b/security/py-nassl/Makefile @@ -1,5 +1,5 @@ PORTNAME= nassl -PORTVERSION= 4.0.2 +PORTVERSION= 5.0.0 CATEGORIES= security python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/security/py-nassl/distinfo b/security/py-nassl/distinfo index 7894a28255b0..041603a59e79 100644 --- a/security/py-nassl/distinfo +++ b/security/py-nassl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656092882 -SHA256 (nabla-c0d3-nassl-4.0.2_GH0.tar.gz) = 440296e07ee021dc283bfe7b810f3139349e26445bc21b5e05820808e15186a2 -SIZE (nabla-c0d3-nassl-4.0.2_GH0.tar.gz) = 212003 +TIMESTAMP = 1674589996 +SHA256 (nabla-c0d3-nassl-5.0.0_GH0.tar.gz) = b1529de53e1017a4b69ad656bcef762633aec54c86c9ec016879d657bf463297 +SIZE (nabla-c0d3-nassl-5.0.0_GH0.tar.gz) = 214351 diff --git a/security/py-nassl/files/patch-openssl b/security/py-nassl/files/patch-openssl index d25df5b8be4e..584bd6dd83be 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-01-01 11:07:11 UTC +--- nassl/_nassl/nassl_SSL.c.orig 2022-11-20 14:28:29 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-01-01 11:07:11 UTC +--- nassl/_nassl/nassl_SSL_CTX.c.orig 2022-11-20 14:28:29 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,9 +29,9 @@ SSL_CTX_set_max_proto_version(sslCtx, 0); break; #endif ---- nassl/ssl_client.py.orig 2022-01-01 11:07:11 UTC +--- nassl/ssl_client.py.orig 2022-11-20 14:28:29 UTC +++ nassl/ssl_client.py -@@ -417,6 +417,25 @@ class SslClient(BaseSslClient): +@@ -429,6 +429,25 @@ class SslClient(BaseSslClient): # The default client uses the modern OpenSSL _NASSL_MODULE = _nassl @@ -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-01-01 11:07:11 UTC +--- setup.py.orig 2022-11-20 14:28:29 UTC +++ setup.py @@ -2,29 +2,25 @@ import copy import sys @@ -86,7 +86,7 @@ "version": __version__, - "packages": find_packages(exclude=["docs", "tests"]), + "packages": find_packages(exclude=["docs*", "tests*"]), - "package_data": {"nassl": ["py.typed"]}, + "package_data": {"nassl": ["py.typed", "_nassl.pyi", "_nassl_legacy.pyi"]}, "py_modules": [ "nassl.__init__", "nassl.ssl_client", @@ -95,7 +95,7 @@ "nassl.ocsp_response", "nassl.cert_chain_verifier", ], -@@ -70,58 +66,21 @@ BASE_NASSL_EXT_SETUP = { +@@ -71,58 +67,21 @@ BASE_NASSL_EXT_SETUP = { ], } @@ -161,7 +161,7 @@ ], } ) -@@ -130,18 +89,11 @@ MODERN_NASSL_EXT_SETUP["sources"].append( +@@ -131,18 +90,11 @@ MODERN_NASSL_EXT_SETUP["sources"].append( ) # API only available in modern nassl @@ -182,7 +182,7 @@ ) ---- tests/SSL_CTX_test.py.orig 2022-01-01 11:07:11 UTC +--- tests/SSL_CTX_test.py.orig 2022-11-20 14:28:29 UTC +++ tests/SSL_CTX_test.py @@ -2,11 +2,11 @@ import tempfile @@ -198,7 +198,7 @@ class TestCommonSSL_CTX: def test_new(self, nassl_module): assert nassl_module.SSL_CTX(OpenSslVersionEnum.SSLV23.value) ---- tests/SSL_test.py.orig 2022-01-01 11:07:11 UTC +--- tests/SSL_test.py.orig 2022-11-20 14:28:29 UTC +++ tests/SSL_test.py @@ -1,11 +1,10 @@ import pytest @@ -248,7 +248,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-01-01 11:07:11 UTC +--- tests/X509_test.py.orig 2022-11-20 14:28:29 UTC +++ tests/X509_test.py @@ -1,10 +1,9 @@ import pytest @@ -262,7 +262,7 @@ class TestX509: def test_from_pem(self, nassl_module): # Given a PEM-formatted certificate ---- tests/ocsp_response_test.py.orig 2022-01-01 11:07:11 UTC +--- tests/ocsp_response_test.py.orig 2022-11-20 14:28:29 UTC +++ tests/ocsp_response_test.py @@ -5,7 +5,6 @@ import pytest import socket @@ -281,7 +281,7 @@ class TestCommonOcspResponseOnline: def test(self, ssl_client_cls): # Given a website that support OCSP stapling ---- tests/ssl_client_test.py.orig 2022-01-01 11:07:11 UTC +--- tests/ssl_client_test.py.orig 2022-11-20 14:28:29 UTC +++ tests/ssl_client_test.py @@ -4,7 +4,6 @@ from pathlib import Path import pytest