Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python-cryptography: bump to version 2.0.3

Browse source 
The dependency has changed from needing `pyasn1`
to needing `asn1crypto`.
Oh well...

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2017-08-01 13:50:45 +03:00
parent fae2b22537
commit d062793042
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lang/python/python-cryptography/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=python-cryptography PKG_NAME:=python-cryptography
PKG_VERSION:=1.9 PKG_VERSION:=2.0.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=cryptography-$(PKG_VERSION).tar.gz PKG_SOURCE:=cryptography-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://pypi.python.org/packages/2a/0c/31bd69469e90035381f0197b48bf71032991d9f07a7e444c311b4a23a3df PKG_SOURCE_URL:=https://pypi.python.org/packages/9c/1a/0fc8cffb04582f9ffca61b15b0681cf2e8588438e55f61403eb9880bd8e0
PKG_HASH:=5518337022718029e367d982642f3e3523541e098ad671672a90b82474c84882 PKG_HASH:=d04bb2425086c3fe86f7bc48915290b13e798497839fbb18ab7f6dffcf98cc3a
PKG_LICENSE:=Apache-2.0 BSD-3-Clause PKG_LICENSE:=Apache-2.0 BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE.APACHE LICENSE.BSD 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-enum34 \
+PACKAGE_python-cryptography:python-idna \ +PACKAGE_python-cryptography:python-idna \
+PACKAGE_python-cryptography:python-ipaddress \ +PACKAGE_python-cryptography:python-ipaddress \
+PACKAGE_python-cryptography:python-pyasn1 \ +PACKAGE_python-cryptography:python-asn1crypto \
+PACKAGE_python-cryptography:python-six +PACKAGE_python-cryptography:python-six
VARIANT:=python VARIANT:=python
endef endef
@ -56,7 +56,7 @@ $(call Package/python-cryptography/Default)
+PACKAGE_python3-cryptography:python3 \ +PACKAGE_python3-cryptography:python3 \
+PACKAGE_python3-cryptography:python3-cffi \ +PACKAGE_python3-cryptography:python3-cffi \
+PACKAGE_python3-cryptography:python3-idna \ +PACKAGE_python3-cryptography:python3-idna \
+PACKAGE_python3-cryptography:python3-pyasn1 \ +PACKAGE_python3-cryptography:python3-asn1crypto \
+PACKAGE_python3-cryptography:python3-six +PACKAGE_python3-cryptography:python3-six
VARIANT:=python3 VARIANT:=python3
endef endef
@ -73,18 +73,6 @@ $(call Package/python-cryptography/description)
(Variant for Python3) (Variant for Python3)
endef 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 PyPackage,python-cryptography))
$(eval $(call BuildPackage,python-cryptography)) $(eval $(call BuildPackage,python-cryptography))
$(eval $(call Py3Package,python3-cryptography)) $(eval $(call Py3Package,python3-cryptography))

14
lang/python/python-cryptography/patches/002-remove-undefined-dtls-methods.patch Normal file
View file

@ -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