diff options
author | wiz <wiz@pkgsrc.org> | 2017-01-28 11:15:07 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-01-28 11:15:07 +0000 |
commit | bc58c4e131746a6b7b69e67e08ac6dda3cf81cb0 (patch) | |
tree | af6de32317842347527a5f566107b0dfa2a16b9b /security/py-cryptography | |
parent | 8960ff2cbd103bfd741a34325a5583f7931020c1 (diff) | |
download | pkgsrc-bc58c4e131746a6b7b69e67e08ac6dda3cf81cb0.tar.gz |
Fix test segfault by using upstream patch #3350:
https://github.com/pyca/cryptography/pull/3350
Bump PKGREVISION.
Identified by @reaperhulk in https://github.com/pyca/cryptography/issues/3372
Diffstat (limited to 'security/py-cryptography')
-rw-r--r-- | security/py-cryptography/Makefile | 3 | ||||
-rw-r--r-- | security/py-cryptography/distinfo | 3 | ||||
-rw-r--r-- | security/py-cryptography/patches/patch-src___cffi__src_openssl_callbacks.py | 25 |
3 files changed, 29 insertions, 2 deletions
diff --git a/security/py-cryptography/Makefile b/security/py-cryptography/Makefile index 1146d6e1676..53c1347bd7d 100644 --- a/security/py-cryptography/Makefile +++ b/security/py-cryptography/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.50 2017/01/28 01:20:01 wiz Exp $ +# $NetBSD: Makefile,v 1.51 2017/01/28 11:15:07 wiz Exp $ DISTNAME= cryptography-1.7.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +PKGREVISION= 1 CATEGORIES= security python MASTER_SITES= ${MASTER_SITE_PYPI:=c/cryptography/} diff --git a/security/py-cryptography/distinfo b/security/py-cryptography/distinfo index 7a9cd482fa3..025a97a0e55 100644 --- a/security/py-cryptography/distinfo +++ b/security/py-cryptography/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.38 2017/01/28 01:20:01 wiz Exp $ +$NetBSD: distinfo,v 1.39 2017/01/28 11:15:07 wiz Exp $ SHA1 (cryptography-1.7.2.tar.gz) = 2b5bc62fda71992633f83164b1a74c16a784acdf RMD160 (cryptography-1.7.2.tar.gz) = ca1bf254944ec846cfd0af124001601a3052bedf SHA512 (cryptography-1.7.2.tar.gz) = 8ddd119385064e1f8288ff318ec16f500b5c125a3811ccb306aeb2664fac495fcdd3cb5a7cbacd10156505c9526b9cdbd66860b35bbcd2f9a6bb285dd6cba8c5 Size (cryptography-1.7.2.tar.gz) = 420867 bytes +SHA1 (patch-src___cffi__src_openssl_callbacks.py) = 476517c3ed673a6dfe4f809622d8b8b034214528 diff --git a/security/py-cryptography/patches/patch-src___cffi__src_openssl_callbacks.py b/security/py-cryptography/patches/patch-src___cffi__src_openssl_callbacks.py new file mode 100644 index 00000000000..8ac910dc794 --- /dev/null +++ b/security/py-cryptography/patches/patch-src___cffi__src_openssl_callbacks.py @@ -0,0 +1,25 @@ +$NetBSD: patch-src___cffi__src_openssl_callbacks.py,v 1.1 2017/01/28 11:15:07 wiz Exp $ + +Use static callbacks with Python 3.x again #3350 +https://github.com/pyca/cryptography/pull/3350 + +--- src/_cffi_src/openssl/callbacks.py.orig 2017-01-27 15:10:32.000000000 +0000 ++++ src/_cffi_src/openssl/callbacks.py +@@ -4,8 +4,6 @@ + + from __future__ import absolute_import, division, print_function + +-import sys +- + import cffi + + INCLUDES = """ +@@ -50,7 +48,7 @@ CUSTOMIZATIONS = """ + static const long Cryptography_STATIC_CALLBACKS = 1; + """ + +-if cffi.__version_info__ < (1, 4, 0) or sys.version_info >= (3, 5): ++if cffi.__version_info__ < (1, 4, 0): + # backwards compatibility for old cffi version on PyPy + # and Python >=3.5 (https://github.com/pyca/cryptography/issues/2970) + TYPES = "static const long Cryptography_STATIC_CALLBACKS;" |