mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

security/py-nassl: Update to 5.0.0

Browse Source 
Changes:	https://github.com/nabla-c0d3/nassl/commits/release
This commit is contained in:
Po-Chuan Hsieh 2023-01-30 20:34:07 +08:00
parent 86b78e6eff
commit 177600dea5
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
security/py-nassl/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= nassl PORTNAME= nassl
PORTVERSION= 4.0.2 PORTVERSION= 5.0.0
CATEGORIES= security python CATEGORIES= security python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

6
security/py-nassl/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1656092882 TIMESTAMP = 1674589996
SHA256 (nabla-c0d3-nassl-4.0.2_GH0.tar.gz) = 440296e07ee021dc283bfe7b810f3139349e26445bc21b5e05820808e15186a2 SHA256 (nabla-c0d3-nassl-5.0.0_GH0.tar.gz) = b1529de53e1017a4b69ad656bcef762633aec54c86c9ec016879d657bf463297
SIZE (nabla-c0d3-nassl-4.0.2_GH0.tar.gz) = 212003 SIZE (nabla-c0d3-nassl-5.0.0_GH0.tar.gz) = 214351

26
security/py-nassl/files/patch-openssl
View File

@ -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 +++ nassl/_nassl/nassl_SSL.c
@@ -1034,6 +1034,7 @@ static PyObject *nassl_SSL_get_dh_info(nassl_SSL_Objec @@ -1034,6 +1034,7 @@ static PyObject *nassl_SSL_get_dh_info(nassl_SSL_Objec
return return_dict; return return_dict;
@ -16,7 +16,7 @@
#endif #endif
else 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 +++ nassl/_nassl/nassl_SSL_CTX.c
@@ -88,8 +88,10 @@ static PyObject* nassl_SSL_CTX_new(PyTypeObject *type, @@ -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 // 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); SSL_CTX_set_max_proto_version(sslCtx, 0);
break; break;
#endif #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 +++ 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 # The default client uses the modern OpenSSL
_NASSL_MODULE = _nassl _NASSL_MODULE = _nassl
@ -57,7 +57,7 @@
def write_early_data(self, data: bytes) -> int: def write_early_data(self, data: bytes) -> int:
"""Returns the number of (encrypted) bytes sent.""" """Returns the number of (encrypted) bytes sent."""
if self._is_handshake_completed: 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 +++ setup.py
@@ -2,29 +2,25 @@ import copy @@ -2,29 +2,25 @@ import copy
import sys import sys
@ -86,7 +86,7 @@
"version": __version__, "version": __version__,
- "packages": find_packages(exclude=["docs", "tests"]), - "packages": find_packages(exclude=["docs", "tests"]),
+ "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": [ "py_modules": [
"nassl.__init__", "nassl.__init__",
"nassl.ssl_client", "nassl.ssl_client",
@ -95,7 +95,7 @@
"nassl.ocsp_response", "nassl.ocsp_response",
"nassl.cert_chain_verifier", "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 ) # 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 +++ tests/SSL_CTX_test.py
@@ -2,11 +2,11 @@ import tempfile @@ -2,11 +2,11 @@ import tempfile
@ -198,7 +198,7 @@
class TestCommonSSL_CTX: class TestCommonSSL_CTX:
def test_new(self, nassl_module): def test_new(self, nassl_module):
assert nassl_module.SSL_CTX(OpenSslVersionEnum.SSLV23.value) 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 +++ tests/SSL_test.py
@@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
import pytest import pytest
@ -248,7 +248,7 @@
- test_ssl.set_connect_state() - test_ssl.set_connect_state()
- with pytest.raises(_nassl.OpenSSLError, match="ssl handshake failure"): - with pytest.raises(_nassl.OpenSSLError, match="ssl handshake failure"):
- test_ssl.write("tests") - 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 +++ tests/X509_test.py
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
import pytest import pytest
@ -262,7 +262,7 @@
class TestX509: class TestX509:
def test_from_pem(self, nassl_module): def test_from_pem(self, nassl_module):
# Given a PEM-formatted certificate # 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 +++ tests/ocsp_response_test.py
@@ -5,7 +5,6 @@ import pytest @@ -5,7 +5,6 @@ import pytest
import socket import socket
@ -281,7 +281,7 @@
class TestCommonOcspResponseOnline: class TestCommonOcspResponseOnline:
def test(self, ssl_client_cls): def test(self, ssl_client_cls):
# Given a website that support OCSP stapling # 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 +++ tests/ssl_client_test.py
@@ -4,7 +4,6 @@ from pathlib import Path @@ -4,7 +4,6 @@ from pathlib import Path
import pytest import pytest