diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2017-08-01 13:50:45 +0300 |
|---|---|---|
| committer | Alexandru Ardelean <ardeleanalex@gmail.com> | 2017-08-11 17:09:15 +0300 |
| commit | d0627930420dbad4d3d867d9065eda7b2a8c84cb (patch) | |
| tree | 0e419a87cf7f8df0bd68d074f598e35f9b317be6 /lang/python | |
| parent | fae2b225375c123d9b2c75507569daa045cde016 (diff) | |
python-cryptography: bump to version 2.0.3
The dependency has changed from needing `pyasn1`
to needing `asn1crypto`.
Oh well...
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
Diffstat (limited to 'lang/python')
| -rw-r--r-- | lang/python/python-cryptography/Makefile | 22 | ||||
| -rw-r--r-- | lang/python/python-cryptography/patches/002-remove-undefined-dtls-methods.patch | 14 |
2 files changed, 19 insertions, 17 deletions
diff --git a/lang/python/python-cryptography/Makefile b/lang/python/python-cryptography/Makefile index cbeeab484..47c7c1cfc 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:=1.9 +PKG_VERSION:=2.0.3 PKG_RELEASE:=1 PKG_SOURCE:=cryptography-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://pypi.python.org/packages/2a/0c/31bd69469e90035381f0197b48bf71032991d9f07a7e444c311b4a23a3df -PKG_HASH:=5518337022718029e367d982642f3e3523541e098ad671672a90b82474c84882 +PKG_SOURCE_URL:=https://pypi.python.org/packages/9c/1a/0fc8cffb04582f9ffca61b15b0681cf2e8588438e55f61403eb9880bd8e0 +PKG_HASH:=d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a PKG_LICENSE:=Apache-2.0 BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.APACHE LICENSE.BSD @@ -44,7 +44,7 @@ $(call Package/python-cryptography/Default) +PACKAGE_python-cryptography:python-enum34 \ +PACKAGE_python-cryptography:python-idna \ +PACKAGE_python-cryptography:python-ipaddress \ - +PACKAGE_python-cryptography:python-pyasn1 \ + +PACKAGE_python-cryptography:python-asn1crypto \ +PACKAGE_python-cryptography:python-six VARIANT:=python endef @@ -56,7 +56,7 @@ $(call Package/python-cryptography/Default) +PACKAGE_python3-cryptography:python3 \ +PACKAGE_python3-cryptography:python3-cffi \ +PACKAGE_python3-cryptography:python3-idna \ - +PACKAGE_python3-cryptography:python3-pyasn1 \ + +PACKAGE_python3-cryptography:python3-asn1crypto \ +PACKAGE_python3-cryptography:python3-six VARIANT:=python3 endef @@ -73,18 +73,6 @@ $(call Package/python-cryptography/description) (Variant for Python3) endef -define PyPackage/python-cryptography/filespec -+|$(PYTHON_PKG_DIR) --|$(PYTHON_PKG_DIR)/cryptography/hazmat/backends/commoncrypto --|$(PYTHON_PKG_DIR)/cryptography/hazmat/bindings/commoncrypto -endef - -define Py3Package/python3-cryptography/filespec -+|$(PYTHON3_PKG_DIR) --|$(PYTHON3_PKG_DIR)/cryptography/hazmat/backends/commoncrypto --|$(PYTHON3_PKG_DIR)/cryptography/hazmat/bindings/commoncrypto -endef - $(eval $(call PyPackage,python-cryptography)) $(eval $(call BuildPackage,python-cryptography)) $(eval $(call Py3Package,python3-cryptography)) 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 new file mode 100644 index 000000000..3b7aaf396 --- /dev/null +++ b/lang/python/python-cryptography/patches/002-remove-undefined-dtls-methods.patch @@ -0,0 +1,14 @@ +diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py +index 8bda4e0..aa81060 100644 +--- a/src/_cffi_src/openssl/ssl.py ++++ b/src/_cffi_src/openssl/ssl.py +@@ -595,9 +595,6 @@ static const long TLS_ST_OK = 0; + + #if defined(OPENSSL_NO_DTLS) || 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; +-const SSL_METHOD *(*DTLS_client_method)(void) = NULL; + #else + static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1; + #endif |