svn commit: r409955 - in branches/2016Q1/security/py-cryptography: . files

[Kubilay Kocak]

Author: koobs
Date: Wed Mar  2 17:17:30 2016
New Revision: 409955
URL: https://svnweb.freebsd.org/changeset/ports/409955

Log:
  MFH: r409954: security/py-cryptography: Fix build with OpenSSL 1.0.2g
  
  Backport upstream commit [1] fixing build failures after the OpenSSL
  1.0.2g update
  
  [1] https://github.com/pyca/cryptography/commit/df779dfec9ce87b79e48448aea3c597a4716b29e
  
  PR:		207624
  Reported by:	matthew, Pierre Guinoiseau <pierre guinoiseau eu>
  
  Approved by:	ports-secteam (blanket)

Added:
  branches/2016Q1/security/py-cryptography/files/patch-64c9d893
     - copied unchanged from r409954, head/security/py-cryptography/files/patch-64c9d893
Modified:
  branches/2016Q1/security/py-cryptography/Makefile
Directory Properties:
  branches/2016Q1/   (props changed)

Modified: branches/2016Q1/security/py-cryptography/Makefile
==============================================================================
--- branches/2016Q1/security/py-cryptography/Makefile	Wed Mar  2 17:14:23 2016	(r409954)
+++ branches/2016Q1/security/py-cryptography/Makefile	Wed Mar  2 17:17:30 2016	(r409955)
@@ -3,7 +3,7 @@
 
 PORTNAME=	cryptography
 PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

Copied: branches/2016Q1/security/py-cryptography/files/patch-64c9d893 (from r409954, head/security/py-cryptography/files/patch-64c9d893)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q1/security/py-cryptography/files/patch-64c9d893	Wed Mar  2 17:17:30 2016	(r409955, copy of r409954, head/security/py-cryptography/files/patch-64c9d893)
@@ -0,0 +1,31 @@
+From 64c9d893c3748e962d01a935625c58610826f23c Mon Sep 17 00:00:00 2001
+From: Paul Kehrer <paul.l.kehrer at 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
+--- src/_cffi_src/openssl/bio.py
++++ src/_cffi_src/openssl/bio.py
+@@ -99,7 +99,6 @@
+ 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 @@
+ """
+ 
+ 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);