From 82476e6f80ebc6b4fb20fc8fe4326a2403d2da69 Mon Sep 17 00:00:00 2001
From: Li xin <lixin.fnst@cn.fujitsu.com>
Date: Fri, 7 Aug 2015 13:51:42 +0800
Subject: 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@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../python-pyopenssl-0.13/x509_revoked_dup.patch   | 19 ----------------
 .../python/python-pyopenssl_0.13.bb                | 25 ----------------------
 .../python/python-pyopenssl_0.15.1.bb              | 25 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 44 deletions(-)
 delete mode 100644 meta-python/recipes-devtools/python/python-pyopenssl-0.13/x509_revoked_dup.patch
 delete mode 100644 meta-python/recipes-devtools/python/python-pyopenssl_0.13.bb
 create mode 100644 meta-python/recipes-devtools/python/python-pyopenssl_0.15.1.bb

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 c386e9ccd6..0000000000
--- 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.13.bb
deleted file mode 100644
index cf9d73e636..0000000000
--- a/meta-python/recipes-devtools/python/python-pyopenssl_0.13.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Simple Python wrapper around the OpenSSL library"
-SECTION = "devel/python"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
-
-SRCNAME = "pyOpenSSL"
-
-DEPENDS = "openssl"
-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"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit distutils
-
-PACKAGES =+ "${PN}-tests"
-FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test"
-
-RDEPENDS_${PN} = "python-threading"
-RDEPENDS_${PN}-tests = "${PN}"
diff --git a/meta-python/recipes-devtools/python/python-pyopenssl_0.15.1.bb b/meta-python/recipes-devtools/python/python-pyopenssl_0.15.1.bb
new file mode 100644
index 0000000000..694da275e2
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyopenssl_0.15.1.bb
@@ -0,0 +1,25 @@
+SUMMARY = "Simple Python wrapper around the OpenSSL library"
+SECTION = "devel/python"
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+SRCNAME = "pyOpenSSL"
+
+DEPENDS = "openssl python-cryptography"
+PE = "1"
+
+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}"
+
+inherit distutils
+
+PACKAGES =+ "${PN}-tests"
+FILES_${PN}-tests = "${libdir}/${PYTHON_DIR}/site-packages/OpenSSL/test"
+
+RDEPENDS_${PN} = "python-threading"
+RDEPENDS_${PN}-tests = "${PN}"
-- 
cgit 1.2.3-korg