lede-packages-rs

commit de9aa513a529feee4377eda22d47c996c6f89c3a
parent 81a63c378d0774e0697c526037e74c28ff2c3e71
Author: Jeffery To <jeffery.to@gmail.com>
Date:   Thu, 22 Sep 2016 20:31:20 +0800

python-cryptography: update to 1.5

The cmac patch was upstreamed (pyca/cryptography#3062).

Signed-off-by: Jeffery To <jeffery.to@gmail.com>

Diffstat:
M
lang/python-cryptography/Makefile
 | 
6
+++---
D
lang/python-cryptography/patches/001-cmac-check.patch
 | 
22
----------------------

2 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/lang/python-cryptography/Makefile b/lang/python-cryptography/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cryptography
-PKG_VERSION:=1.4
+PKG_VERSION:=1.5
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://pypi.python.org/packages/a9/5b/a383b3a778609fe8177bd51307b5ebeee369b353550675353f46cb99c6f0
-PKG_MD5SUM:=a9763e3831cc7cdb402c028fac1ceb39
+PKG_SOURCE_URL:=https://pypi.python.org/packages/6e/96/b8dab146e8be98061dae07e127f80cffa3061ab0e8da0d3d42f3308c6e91
+PKG_MD5SUM:=d85a91af3e943c68fa5ff82a3ccdd5df
 
 PKG_BUILD_DEPENDS:=python-cffi/host
 
diff --git a/lang/python-cryptography/patches/001-cmac-check.patch b/lang/python-cryptography/patches/001-cmac-check.patch
@@ -1,22 +0,0 @@
-diff --git a/src/_cffi_src/openssl/cmac.py b/src/_cffi_src/openssl/cmac.py
-index f4a3686..bf52144 100644
---- a/src/_cffi_src/openssl/cmac.py
-+++ b/src/_cffi_src/openssl/cmac.py
-@@ -5,7 +5,7 @@
- from __future__ import absolute_import, division, print_function
- 
- INCLUDES = """
--#if OPENSSL_VERSION_NUMBER >= 0x10001000L
-+#if !defined(OPENSSL_NO_CMAC) && OPENSSL_VERSION_NUMBER >= 0x10001000L
- #include <openssl/cmac.h>
- #endif
- """
-@@ -28,7 +28,7 @@ void CMAC_CTX_free(CMAC_CTX *);
- """
- 
- CUSTOMIZATIONS = """
--#if OPENSSL_VERSION_NUMBER < 0x10001000L
-+#if defined(OPENSSL_NO_CMAC) || OPENSSL_VERSION_NUMBER < 0x10001000L
- 
- static const long Cryptography_HAS_CMAC = 0;
- typedef void CMAC_CTX;