From 5a88f3995f868af14f99c45a988675f7f6dfa8da Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Thu, 26 Mar 2020 18:12:55 +0100 Subject: [PATCH] dev-python/cryptography: Remove redundant versions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- dev-python/cryptography/Manifest | 1 - .../cryptography/cryptography-2.6.1-r1.ebuild | 74 ------------------- .../files/cryptography-2.6.1-libressl.patch | 69 ----------------- 3 files changed, 144 deletions(-) delete mode 100644 dev-python/cryptography/cryptography-2.6.1-r1.ebuild delete mode 100644 dev-python/cryptography/files/cryptography-2.6.1-libressl.patch diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest index e95ee2ffaf8c..f791a7de88e8 100644 --- a/dev-python/cryptography/Manifest +++ b/dev-python/cryptography/Manifest @@ -1,3 +1,2 @@ -DIST cryptography-2.6.1.tar.gz 491580 BLAKE2B b81114b57e9973c80fe999a63a3b1269d6289ac67851fedc263927b74e9e5ec4f35356cf5d46e4a27a994d5a3b2b3b599fea264b3ebce3a0cac27abfde3ef046 SHA512 f14319e24d9dca52e74548cada5b78a6235f089ef875dbff4799e862f94da8b087f1b6e03e84dcef9fc7d7693c4a349c5f0cd54b8535806da777420ce8757d39 DIST cryptography-2.8.tar.gz 504516 BLAKE2B 3a853bf59a752acee9e9607f3f35f3815701c6068a1ffa5b6604ec648a31a5d4e31f13a1b19f3156c703313800242d8b06dd71a54a4eb0cc68481dea894002f3 SHA512 bf3ca44123c693b0602be19445925f9efebd46c469909e47b7907d57141fb6bd99268c33e1fe3f42a08ab8b4edd4f98f21b6a682f530352313334dfd31ba91e7 DIST cryptography_vectors-2.8.tar.gz 35102030 BLAKE2B 8e98e12bab31a2097a72c849f52ee93b9b684a8923c140722419154471bd695c6287ff4498c9fe326662c7d9a9f5d9ebaa55dc4d5a0d8180a6827ae244464006 SHA512 d328082d3a65b8036d396172d7e42c753c842e9310850a77c6ccd99c9905d48bbc3e3319d216013c1370b8439f0f8056749ae94b1abf9a5b7088435acdeed7fb diff --git a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild b/dev-python/cryptography/cryptography-2.6.1-r1.ebuild deleted file mode 100644 index 99637ca4c42e..000000000000 --- a/dev-python/cryptography/cryptography-2.6.1-r1.ebuild +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic - -DESCRIPTION="Library providing cryptographic recipes and primitives" -HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 BSD )" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="libressl idna test" -RESTRICT="!test? ( test )" - -# the openssl 1.0.2l-r1 needs to be updated again :( -# It'd theb be able to go into the || section again -#=dev-libs/openssl-1.0.2l-r1:0 -# the following is the original section, disallowing bindist entirely -#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] ) -RDEPEND=" - !libressl? ( - dev-libs/openssl:0= ( - || ( - dev-libs/openssl:0[-bindist(-)] - >=dev-libs/openssl-1.0.2o-r6:0 - ) - ) - ) - libressl? ( dev-libs/libressl:0= ) - idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] ) - >=dev-python/asn1crypto-0.21.0[${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/six-1.4.1[${PYTHON_USEDEP}] - $(python_gen_cond_dep ' - dev-python/enum34[${PYTHON_USEDEP}] - dev-python/ipaddress[${PYTHON_USEDEP}] - ' -2) - $(python_gen_cond_dep ' - >=dev-python/cffi-1.8:=[${PYTHON_USEDEP}] - !~dev-python/cffi-1.11.3[${PYTHON_USEDEP}] - ' 'python*') - " -DEPEND="${RDEPEND} - >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] - test? ( - ~dev-python/cryptography-vectors-${PV}[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - dev-python/iso8601[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}] - !~dev-python/hypothesis-3.79.2[${PYTHON_USEDEP}] - dev-python/pyasn1-modules[${PYTHON_USEDEP}] - >=dev-python/pytest-2.9.0[${PYTHON_USEDEP}] - )" - -DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst ) - -PATCHES=( - "${FILESDIR}"/${P}-libressl.patch -) - -python_configure_all() { - append-cflags $(test-flags-CC -pthread) -} - -python_test() { - py.test -v -v -x || die "Tests fail with ${EPYTHON}" -} diff --git a/dev-python/cryptography/files/cryptography-2.6.1-libressl.patch b/dev-python/cryptography/files/cryptography-2.6.1-libressl.patch deleted file mode 100644 index 0337470172fd..000000000000 --- a/dev-python/cryptography/files/cryptography-2.6.1-libressl.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 340d55d28305e4449ccf019a5250df2c17dd70c6 Mon Sep 17 00:00:00 2001 -From: Charlie Li -Date: Tue, 23 Apr 2019 11:07:00 -0400 -Subject: [PATCH] Use generic DTLS functions added in LibreSSL 2.9.1 (#4855) - -* Use generic DTLS functions added in LibreSSL 2.9.1 - -While here, bump travis. - -* Remove LibreSSL 2.9.0 from travis now that 2.9.1 exists. - -Requested by: @reaperhulk - -Upstream-status: Backport -[https://github.com/pyca/cryptography/commit/87550626ff995ae61abf441e5e89076cc5a7dd45] -Signed-off-by: Stefan Strogin ---- - src/_cffi_src/openssl/cryptography.py | 3 +++ - src/_cffi_src/openssl/ssl.py | 9 ++++++--- - 3 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/_cffi_src/openssl/cryptography.py b/src/_cffi_src/openssl/cryptography.py -index 4124dcb8..ac32fdff 100644 ---- a/src/_cffi_src/openssl/cryptography.py -+++ b/src/_cffi_src/openssl/cryptography.py -@@ -38,9 +38,12 @@ INCLUDES = """ - (LIBRESSL_VERSION_NUMBER >= 0x2070000f) - #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER \ - (LIBRESSL_VERSION_NUMBER >= 0x2080000f) -+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER \ -+ (LIBRESSL_VERSION_NUMBER >= 0x2090100f) - #else - #define CRYPTOGRAPHY_LIBRESSL_27_OR_GREATER (0) - #define CRYPTOGRAPHY_LIBRESSL_28_OR_GREATER (0) -+#define CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER (0) - #endif - - #define CRYPTOGRAPHY_OPENSSL_102_OR_GREATER \ -diff --git a/src/_cffi_src/openssl/ssl.py b/src/_cffi_src/openssl/ssl.py -index 92fd1e3e..da21f3ce 100644 ---- a/src/_cffi_src/openssl/ssl.py -+++ b/src/_cffi_src/openssl/ssl.py -@@ -719,17 +719,20 @@ static const long TLS_ST_BEFORE = 0; - static const long TLS_ST_OK = 0; - #endif - --#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 -+/* LibreSSL 2.9.1 added only the DTLS_*_method functions */ -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 && !CRYPTOGRAPHY_LIBRESSL_291_OR_GREATER - static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 0; - const SSL_METHOD *(*DTLS_method)(void) = NULL; - const SSL_METHOD *(*DTLS_server_method)(void) = NULL; - const SSL_METHOD *(*DTLS_client_method)(void) = NULL; -+#else -+static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1; -+#endif -+#if CRYPTOGRAPHY_OPENSSL_LESS_THAN_102 - static const long SSL_OP_NO_DTLSv1 = 0; - static const long SSL_OP_NO_DTLSv1_2 = 0; - long (*DTLS_set_link_mtu)(SSL *, long) = NULL; - long (*DTLS_get_link_min_mtu)(SSL *) = NULL; --#else --static const long Cryptography_HAS_GENERIC_DTLS_METHOD = 1; - #endif - - static const long Cryptography_HAS_DTLS = 1; --- -2.21.0 - -- 2.26.2