[oe-commits] Li xin : python-pyopenssl: upgrade 0.13 -> 0.15.1

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 82476e6f80ebc6b4fb20fc8fe4326a2403d2da69
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=82476e6f80ebc6b4fb20fc8fe4326a2403d2da69

Author: Li xin <lixin.fnst at cn.fujitsu.com>
Date:   Fri Aug  7 13:51:42 2015 +0800

python-pyopenssl: upgrade 0.13 -> 0.15.1

* Dropped x509_revoked_dup.patch,since the original file crl.c does not exist anymore.
* Add DEPENDS python-cryptography to aviod build errors:
  | error: Could not find suitable distribution for Requirement.parse('six>=1.5.2')
  | ERROR: python setup.py install execution failed.

Signed-off-by: Li Xin <lixin.fnst at cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../python-pyopenssl-0.13/x509_revoked_dup.patch      | 19 -------------------
 ...n-pyopenssl_0.13.bb => python-pyopenssl_0.15.1.bb} | 10 +++++-----
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-pyopenssl-0.13/x509_revoked_dup.patch b/meta-python/recipes-devtools/python/python-pyopenssl-0.13/x509_revoked_dup.patch
deleted file mode 100644
index c386e9c..0000000
--- a/meta-python/recipes-devtools/python/python-pyopenssl-0.13/x509_revoked_dup.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Naur pyOpenSSL-0.13.orig/OpenSSL/crypto/crl.c pyOpenSSL-0.13/OpenSSL/crypto/crl.c
---- pyOpenSSL-0.13.orig/OpenSSL/crypto/crl.c	2011-09-02 17:46:13.000000000 +0200
-+++ pyOpenSSL-0.13/OpenSSL/crypto/crl.c	2015-03-26 20:53:08.984999223 +0100
-@@ -3,6 +3,7 @@
- #include "crypto.h"
- 
- 
-+#if 0
- static X509_REVOKED * X509_REVOKED_dup(X509_REVOKED *orig) {
-     X509_REVOKED *dupe = NULL;
- 
-@@ -32,6 +33,7 @@
-     dupe->sequence = orig->sequence;
-     return dupe;
- }
-+#endif
- 
- static char crypto_CRL_get_revoked_doc[] = "\n\
- Return revoked portion of the CRL structure (by value\n\
diff --git a/meta-python/recipes-devtools/python/python-pyopenssl_0.13.bb b/meta-python/recipes-devtools/python/python-pyopenssl_0.15.1.bb
similarity index 68%
rename from meta-python/recipes-devtools/python/python-pyopenssl_0.13.bb
rename to meta-python/recipes-devtools/python/python-pyopenssl_0.15.1.bb
index cf9d73e..694da27 100644
--- a/meta-python/recipes-devtools/python/python-pyopenssl_0.13.bb
+++ b/meta-python/recipes-devtools/python/python-pyopenssl_0.15.1.bb
@@ -6,13 +6,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
 
 SRCNAME = "pyOpenSSL"
 
-DEPENDS = "openssl"
+DEPENDS = "openssl python-cryptography"
 PE = "1"
 
-SRC_URI = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${PV}.tar.gz \
-           file://x509_revoked_dup.patch"
-SRC_URI[md5sum] = "767bca18a71178ca353dff9e10941929"
-SRC_URI[sha256sum] = "21e12b03abaa0e04ecc8cd9c251598f71bae11c9f385304234e4ea5618c6163b"
+SRC_URI = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "f447644afcbd5f0a1f47350fec63a4c6"
+SRC_URI[sha256sum] = "f0a26070d6db0881de8bcc7846934b7c3c930d8f9c79d45883ee48984bc0d672"
 
 S = "${WORKDIR}/${SRCNAME}-${PV}"