Merge branch 'cryptography' of git://github.com/lluixhi/libressl

4 files changed, 90 insertions, 1 deletions

diff --git a/dev-python/cryptography/ChangeLog b/dev-python/cryptography/ChangeLog
index d0ec78e..fbe6013 100644
--- a/dev-python/cryptography/ChangeLog
+++ b/dev-python/cryptography/ChangeLog
@@ -1,6 +1,38 @@
 # ChangeLog for dev-python/cryptography
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/ChangeLog,v 1.47 2015/05/28 18:50:42 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/ChangeLog,v 1.55 2015/08/02 09:24:45 pacho Exp $
+
+  02 Aug 2015; Pacho Ramos <pacho@gentoo.org> cryptography-0.6.1.ebuild:
+  sparc stable wrt bug #530294
+
+*cryptography-0.9.3 (16 Jul 2015)
+
+  16 Jul 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.9.3.ebuild:
+  Bump
+
+  11 Jul 2015; Tobias Klausmann <klausman@gentoo.org>
+  cryptography-0.6.1.ebuild:
+  Stable on alpha, bug 530294
+
+  10 Jul 2015; Mike Gilbert <floppym@gentoo.org> -cryptography-0.9.1.ebuild,
+  -cryptography-0.9.ebuild, cryptography-0.9.2.ebuild:
+  Fix conditional dep on dev-python/ipaddress.
+
+*cryptography-0.9.2 (08 Jul 2015)
+
+  08 Jul 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.9.2.ebuild:
+  Bump
+
+  21 Jun 2015; Markus Meier <maekke@gentoo.org> cryptography-0.9.1.ebuild:
+  add ~arm, bug #549518
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+  Add github to remote-id in metadata.xml
+
+*cryptography-0.9.1 (07 Jun 2015)
+
+  07 Jun 2015; Justin Lecher <jlec@gentoo.org> +cryptography-0.9.1.ebuild:
+  Version Bump
 
   28 May 2015; Justin Lecher <jlec@gentoo.org> cryptography-0.8.2.ebuild,
   cryptography-0.9.ebuild:
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 1d89de3..1fc4f77 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1 +1,2 @@
 DIST cryptography-0.6.1.tar.gz 236721 SHA256 024910130a01eda0ce969764d893d2e397168ebb94181ca1ea3e23e19912329e SHA512 b99338bbbeb70f37e0bfcc6ef33ddff5beb74f7876a30d34deb3a433ddd77f821e5cc5dde228f792362ae7a261d4ceb3b702fb1a8c30ce15a1e6e4de98ef1afa WHIRLPOOL a641342fe13f584ee657aa917172810117416cd426746af30499e43174041c8031598c223398dace1ad1385e3905a27c9f6e5ac5def88a8b87e2ed3bfd95b9ce
+DIST cryptography-0.9.3.tar.gz 303075 SHA256 aed022f738dd9adb840d92960b0464ea1fbb222ba118938858eb93fe25151c2d SHA512 828dd6d3af940c91f77b9bcefb34ca9cc3ac05606d707889ff35bf708c3536414db46f8db7d7dcbffe2ad1f82834bc9edab1b28b05fee3f2a5f9f5a56abd697c WHIRLPOOL 33eb42741cf2426ffe16d50d0f555fee65637d812f9510016ceb708f9c591f38de2d65e4b4118f744ff9b73596727160501ec5d077bfe0935d088586909b979d
diff --git a/dev-python/cryptography/cryptography-0.9.3.ebuild b/dev-python/cryptography/cryptography-0.9.3.ebuild
new file mode 100644
index 0000000..962cbe3
--- /dev/null
+++ b/dev-python/cryptography/cryptography-0.9.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/cryptography-0.9.3.ebuild,v 1.1 2015/07/16 09:04:06 patrick Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.python.org/pypi/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	dev-libs/openssl:0
+	$(python_gen_cond_dep '>=dev-python/cffi-0.8:=[${PYTHON_USEDEP}]' 'python*')
+	$(python_gen_cond_dep 'dev-python/enum34[${PYTHON_USEDEP}]' python2_7 python3_3 pypy)
+	dev-python/idna[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ipaddress[${PYTHON_USEDEP}]' python2_7 pypy)
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+PATCHES=( "${FILESDIR}/cryptography-libressl-2.2.2.patch" )
+
+python_test() {
+	py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/files/cryptography-libressl-2.2.2.patch b/dev-python/cryptography/files/cryptography-libressl-2.2.2.patch
new file mode 100644
index 0000000..c01a5fb
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-libressl-2.2.2.patch
@@ -0,0 +1,12 @@
+diff -Naurw cryptography-0.9.3/src/cryptography/hazmat/bindings/openssl/ec.py cryptography-0.9.3.new/src/cryptography/hazmat/bindings/openssl/ec.py
+--- cryptography-0.9.3/src/cryptography/hazmat/bindings/openssl/ec.py	2015-07-09 07:41:12.000000000 -0700
++++ cryptography-0.9.3.new/src/cryptography/hazmat/bindings/openssl/ec.py	2015-08-08 12:15:42.739955819 -0700
+@@ -390,7 +390,7 @@
+ #endif
+ 
+ #if defined(OPENSSL_NO_EC) || OPENSSL_VERSION_NUMBER < 0x1000200f || \
+-    defined(LIBRESSL_VERSION_NUMBER)
++    defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20020002L
+ static const long Cryptography_HAS_EC_1_0_2 = 0;
+ const char *(*EC_curve_nid2nist)(int) = NULL;
+ #else