Index: security/py-cryptography/Makefile =================================================================== --- security/py-cryptography/Makefile (revision 505749) +++ security/py-cryptography/Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cryptography -PORTVERSION= 2.6.1 +PORTVERSION= 2.7 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Index: security/py-cryptography/distinfo =================================================================== --- security/py-cryptography/distinfo (revision 505749) +++ security/py-cryptography/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1551354433 -SHA256 (cryptography-2.6.1.tar.gz) = 26c821cbeb683facb966045e2064303029d572a87ee69ca5a1bf54bf55f93ca6 -SIZE (cryptography-2.6.1.tar.gz) = 491580 +TIMESTAMP = 1561841310 +SHA256 (cryptography-2.7.tar.gz) = e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6 +SIZE (cryptography-2.7.tar.gz) = 495877 Index: security/py-cryptography/files/patch-PR4855 =================================================================== --- security/py-cryptography/files/patch-PR4855 (revision 505749) +++ security/py-cryptography/files/patch-PR4855 (nonexistent) @@ -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; Property changes on: security/py-cryptography/files/patch-PR4855 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property