From owner-svn-ports-all@freebsd.org Wed Mar 2 17:17:32 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 68C78AC1A86; Wed, 2 Mar 2016 17:17:32 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2011C11AD; Wed, 2 Mar 2016 17:17:32 +0000 (UTC) (envelope-from koobs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u22HHVMT084641; Wed, 2 Mar 2016 17:17:31 GMT (envelope-from koobs@FreeBSD.org) Received: (from koobs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u22HHVNf084639; Wed, 2 Mar 2016 17:17:31 GMT (envelope-from koobs@FreeBSD.org) Message-Id: <201603021717.u22HHVNf084639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: koobs set sender to koobs@FreeBSD.org using -f From: Kubilay Kocak Date: Wed, 2 Mar 2016 17:17:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r409955 - in branches/2016Q1/security/py-cryptography: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Mar 2016 17:17:32 -0000 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 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 +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);