From owner-svn-ports-head@freebsd.org Sun Apr 17 19:19:10 2016 Return-Path: Delivered-To: svn-ports-head@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 95B71B12E72; Sun, 17 Apr 2016 19:19:10 +0000 (UTC) (envelope-from brnrd@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 5508717D6; Sun, 17 Apr 2016 19:19:10 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3HJJ9es036259; Sun, 17 Apr 2016 19:19:09 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3HJJ9xb036256; Sun, 17 Apr 2016 19:19:09 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201604171919.u3HJJ9xb036256@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sun, 17 Apr 2016 19:19:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r413538 - in head/security/py-cryptography: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Apr 2016 19:19:10 -0000 Author: brnrd Date: Sun Apr 17 19:19:09 2016 New Revision: 413538 URL: https://svnweb.freebsd.org/changeset/ports/413538 Log: security/py-cryptography: Update to 1.3.1 - Update to latest version 1.3.1 - Remove patch now included upstream - Add patch to allow build without openssl/e_os.h in base Reviewed by: koobs (mentor, python), feld (mentor) Approved by: feld (mentor) Differential Revision: D5959 Added: head/security/py-cryptography/files/patch-src___cffi__src_build__openssl.py (contents, props changed) Deleted: head/security/py-cryptography/files/patch-64c9d893 Modified: head/security/py-cryptography/Makefile head/security/py-cryptography/distinfo Modified: head/security/py-cryptography/Makefile ============================================================================== --- head/security/py-cryptography/Makefile Sun Apr 17 19:14:01 2016 (r413537) +++ head/security/py-cryptography/Makefile Sun Apr 17 19:19:09 2016 (r413538) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= cryptography -PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTVERSION= 1.3.1 CATEGORIES= security python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/security/py-cryptography/distinfo ============================================================================== --- head/security/py-cryptography/distinfo Sun Apr 17 19:14:01 2016 (r413537) +++ head/security/py-cryptography/distinfo Sun Apr 17 19:19:09 2016 (r413538) @@ -1,2 +1,2 @@ -SHA256 (cryptography-1.0.2.tar.gz) = d64cd491e91ddf642c643bea16532c2a2da2da054cca6df756edadd55a8bacca -SIZE (cryptography-1.0.2.tar.gz) = 332870 +SHA256 (cryptography-1.3.1.tar.gz) = b4b36175e0f95ddc88435c26dbe3397edce48e2ff5fe41d504cdb3beddcd53e2 +SIZE (cryptography-1.3.1.tar.gz) = 383852 Added: head/security/py-cryptography/files/patch-src___cffi__src_build__openssl.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-cryptography/files/patch-src___cffi__src_build__openssl.py Sun Apr 17 19:19:09 2016 (r413538) @@ -0,0 +1,32 @@ +Use upstream post-1.3.1 patch for LibreSSL + +From 1e88d741f6e15d9170466a08dfe85f28b12c7623 Mon Sep 17 00:00:00 2001 +From: Paul Kehrer +Date: Mon, 28 Mar 2016 22:00:00 -0400 +Subject: [PATCH] fix libressl breakage reported in #2858 + +--- + src/_cffi_src/build_openssl.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/src/_cffi_src/build_openssl.py b/src/_cffi_src/build_openssl.py +index 2ff28d7..3f92529 100644 +--- src/_cffi_src/build_openssl.py.orig ++++ src/_cffi_src/build_openssl.py +@@ -38,8 +38,15 @@ def _osx_libraries(build_static): + + + _PRE_INCLUDE = """ ++#include ++/* ++ LibreSSL removed e_os2.h from the public headers so we'll only include it ++ if we're using vanilla OpenSSL. ++*/ ++#if !defined(LIBRESSL_VERSION_NUMBER) + #include +-#if defined(OPENSSL_SYS_WINDOWS) ++#endif ++#if defined(OPENSSL_SYS_WINDOWS) || defined(_WIN32) + #include + #endif + """