From c2fe5fae4262795dcaa0a54db18e3825992a2b54 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Tue, 12 Feb 2019 11:48:48 +0200 Subject: [PATCH] python-cryptography: bump to version 2.5 Signed-off-by: Alexandru Ardelean --- lang/python/python-cryptography/Makefile | 4 ++-- .../002-remove-undefined-dtls-methods.patch | 23 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 lang/python/python-cryptography/patches/002-remove-undefined-dtls-methods.patch diff --git a/lang/python/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile index 9c9e5405a..692d1f63e 100644 --- a/lang/python/python-cryptography/Makefile +++ b/lang/python/python-cryptography/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python-cryptography -PKG_VERSION:=2.4.2 +PKG_VERSION:=2.5 PKG_RELEASE:=1 PKG_SOURCE:=cryptography-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= https://files.pythonhosted.org/packages/source/c/cryptography -PKG_HASH:=05a6052c6a9f17ff78ba78f8e6eb1d777d25db3b763343a1ae89a7a8670386dd +PKG_HASH:=4946b67235b9d2ea7d31307be9d5ad5959d6c4a8f98f900157b47abddf698401 PKG_LICENSE:=Apache-2.0 BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.APACHE LICENSE.BSD diff --git a/lang/python/python-cryptography/patches/002-remove-undefined-dtls-methods.patch b/lang/python/python-cryptography/patches/002-remove-undefined-dtls-methods.patch deleted file mode 100644 index dfceff5c8..000000000 --- a/lang/python/python-cryptography/patches/002-remove-undefined-dtls-methods.patch +++ /dev/null @@ -1,23 +0,0 @@ -From e7a6229b332969d621aaf25f3fc5cdd99e3c9072 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Sun, 18 Nov 2018 18:04:01 -0800 -Subject: [PATCH] Adjust DTLS check (#4593) - -OpenSSL defines these even with OPENSSL_NO_DTLS. ---- - src/_cffi_src/openssl/ssl.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py -index c921dbee..f0b8939c 100644 ---- a/src/_cffi_src/openssl/ssl.py -+++ b/src/_cffi_src/openssl/ssl.py -@@ -709,7 +709,7 @@ static const long TLS_ST_BEFORE = 0; - static const long TLS_ST_OK = 0; - #endif - --#if defined(OPENSSL_NO_DTLS) || CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 - static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0; - const SSL_METHOD *(*DTLS_method)(void) = NULL; - const SSL_METHOD *(*DTLS_server_method)(void) = NULL;