aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluixhi Scura <lluixhi@gmail.com>2015-01-13 19:38:07 -0800
committerLluixhi Scura <lluixhi@gmail.com>2015-01-13 19:38:07 -0800
commit6ecc80bc8798d9485003332df50b6352e197bad1 (patch)
treea3653ab84ac79aa0935b5bf1f605354f544c51f8 /dev-python
parentMerge branch master of fsteinel/libressl up to 2da6982 (diff)
downloadlibressl-6ecc80bc8798d9485003332df50b6352e197bad1.tar.gz
libressl-6ecc80bc8798d9485003332df50b6352e197bad1.tar.bz2
libressl-6ecc80bc8798d9485003332df50b6352e197bad1.zip
Updated dev-python/cryptography
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/cryptography/ChangeLog61
-rw-r--r--dev-python/cryptography/Manifest1
-rw-r--r--dev-python/cryptography/cryptography-0.7.1-r1.ebuild42
-rw-r--r--dev-python/cryptography/files/0.7-libressl.patch76
-rw-r--r--dev-python/cryptography/files/0.7-setup.patch22
5 files changed, 200 insertions, 2 deletions
diff --git a/dev-python/cryptography/ChangeLog b/dev-python/cryptography/ChangeLog
index fdc975e..cd1fb68 100644
--- a/dev-python/cryptography/ChangeLog
+++ b/dev-python/cryptography/ChangeLog
@@ -1,6 +1,63 @@
# ChangeLog for dev-python/cryptography
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/ChangeLog,v 1.19 2014/07/11 00:04:34 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/ChangeLog,v 1.32 2015/01/14 00:47:04 idella4 Exp $
+
+*cryptography-0.7.1-r1 (14 Jan 2015)
+
+ 14 Jan 2015; Ian Delaney <idella4@gentoo.org> +cryptography-0.7.1-r1.ebuild,
+ +cryptography-0.7.ebuild, +files/0.7-setup.patch, -cryptography-0.7.1.ebuild:
+ revbump; re-add pypy support, update and tidy deps, patch (from upstream) to
+ correct their own oversight in setup.py re use of enum34, ebuild cross checked
+ and tested by Arfrever.
+
+*cryptography-0.7.1 (13 Jan 2015)
+
+ 13 Jan 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.7.1.ebuild:
+ Bump, drop minor arches due to enum34 keywords missing, drop pypy because
+ keywords missing, drop py34 target because setup.py too confused about life
+
+ 24 Dec 2014; Markus Meier <maekke@gentoo.org> cryptography-0.6.1.ebuild:
+ arm stable, bug #530294
+
+ 09 Dec 2014; Jeroen Roovers <jer@gentoo.org> cryptography-0.6.1.ebuild:
+ Stable for HPPA (bug #530294).
+
+ 16 Nov 2014; Mike Gilbert <floppym@gentoo.org> cryptography-0.5.4.ebuild,
+ cryptography-0.6.1.ebuild:
+ Fix dependency on dev-python/cffi.
+
+ 26 Oct 2014; Fabian Groffen <grobian@gentoo.org> cryptography-0.6.1.ebuild:
+ Added Prefix keywords, bug #503094
+
+ 18 Oct 2014; Tim Harder <radhermit@gentoo.org> cryptography-0.6.1.ebuild:
+ Setuptools is now a runtime dep.
+
+*cryptography-0.6.1 (18 Oct 2014)
+
+ 18 Oct 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.6.1.ebuild:
+ Version bump, restrict tests until cffi fixes its compile on import issues,
+ and drop python3_2 support.
+
+ 07 Oct 2014; Tim Harder <radhermit@gentoo.org> -cryptography-0.4-r1.ebuild,
+ -cryptography-0.4-r2.ebuild, -cryptography-0.5.1.ebuild,
+ -cryptography-0.5.2.ebuild, -cryptography-0.5.3.ebuild, -files/asn1.patch:
+ Remove old.
+
+*cryptography-0.5.4 (24 Aug 2014)
+
+ 24 Aug 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.5.4.ebuild:
+ Version bump.
+
+ 13 Aug 2014; Anthony G. Basile <blueness@gentoo.org>
+ cryptography-0.4-r1.ebuild, cryptography-0.4-r2.ebuild,
+ cryptography-0.5.1.ebuild, cryptography-0.5.2.ebuild,
+ cryptography-0.5.3.ebuild:
+ Keyword ~ppc and ~ppc64, bug #503094
+
+*cryptography-0.5.3 (08 Aug 2014)
+
+ 08 Aug 2014; Tim Harder <radhermit@gentoo.org> +cryptography-0.5.3.ebuild:
+ Version bump.
*cryptography-0.5.2 (11 Jul 2014)
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 1d89de3..a253f7e 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.7.1.tar.gz 247309 SHA256 9ee59090b242ad0d6abcedebb9ab54358d5efd1a45706195f6e5928f7725bb76 SHA512 ae552fcb8005c98ded32b47edf61d4bf2b495c63b9ac744545d3d1ada7f6f64b1b23a5d9f396bf2a998fcc58370307c893f324806e0c825b9c63fe78698bdc4b WHIRLPOOL dfdb3ff90291c7f3dca3835532608b742c9768311b204bb4a41c62ed6d4ed48b812898a482d86ced10887daebe2b57b1451df51f297f9a19a7ce80a05446f938
diff --git a/dev-python/cryptography/cryptography-0.7.1-r1.ebuild b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
new file mode 100644
index 0000000..a6fe84e
--- /dev/null
+++ b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
@@ -0,0 +1,42 @@
+# 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.7.1-r1.ebuild,v 1.1 2015/01/14 00:32:22 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,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 ~mips ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ dev-libs/openssl:0
+ >=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+ dev-python/pyasn1[${PYTHON_USEDEP}]
+ $(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)"
+DEPEND="${RDEPEND}
+ 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}"/0.7-setup.patch
+ "${FILESDIR}"/0.7-libressl.patch )
+
+python_test() {
+ py.test -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cryptography/files/0.7-libressl.patch b/dev-python/cryptography/files/0.7-libressl.patch
new file mode 100644
index 0000000..ddc1c09
--- /dev/null
+++ b/dev-python/cryptography/files/0.7-libressl.patch
@@ -0,0 +1,76 @@
+diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/engine.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/engine.py
+--- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/engine.py 2014-12-28 17:46:47.000000000 -0800
++++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/engine.py 2015-01-13 19:28:36.480028680 -0800
+@@ -49,7 +49,6 @@
+ int ENGINE_finish(ENGINE *);
+ void ENGINE_load_openssl(void);
+ void ENGINE_load_dynamic(void);
+-void ENGINE_load_cryptodev(void);
+ void ENGINE_load_builtin_engines(void);
+ void ENGINE_cleanup(void);
+ ENGINE *ENGINE_get_default_RSA(void);
+diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/rand.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/rand.py
+--- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/rand.py 2014-12-28 17:46:47.000000000 -0800
++++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/rand.py 2015-01-13 19:28:46.573362313 -0800
+@@ -16,9 +16,6 @@
+ void RAND_seed(const void *, int);
+ void RAND_add(const void *, int, double);
+ int RAND_status(void);
+-int RAND_egd(const char *);
+-int RAND_egd_bytes(const char *, int);
+-int RAND_query_egd_bytes(const char *, unsigned char *, int);
+ const char *RAND_file_name(char *, size_t);
+ int RAND_load_file(const char *, long);
+ int RAND_write_file(const char *);
+diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/ssl.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/ssl.py
+--- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/ssl.py 2014-12-28 17:46:47.000000000 -0800
++++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/ssl.py 2015-01-13 19:30:40.533365704 -0800
+@@ -149,7 +149,6 @@
+
+ typedef ... SSL_CIPHER;
+ typedef ... Cryptography_STACK_OF_SSL_CIPHER;
+-typedef ... COMP_METHOD;
+ """
+
+ FUNCTIONS = """
+@@ -189,10 +188,6 @@
+ const char *SSL_get_cipher_list(const SSL *, int);
+ Cryptography_STACK_OF_SSL_CIPHER *SSL_get_ciphers(const SSL *);
+
+-const COMP_METHOD *SSL_get_current_compression(SSL *);
+-const COMP_METHOD *SSL_get_current_expansion(SSL *);
+-const char *SSL_COMP_get_name(const COMP_METHOD *);
+-
+ /* context */
+ void SSL_CTX_free(SSL_CTX *);
+ long SSL_CTX_set_timeout(SSL_CTX *, long);
+@@ -523,7 +518,7 @@
+ #endif
+
+ /* ALPN was added in OpenSSL 1.0.2. */
+-#if OPENSSL_VERSION_NUMBER < 0x10002001L
++#if OPENSSL_VERSION_NUMBER < 0x10002001L || OPENSSL_VERSION_NUMBER >= 0x20000000L
+ int (*SSL_CTX_set_alpn_protos)(SSL_CTX *,
+ const unsigned char *,
+ unsigned) = NULL;
+diff -Naur cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/x509_vfy.py cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/x509_vfy.py
+--- cryptography-0.7.1.orig/src/cryptography/hazmat/bindings/openssl/x509_vfy.py 2014-12-28 17:46:47.000000000 -0800
++++ cryptography-0.7.1/src/cryptography/hazmat/bindings/openssl/x509_vfy.py 2015-01-13 19:32:30.456702318 -0800
+@@ -191,7 +191,7 @@
+
+ CUSTOMIZATIONS = """
+ /* OpenSSL 1.0.2+ verification error codes */
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#ifdef X509_V_ERR_EMAIL_MISMATCH
+ static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 1;
+ #else
+ static const long Cryptography_HAS_102_VERIFICATION_ERROR_CODES = 0;
+@@ -207,7 +207,7 @@
+ #endif
+
+ /* OpenSSL 1.0.2+ verification parameters */
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#ifdef X509_V_FLAG_PARTIAL_CHAIN
+ static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 1;
+ #else
+ static const long Cryptography_HAS_102_VERIFICATION_PARAMS = 0;
diff --git a/dev-python/cryptography/files/0.7-setup.patch b/dev-python/cryptography/files/0.7-setup.patch
new file mode 100644
index 0000000..db5cc02
--- /dev/null
+++ b/dev-python/cryptography/files/0.7-setup.patch
@@ -0,0 +1,22 @@
+https://github.com/pyca/cryptography/commit/5bea5ca0233be05e09d8c62fdeae86187e73a48e
+diff --git a/setup.py b/setup.py
+index ead5ec4..32a87ba 100644
+--- a/setup.py
++++ b/setup.py
+@@ -36,12 +36,14 @@
+
+ requirements = [
+ CFFI_DEPENDENCY,
+- "enum34",
+ "pyasn1",
+ SIX_DEPENDENCY,
+ SETUPTOOLS_DEPENDENCY
+ ]
+
++if sys.version_info < (3, 4):
++ requirements.append("enum34")
++
+ # If you add a new dep here you probably need to add it in the tox.ini as well
+ test_requirements = [
+ "pytest",
+