Index: head/security/py-cryptography/Makefile
===================================================================
--- head/security/py-cryptography/Makefile	(revision 413537)
+++ head/security/py-cryptography/Makefile	(revision 413538)
@@ -1,48 +1,47 @@
 # Created by: Kubilay Kocak <koobs@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	cryptography
-PORTVERSION=	1.0.2
-PORTREVISION=	4
+PORTVERSION=	1.3.1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs@FreeBSD.org
 COMMENT=	Cryptographic recipes and primitives for Python developers
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}six>=1.4.1:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}pyasn1>=0.1.8:devel/py-pyasn1 \
 		${PYTHON_PKGNAMEPREFIX}cffi>=1.1.0:devel/py-cffi \
 		${PYTHON_PKGNAMEPREFIX}idna>=2.0:dns/py-idna
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest \
 		${PYTHON_PKGNAMEPREFIX}iso8601>0:devel/py-iso8601
 
 USES=		python
 USE_OPENSSL=	yes
 USE_PYTHON=	autoplist distutils
 
 CFLAGS+=	-I${OPENSSLINC}
 LDFLAGS+=	-L${OPENSSLLIB}
 
 .include <bsd.port.pre.mk>
 
 .if ${PYTHON_REL} < 3300
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddress>0:net/py-ipaddress
 .endif
 
 .if ${PYTHON_REL} < 3400
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}enum34>0:devel/py-enum34
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/cryptography/hazmat/bindings/*.so
 
 do-test:
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
 
 .include <bsd.port.post.mk>
Index: head/security/py-cryptography/distinfo
===================================================================
--- head/security/py-cryptography/distinfo	(revision 413537)
+++ head/security/py-cryptography/distinfo	(revision 413538)
@@ -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
Index: head/security/py-cryptography/files/patch-64c9d893
===================================================================
--- head/security/py-cryptography/files/patch-64c9d893	(revision 413537)
+++ head/security/py-cryptography/files/patch-64c9d893	(nonexistent)
@@ -1,31 +0,0 @@
-From 64c9d893c3748e962d01a935625c58610826f23c 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
---- 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);

Property changes on: head/security/py-cryptography/files/patch-64c9d893
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/security/py-cryptography/files/patch-src___cffi__src_build__openssl.py
===================================================================
--- head/security/py-cryptography/files/patch-src___cffi__src_build__openssl.py	(nonexistent)
+++ head/security/py-cryptography/files/patch-src___cffi__src_build__openssl.py	(revision 413538)
@@ -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 <paul.l.kehrer@gmail.com>
+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 <openssl/opensslv.h>
++/*
++    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 <openssl/e_os2.h>
+-#if defined(OPENSSL_SYS_WINDOWS)
++#endif
++#if defined(OPENSSL_SYS_WINDOWS) || defined(_WIN32)
+ #include <windows.h>
+ #endif
+ """

Property changes on: head/security/py-cryptography/files/patch-src___cffi__src_build__openssl.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property