diff options
author | Dan McGregor <dan.mcgregor@usask.ca> | 2016-03-04 08:14:32 -0600 |
---|---|---|
committer | Dan McGregor <dan.mcgregor@usask.ca> | 2016-07-06 12:57:45 -0600 |
commit | 5ab2a7f670f8ddf23563029ade68af877404c3fb (patch) | |
tree | 3f324f6a6be631597d399c8fe1a9b1977e27db82 | |
parent | 9b0c19b94765108e9a966a129b4e6d6b6ab45d8c (diff) | |
download | meta-openembedded-contrib-5ab2a7f670f8ddf23563029ade68af877404c3fb.tar.gz |
python-cryptography, python-cryptography-vectors: uprev
This is version v1.1.2, a bugfix on top of v1.1. Also fixes
the build with version 1.0.2g of OpenSSL.
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
-rw-r--r-- | meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.2.bb (renamed from meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb) | 4 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python-cryptography/0001-move-BIO_new_mem_buf-to-macros-to-handle-1.0.2g-sign.patch | 36 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python-cryptography_1.1.2.bb (renamed from meta-python/recipes-devtools/python/python-cryptography_1.1.bb) | 4 |
3 files changed, 40 insertions, 4 deletions
diff --git a/meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb b/meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.2.bb index 2150e50783..aa461d7d09 100644 --- a/meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.bb +++ b/meta-python/recipes-devtools/python/python-cryptography-vectors_1.1.2.bb @@ -8,7 +8,7 @@ SRCNAME = "cryptography_vectors" SRC_URI = "https://pypi.python.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] = "3db975361a72134297932896752ae72c" +SRC_URI[sha256sum] = "a928dff1af28551ae89376d6789a6754af658f89613e7f9e0e491d643f4e1222" inherit setuptools diff --git a/meta-python/recipes-devtools/python/python-cryptography/0001-move-BIO_new_mem_buf-to-macros-to-handle-1.0.2g-sign.patch b/meta-python/recipes-devtools/python/python-cryptography/0001-move-BIO_new_mem_buf-to-macros-to-handle-1.0.2g-sign.patch new file mode 100644 index 0000000000..4e54058ce2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-cryptography/0001-move-BIO_new_mem_buf-to-macros-to-handle-1.0.2g-sign.patch @@ -0,0 +1,36 @@ +Upstream-Status: backport + +From 1778d82eee43cf99e5a0fd50ec9c5ba0b0baf97a Mon Sep 17 00:00:00 2001 +From: Paul Kehrer <paul.l.kehrer@gmail.com> +Date: Tue, 1 Mar 2016 14:22:32 -0600 +Subject: [PATCH] move BIO_new_mem_buf to macros to handle 1.0.2g signature + change + +--- + src/_cffi_src/openssl/bio.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/_cffi_src/openssl/bio.py b/src/_cffi_src/openssl/bio.py +index ac86683..6439e63 100644 +--- a/src/_cffi_src/openssl/bio.py ++++ b/src/_cffi_src/openssl/bio.py +@@ -99,7 +99,6 @@ 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_METHOD *BIO_s_file(void); + BIO *BIO_new_file(const char *, const char *); + BIO *BIO_new_fp(FILE *, int); +@@ -127,6 +126,8 @@ BIO_METHOD *BIO_f_buffer(void); + """ + + MACROS = """ ++/* BIO_new_mem_buf became const void * in 1.0.2g */ ++BIO *BIO_new_mem_buf(void *, int); + long BIO_set_fd(BIO *, long, int); + long BIO_get_fd(BIO *, char *); + long BIO_set_mem_eof_return(BIO *, int); +-- +2.8.0.rc0 + diff --git a/meta-python/recipes-devtools/python/python-cryptography_1.1.bb b/meta-python/recipes-devtools/python/python-cryptography_1.1.2.bb index 665a4cb123..75af124285 100644 --- a/meta-python/recipes-devtools/python/python-cryptography_1.1.bb +++ b/meta-python/recipes-devtools/python/python-cryptography_1.1.2.bb @@ -9,8 +9,8 @@ SRC_URI = "file://run-ptest \ file://Remove_SSLv2_bindings.patch \ file://Comment_lingering_SSLv2_symbol.patch" -SRC_URI[md5sum] = "dd06da41535184f48f2c8e8b74dd570f" -SRC_URI[sha256sum] = "059bc6428b1d0e2317f505698602642f1d8dda5b120ec573a59a430d8cb7a32d" +SRC_URI[md5sum] = "15eeba9e31f852bac21155baa3dfbc61" +SRC_URI[sha256sum] = "7f51459f84d670444275e615839f4542c93547a12e938a0a4906dafe5f7de153" inherit pypi setuptools |