python-crytograph: fix build issue do to openssl 1.0.1g upgrade
PATCH 1/2 python-crytograph: fix build issue do to openssl 1.0.1g upgrade
From: Armin Kuster <[email protected]>
this fixes
build/temp.linux-x86_64-2.7/_openssl.c:697:6: error: conflicting types for 'BIO_new_mem_buf'
BIO *BIO_new_mem_buf(void *, int);
^In file included from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/openssl/asn1.h:65:0, from build/temp.linux-x86_64-2.7/_openssl.c:413:
Signed-off-by Armin Kuster <[email protected]>
Signed-off-by Martin Jansa <[email protected]>
Signed-off-by Armin Kuster <[email protected]>
--- .../build_fix_openssl_1.0.1g.patch | 28 ++++++++++++++++++++++ .../python/python-cryptography_0.8.1.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch
meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch new file +28 -0
@@ -0,0 +1,28 @@ +build issue do to openssl 1.0.1g upgrade + +BIO *BIO_new_mem_buf(void *, int); + ^ +In file included from /home/jenkins/oe/world/shr-core/tmp-glibc/sysroots/qemuarm/usr/include/openssl/asn1.h:65:0, +from build/temp.linux-x86_64-2.7/_openssl.c:413: + + +Upstream-Status: Pending + +seems to be a known issue +https://github.com/pyca/cryptography/issues/2750 + +Signed-off-by: Armin Kuster <[email protected]> + +Index: cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/bio.py +=================================================================== +--- cryptography-0.8.1.orig/src/cryptography/hazmat/bindings/openssl/bio.py ++++ cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/bio.py +@@ -99,7 +99,7 @@ BIO *BIO_pop(BIO *); + BIO *BIO_next(BIO *); + BIO *BIO_find_type(BIO *, int); + BIO_METHOD *BIO_s_mem(void); +-BIO *BIO_new_mem_buf(void *, int); ++BIO *BIO_new_mem_buf(const void *, int); + BIO_METHOD *BIO_s_file(void); + BIO *BIO_new_file(const char *, const char *); + BIO *BIO_new_fp(FILE *, int);
meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb +1 -0
@@ -7,6 +7,7 @@ SRCNAME = "cryptography" SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ file://run-ptest \ + file://build_fix_openssl_1.0.1g.patch \ " S = "${WORKDIR}/${SRCNAME}-${PV}"
Signature · 1 line
2.3.5
PATCH 2/2 python-cryptography: fix compile issue with openssl 1.0.2h
From: Armin Kuster <[email protected]>
this fixes:
error: 'SSLv2_method' redeclared as different kind of symbol | SSL_METHOD* (*SSLv2_method)(void) = NULL;
Signed-off-by Armin Kuster <[email protected]>
Signed-off-by Armin Kuster <[email protected]>
--- .../Comment_lingering_SSLv2_symbol.patch | 25 ++++++++ .../Remove_SSLv2_bindings.patch | 70 ++++++++++++++++++++++ .../python/python-cryptography_0.8.1.bb | 2 + 3 files changed, 97 insertions(+) create mode 100644 meta-python/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch create mode 100644 meta-python/recipes-devtools/python/python-cryptography/Remove_SSLv2_bindings.patch
meta-python/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch new file +25 -0
@@ -0,0 +1,25 @@ +From f326e4a97cce6b9479560ce0c65ad18d54393f96 Mon Sep 17 00:00:00 2001 +From: Cory Benfield <[email protected]> +Date: Mon, 14 Dec 2015 15:37:46 +0000 +Subject: [PATCH] Comment lingering SSLv2 symbol. + +--- + src/_cffi_src/openssl/ssl.py | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/ssl.py +=================================================================== +--- cryptography-0.8.1.orig/src/cryptography/hazmat/bindings/openssl/ssl.py ++++ cryptography-0.8.1/src/cryptography/hazmat/bindings/openssl/ssl.py +@@ -372,6 +372,11 @@ const long SSL_OP_LEGACY_SERVER_CONNECT + #else + static const long Cryptography_HAS_SECURE_RENEGOTIATION = 1; + #endif ++ ++/* Cryptography now compiles out all SSLv2 bindings. This exists to allow ++ * clients that use it to check for SSLv2 support to keep functioning as ++ * expected. ++ */ + static const long Cryptography_HAS_SSL2 = 0; + + #ifdef OPENSSL_NO_SSL3_METHOD
meta-python/recipes-devtools/python/python-cryptography/Remove_SSLv2_bindings.patch new file +70 -0
70 lines not on this page · raw message
meta-python/recipes-devtools/python/python-cryptography_0.8.1.bb +2 -0
@@ -8,6 +8,8 @@ SRCNAME = "cryptography" SRC_URI = "https://pypi.python.org/packages/source/c/${SRCNAME}/${SRCNAME}-${PV}.tar.gz \ file://run-ptest \ file://build_fix_openssl_1.0.1g.patch \ + file://Remove_SSLv2_bindings.patch \ + file://Comment_lingering_SSLv2_symbol.patch \ " S = "${WORKDIR}/${SRCNAME}-${PV}"
Signature · 1 line
2.3.5