From 6a0641398d4b161253afe9bfd744ce0fd5950bc6 Mon Sep 17 00:00:00 2001
From: Andreas Oberritter <obi@opendreambox.org>
Date: Fri, 27 Mar 2015 23:21:02 +0100
Subject: python-pyopenssl: Downgrade to 0.13

Version 0.14 depends python-cryptography, which is
currently unavailable in meta-openembedded.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
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.14.bb                | 24 ---------------------
 3 files changed, 44 insertions(+), 24 deletions(-)
 create mode 100644 meta-python/recipes-devtools/python/python-pyopenssl-0.13/x509_revoked_dup.patch
 create mode 100644 meta-python/recipes-devtools/python/python-pyopenssl_0.13.bb
 delete mode 100644 meta-python/recipes-devtools/python/python-pyopenssl_0.14.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
new file mode 100644
index 0000000000..c386e9ccd6
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyopenssl-0.13/x509_revoked_dup.patch
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000000..cf9d73e636
--- /dev/null
+++ b/meta-python/recipes-devtools/python/python-pyopenssl_0.13.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"
+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.14.bb b/meta-python/recipes-devtools/python/python-pyopenssl_0.14.bb
deleted file mode 100644
index 1f609e36f5..0000000000
--- a/meta-python/recipes-devtools/python/python-pyopenssl_0.14.bb
+++ /dev/null
@@ -1,24 +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"
-
-SRC_URI = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${PV}.tar.gz"
-
-SRC_URI[md5sum] = "8579ff3a1d858858acfba5f046a4ddf7"
-SRC_URI[sha256sum] = "a99db8e59c120138ad8a72eecedcc24b4510d2eed3ce48213b7e32f22cc4ee6e"
-
-S = "${WORKDIR}/${SRCNAME}-${PV}"
-
-inherit setuptools
-
-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