python-cryptography: update to version 1.4 and remove patches now available with the latest release
PATCH 1/1 python-cryptography: update to version 1.4 and remove patches now available with the latest release
Signed-off-by Derek Straka <[email protected]>
---
...s_1.1.bb => python-cryptography-vectors_1.4.bb} | 6 +-
.../Comment_lingering_SSLv2_symbol.patch | 24 -------
.../Remove_SSLv2_bindings.patch | 75 ----------------------
.../build_fix_openssl_1.0.1g.patch | 28 --------
...ptography_1.1.bb => python-cryptography_1.4.bb} | 9 +--
5 files changed, 6 insertions(+), 136 deletions(-)
rename meta-python/recipes-devtools/python/{python-cryptography-vectors_1.1.bb => python-cryptography-vectors_1.4.bb} (55%)
delete mode 100644 meta-python/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch
delete mode 100644 meta-python/recipes-devtools/python/python-cryptography/Remove_SSLv2_bindings.patch
delete mode 100644 meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch
rename meta-python/recipes-devtools/python/{python-cryptography_1.1.bb => python-cryptography_1.4.bb} (80%)meta-python/recipes-devtools/python/python-cryptography-vectors_1.4.bb renamed from meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb +3 -3
@@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" DEPENDS = "python-cryptography" SRCNAME = "cryptography_vectors" -SRC_URI = "https://pypi.python.org/packages/source/c/cryptography-vectors/${SRCNAME}-${PV}.tar.gz" +SRC_URI = "https://files.pythonhosted.org/packages/source/c/cryptography-vectors/${SRCNAME}-${PV}.tar.gz" S = "${WORKDIR}/${SRCNAME}-${PV}" -SRC_URI[md5sum] = "0ad422501074929c06b7edd40df41844" -SRC_URI[sha256sum] = "a929fbb0eac391c93c5745451a4d4157a8bc18eb2e69faf3af1d825ceacbf32c" +SRC_URI[md5sum] = "b8555dfadafc4ecab4ee4650430d9cab" +SRC_URI[sha256sum] = "0728815ef0c53d67fd437aa5220450a9752d41ecb28108f5df628a092ff466ea" inherit setuptools
meta-python/recipes-devtools/python/python-cryptography/Comment_lingering_SSLv2_symbol.patch deleted +0 -24
@@ -1,24 +0,0 @@ -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-1.1/src/_cffi_src/openssl/ssl.py -=================================================================== ---- cryptography-1.1.orig/src/_cffi_src/openssl/ssl.py -+++ cryptography-1.1/src/_cffi_src/openssl/ssl.py -@@ -421,6 +421,10 @@ const long SSL_OP_LEGACY_SERVER_CONNECT - 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 deleted +0 -75
75 lines not on this page · raw message
meta-python/recipes-devtools/python/python-cryptography/build_fix_openssl_1.0.1g.patch deleted +0 -28
@@ -1,28 +0,0 @@ -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: src/_cffi_src/openssl/bio.py -=================================================================== ---- a/src/_cffi_src/openssl/bio.py -+++ b/src/_cffi_src/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_1.4.bb renamed from meta-python/recipes-devtools/python/python-cryptography_1.1.bb +3 -6
@@ -4,13 +4,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8c3617db4fb6fae01f1d253ab91511e4" DEPENDS += " python-cffi-native python-cffi python-enum34 python-six python-pyasn1" SRCNAME = "cryptography" -SRC_URI = "file://run-ptest \ - file://build_fix_openssl_1.0.1g.patch \ - file://Remove_SSLv2_bindings.patch \ - file://Comment_lingering_SSLv2_symbol.patch" +SRC_URI = "file://run-ptest" -SRC_URI[md5sum] = "dd06da41535184f48f2c8e8b74dd570f" -SRC_URI[sha256sum] = "059bc6428b1d0e2317f505698602642f1d8dda5b120ec573a59a430d8cb7a32d" +SRC_URI[md5sum] = "a9763e3831cc7cdb402c028fac1ceb39" +SRC_URI[sha256sum] = "bb149540ed90c4b2171bf694fe6991d6331bc149ae623c8ff419324f4222d128" inherit pypi setuptools
Signature · 1 line
1.9.1