aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLluixhi Scura <lluixhi@gmail.com>2015-06-05 13:20:40 -0700
committerLluixhi Scura <lluixhi@gmail.com>2015-06-05 13:20:40 -0700
commit88205ce231a11c5b9a29bbcfcf57bd9482cfb27a (patch)
tree30c6bce05f91db1c81bf7989e584c954ad3b60fe /dev-python
parentdev-lang/ruby: update to version 2.2.2-r1, fixes #77 (diff)
downloadlibressl-88205ce231a11c5b9a29bbcfcf57bd9482cfb27a.tar.gz
libressl-88205ce231a11c5b9a29bbcfcf57bd9482cfb27a.tar.bz2
libressl-88205ce231a11c5b9a29bbcfcf57bd9482cfb27a.zip
Deleted old cryptography versions, sync'd keywords. Only 0.6.1 is still
patched because it's marked stable
Diffstat (limited to 'dev-python')
-rw-r--r--dev-python/cryptography/ChangeLog68
-rw-r--r--dev-python/cryptography/Manifest2
-rw-r--r--dev-python/cryptography/cryptography-0.6.1.ebuild2
-rw-r--r--dev-python/cryptography/cryptography-0.7.1-r1.ebuild43
-rw-r--r--dev-python/cryptography/cryptography-0.7.2.ebuild41
-rw-r--r--dev-python/cryptography/files/0.7-libressl.patch72
-rw-r--r--dev-python/cryptography/files/0.7-setup.patch22
-rw-r--r--dev-python/cryptography/metadata.xml8
8 files changed, 72 insertions, 186 deletions
diff --git a/dev-python/cryptography/ChangeLog b/dev-python/cryptography/ChangeLog
index cd1fb68..d0ec78e 100644
--- a/dev-python/cryptography/ChangeLog
+++ b/dev-python/cryptography/ChangeLog
@@ -1,6 +1,72 @@
# 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.32 2015/01/14 00:47:04 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cryptography/ChangeLog,v 1.47 2015/05/28 18:50:42 jlec Exp $
+
+ 28 May 2015; Justin Lecher <jlec@gentoo.org> cryptography-0.8.2.ebuild,
+ cryptography-0.9.ebuild:
+ Fix dependencies, thanks Arfrever
+
+ 17 May 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.9.ebuild:
+ Mark ~hppa (bug #549518).
+
+ 17 May 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.9.ebuild:
+ Mark ~ppc64 (bug #549518).
+
+ 16 May 2015; Anthony G. Basile <blueness@gentoo.org>
+ cryptography-0.5.4.ebuild, cryptography-0.6.1.ebuild,
+ cryptography-0.7.1-r1.ebuild, cryptography-0.7.2.ebuild,
+ cryptography-0.8.1.ebuild, cryptography-0.8.2.ebuild, cryptography-0.8.ebuild,
+ cryptography-0.9.ebuild:
+ Keyword ~ppc. Bug #533430.
+
+*cryptography-0.9 (15 May 2015)
+
+ 15 May 2015; Justin Lecher <jlec@gentoo.org> +cryptography-0.9.ebuild:
+ Version Bump
+
+ 23 Apr 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.7.1-r1.ebuild,
+ cryptography-0.7.2.ebuild, cryptography-0.8.ebuild,
+ cryptography-0.8.1.ebuild, cryptography-0.8.2.ebuild:
+ Marked ~ppc64 (bug #533430).
+
+*cryptography-0.8.2 (13 Apr 2015)
+
+ 13 Apr 2015; Justin Lecher <jlec@gentoo.org> +cryptography-0.8.2.ebuild,
+ metadata.xml:
+ Version Bump
+
+ 08 Apr 2015; Michał Górny <mgorny@gentoo.org> cryptography-0.5.4.ebuild:
+ Drop old Python implementations
+
+ 04 Apr 2015; Mike Frysinger <vapier@gentoo.org> cryptography-0.6.1.ebuild,
+ cryptography-0.7.1-r1.ebuild, cryptography-0.7.2.ebuild,
+ cryptography-0.8.1.ebuild, cryptography-0.8.ebuild:
+ Add arm64/ia64/m68k/s390/sh love.
+
+ 01 Apr 2015; Tobias Klausmann <klausman@gentoo.org>
+ cryptography-0.8.1.ebuild:
+ Keyworded on alpha, bug 503094
+
+*cryptography-0.8.1 (24 Mar 2015)
+
+ 24 Mar 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.8.1.ebuild:
+ Bump
+
+*cryptography-0.8 (11 Mar 2015)
+
+ 11 Mar 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.8.ebuild:
+ Bump
+
+ 15 Feb 2015; Pacho Ramos <pacho@gentoo.org> cryptography-0.6.1.ebuild:
+ amd64/ppc/ppc64/x86 stable, bug #530294
+
+*cryptography-0.7.2 (26 Jan 2015)
+
+ 26 Jan 2015; Patrick Lauer <patrick@gentoo.org> +cryptography-0.7.2.ebuild:
+ Bump
+
+ 16 Jan 2015; Jeroen Roovers <jer@gentoo.org> cryptography-0.7.1-r1.ebuild:
+ Marked ~hppa (bug #533430).
*cryptography-0.7.1-r1 (14 Jan 2015)
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 4ccf058..1d89de3 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,3 +1 @@
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
-DIST cryptography-0.7.2.tar.gz 247477 SHA256 fab7fcdde360ec6614442d0321dcd0eff5e43544cb30d975e9d75a914a4cdf78 SHA512 5afc8e01ffcdbd829716e65663cca91ad7ec42f5b65f64f6f1d3189c5cb7a209dcd67698225e1bb54eb6428fa5abdd25405a7ae1d234d5194697d3b879483226 WHIRLPOOL a5ed7d6f9e9f51d9a41e1014968ccada84b13b5e6f80ad14278edb1eacbf7abf4ed5009b942845840ba84b50b4dd4bcd2c41032444e3452fd42c669babdcdbed
diff --git a/dev-python/cryptography/cryptography-0.6.1.ebuild b/dev-python/cryptography/cryptography-0.6.1.ebuild
index 1161cd8..8d6692f 100644
--- a/dev-python/cryptography/cryptography-0.6.1.ebuild
+++ b/dev-python/cryptography/cryptography-0.6.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
IUSE="libressl test"
RDEPEND="
diff --git a/dev-python/cryptography/cryptography-0.7.1-r1.ebuild b/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
deleted file mode 100644
index b3cc47d..0000000
--- a/dev-python/cryptography/cryptography-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# 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="libressl test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl:= )
- >=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/cryptography-0.7.2.ebuild b/dev-python/cryptography/cryptography-0.7.2.ebuild
deleted file mode 100644
index 4de468f..0000000
--- a/dev-python/cryptography/cryptography-0.7.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# 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="libressl test"
-
-RDEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl:= )
- >=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-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
deleted file mode 100644
index b82f5b7..0000000
--- a/dev-python/cryptography/files/0.7-libressl.patch
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/cryptography/hazmat/bindings/openssl/engine.py.orig 2015-01-16 13:26:59 UTC
-+++ src/cryptography/hazmat/bindings/openssl/engine.py
-@@ -49,7 +49,6 @@ int ENGINE_init(ENGINE *);
- 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);
---- src/cryptography/hazmat/bindings/openssl/rand.py.orig 2015-01-16 13:26:59 UTC
-+++ src/cryptography/hazmat/bindings/openssl/rand.py
-@@ -16,9 +16,6 @@ void ERR_load_RAND_strings(void);
- 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 *);
---- src/cryptography/hazmat/bindings/openssl/ssl.py.orig 2015-01-16 13:26:59 UTC
-+++ src/cryptography/hazmat/bindings/openssl/ssl.py
-@@ -189,10 +189,6 @@ int SSL_shutdown(SSL *);
- 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);
-@@ -415,6 +411,16 @@ static const long Cryptography_HAS_RELEA
- const long SSL_MODE_RELEASE_BUFFERS = 0;
- #endif
-
-+#ifndef OPENSSL_NO_COMP
-+const COMP_METHOD *SSL_get_current_compression(SSL *s);
-+const COMP_METHOD *SSL_get_current_expansion(SSL *s);
-+const char *SSL_COMP_get_name(const COMP_METHOD *comp);
-+#else
-+const void *SSL_get_current_compression(SSL *s);
-+const void *SSL_get_current_expansion(SSL *s);
-+const char *SSL_COMP_get_name(const void *comp);
-+#endif
-+
- #ifdef SSL_OP_NO_COMPRESSION
- static const long Cryptography_HAS_OP_NO_COMPRESSION = 1;
- #else
---- src/cryptography/hazmat/bindings/openssl/x509_vfy.py.orig 2015-01-16 13:26:59 UTC
-+++ src/cryptography/hazmat/bindings/openssl/x509_vfy.py
-@@ -191,7 +191,7 @@ int X509_VERIFY_PARAM_set1_ip_asc(X509_V
-
- CUSTOMIZATIONS = """
- /* OpenSSL 1.0.2+ verification error codes */
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if 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 @@ static const long X509_V_ERR_IP_ADDRESS_
- #endif
-
- /* OpenSSL 1.0.2+ verification parameters */
--#if OPENSSL_VERSION_NUMBER >= 0x10002000L
-+#if 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
deleted file mode 100644
index db5cc02..0000000
--- a/dev-python/cryptography/files/0.7-setup.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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",
-
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
index d8bdc7b..87fa280 100644
--- a/dev-python/cryptography/metadata.xml
+++ b/dev-python/cryptography/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
- <upstream>
- <remote-id type="pypi">cryptography</remote-id>
- </upstream>
+ <herd>python</herd>
+ <upstream>
+ <remote-id type="pypi">cryptography</remote-id>
+ </upstream>
</pkgmetadata>