FreeBSD Bugzilla – Attachment 213873 Details for
Bug 245929
security/py-cryptography: Update to 2.9.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for py-cryptography v2
0001-security-py-cryptography-Update-to-2.9.2-v2.patch (text/plain), 4.94 KB, created by
Daniel Engberg
on 2020-04-27 22:19:47 UTC
(
hide
)
Description:
Patch for py-cryptography v2
Filename:
MIME Type:
Creator:
Daniel Engberg
Created:
2020-04-27 22:19:47 UTC
Size:
4.94 KB
patch
obsolete
>From ad6ab7859ecca52d80132f593e4157e04e892a81 Mon Sep 17 00:00:00 2001 >From: Daniel Engberg <daniel.engberg.lists@pyret.net> >Date: Sun, 26 Apr 2020 14:07:57 +0200 >Subject: [PATCH] security/py-cryptography: Update to 2.9.2 > >Update py-cryptography to 2.9.2 > >Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net> >--- > security/py-cryptography/Makefile | 9 ++-- > security/py-cryptography/distinfo | 6 +-- > security/py-cryptography/files/patch-PR4855 | 49 --------------------- > 3 files changed, 7 insertions(+), 57 deletions(-) > delete mode 100644 security/py-cryptography/files/patch-PR4855 > >diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile >index ef219bb42bdd..8c85d70f1ef8 100644 >--- a/security/py-cryptography/Makefile >+++ b/security/py-cryptography/Makefile >@@ -2,7 +2,7 @@ > # $FreeBSD$ > > PORTNAME= cryptography >-PORTVERSION= 2.6.1 >+PORTVERSION= 2.9.2 > CATEGORIES= security python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >@@ -16,12 +16,11 @@ LICENSE_FILE_APACHE20= ${WRKSRC}/LICENSE.APACHE > LICENSE_FILE_BSD3CLAUSE= ${WRKSRC}/LICENSE.BSD > > BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} >-RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}asn1crypto>=0.21.0:devel/py-asn1crypto@${PY_FLAVOR} \ >- ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \ >+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cffi>=1.8:devel/py-cffi@${PY_FLAVOR} \ > ${PY_ENUM34} \ > ${PY_IPADDRESS} \ > ${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six@${PY_FLAVOR} >-TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=${PORTVERSION}:security/py-cryptography-vectors@${PY_FLAVOR} \ >+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography-vectors>=2.9.2:security/py-cryptography-vectors@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}hypothesis>=1.11.4:devel/py-hypothesis@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601@${PY_FLAVOR} \ > ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \ >@@ -47,6 +46,6 @@ post-install: > ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so > > do-test: >- @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test >+ @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${PYTHON_CMD} -m pytest > > .include <bsd.port.post.mk> >diff --git a/security/py-cryptography/distinfo b/security/py-cryptography/distinfo >index bad171cc21b8..8794c2b59fd7 100644 >--- a/security/py-cryptography/distinfo >+++ b/security/py-cryptography/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1551354433 >-SHA256 (cryptography-2.6.1.tar.gz) = 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 >-SIZE (cryptography-2.6.1.tar.gz) = 491580 >+TIMESTAMP = 1587899355 >+SHA256 (cryptography-2.9.2.tar.gz) = a0c30272fb4ddda5f5ffc1089d7405b7a71b0b0f51993cb4e5dbb4590b2fc229 >+SIZE (cryptography-2.9.2.tar.gz) = 517571 >diff --git a/security/py-cryptography/files/patch-PR4855 b/security/py-cryptography/files/patch-PR4855 >deleted file mode 100644 >index 63f02496c393..000000000000 >--- a/security/py-cryptography/files/patch-PR4855 >+++ /dev/null >@@ -1,49 +0,0 @@ >-# security/py-cryptography fails to build with libressl-2.9.1 >-# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=237487 >-# Use generic DTLS functions added in LibreSSL 2.9.1 >-# https://github.com/pyca/cryptography/pull/4855 >- >-index 4124dcb879..ac32fdffde 100644 >---- src/_cffi_src/openssl/cryptography.py.orig >-+++ src/_cffi_src/openssl/cryptography.py >-@@ -38,9 +38,12 @@ >- (LIBRESSL_VERSION_NUMBER >= 0x2070000f) >- #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \ >- (LIBRESSL_VERSION_NUMBER >= 0x2080000f) >-+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \ >-+ (LIBRESSL_VERSION_NUMBER >= 0x2090100f) >- #else >- #define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0) >- #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0) >-+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0) >- #endif >- >- #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \ >-diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py >-index 92fd1e3ec8..da21f3ce90 100644 >---- src/_cffi_src/openssl/ssl.py.orig >-+++ src/_cffi_src/openssl/ssl.py >-@@ -719,17 +719,20 @@ >- static const long TLS_ST_OK = 0; >- #endif >- >--#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 >-+/* LibreSSL 2.9.1 added only the DTLS_*_method functions */ >-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER >- static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0; >- const SSL_METHOD *(*DTLS_method)(void) = NULL; >- const SSL_METHOD *(*DTLS_server_method)(void) = NULL; >- const SSL_METHOD *(*DTLS_client_method)(void) = NULL; >-+#else >-+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1; >-+#endif >-+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 >- static const long SSL_OP_NO_DTLSv1 = 0; >- static const long SSL_OP_NO_DTLSv1_2 = 0; >- long (*DTLS_set_link_mtu)(SSL *, long) = NULL; >- long (*DTLS_get_link_min_mtu)(SSL *) = NULL; >--#else >--static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1; >- #endif >- >- static const long Cryptography_HAS_DTLS = 1; >-- >2.26.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 245929
:
213807
|
213873
|
216949