From bb6d117ac7a3798c98bca5b98c538b3770a49542 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Wed, 2 Dec 2020 16:26:43 +0000 Subject: Updating liguros repo --- .../files/pyopenssl-20.0.0-libressl.patch | 30 ++++++++++++ dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild | 53 ++++++++++++++++++++++ dev-python/pyopenssl/pyopenssl-20.0.0.ebuild | 51 --------------------- 3 files changed, 83 insertions(+), 51 deletions(-) create mode 100644 dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch create mode 100644 dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild delete mode 100644 dev-python/pyopenssl/pyopenssl-20.0.0.ebuild (limited to 'dev-python/pyopenssl') diff --git a/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch new file mode 100644 index 000000000000..6e9c7847fcea --- /dev/null +++ b/dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch @@ -0,0 +1,30 @@ +From ecbd275386e5608f0f90d3536506d7f50026ffe6 Mon Sep 17 00:00:00 2001 +From: "Nathaniel J. Smith" +Date: Thu, 1 Aug 2019 21:23:51 -0700 +Subject: [PATCH] Support openssl <1.1.1 + +Upstream-Status: Inappropriate +[https://github.com/pyca/pyopenssl/pull/861/commits/ecbd275386e5608f0f90d3536506d7f50026ffe6 +was accepted in 19.1.0 but later removed since the upstream dropped +support of OpenSSL <1.1.1] +Signed-off-by: Stefan Strogin +--- + src/OpenSSL/SSL.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/OpenSSL/SSL.py b/src/OpenSSL/SSL.py +index 6f785fc4..55211511 100644 +--- a/src/OpenSSL/SSL.py ++++ b/src/OpenSSL/SSL.py +@@ -140,7 +140,10 @@ class _buffer(object): + OP_NO_TLSv1 = _lib.SSL_OP_NO_TLSv1 + OP_NO_TLSv1_1 = _lib.SSL_OP_NO_TLSv1_1 + OP_NO_TLSv1_2 = _lib.SSL_OP_NO_TLSv1_2 +-OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3 ++try: ++ OP_NO_TLSv1_3 = _lib.SSL_OP_NO_TLSv1_3 ++except AttributeError: ++ pass + + MODE_RELEASE_BUFFERS = _lib.SSL_MODE_RELEASE_BUFFERS + diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild new file mode 100644 index 000000000000..92b1b609a8ef --- /dev/null +++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 flag-o-matic + +MY_PN=pyOpenSSL +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python interface to the OpenSSL library" +HOMEPAGE=" + https://www.pyopenssl.org/ + https://pypi.org/project/pyOpenSSL/ + https://github.com/pyca/pyopenssl/ +" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="test" +RESTRICT="!test? ( test )" + +RDEPEND=" + >=dev-python/six-1.5.2[${PYTHON_USEDEP}] + >=dev-python/cryptography-3.2[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( + virtual/python-cffi[${PYTHON_USEDEP}] + dev-python/flaky[${PYTHON_USEDEP}] + dev-python/pretend[${PYTHON_USEDEP}] + >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] + )" + +PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) + +distutils_enable_sphinx doc \ + dev-python/sphinx_rtd_theme + +python_prepare_all() { + # Requires network access + sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die + distutils-r1_python_prepare_all +} + +python_test() { + TZ=UTC pytest -vv || die "Testing failed with ${EPYTHON}" # Fixes bug #627530 +} diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild deleted file mode 100644 index c0f05325ed6d..000000000000 --- a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 ) -PYTHON_REQ_USE="threads(+)" - -inherit distutils-r1 flag-o-matic - -MY_PN=pyOpenSSL -MY_P=${MY_PN}-${PV} - -DESCRIPTION="Python interface to the OpenSSL library" -HOMEPAGE=" - https://www.pyopenssl.org/ - https://pypi.org/project/pyOpenSSL/ - https://github.com/pyca/pyopenssl/ -" -SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-python/six-1.5.2[${PYTHON_USEDEP}] - >=dev-python/cryptography-3.2[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - virtual/python-cffi[${PYTHON_USEDEP}] - dev-python/flaky[${PYTHON_USEDEP}] - dev-python/pretend[${PYTHON_USEDEP}] - >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] - )" - -distutils_enable_sphinx doc \ - dev-python/sphinx_rtd_theme - -python_prepare_all() { - # Requires network access - sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die - distutils-r1_python_prepare_all -} - -python_test() { - TZ=UTC pytest -vv || die "Testing failed with ${EPYTHON}" # Fixes bug #627530 -} -- cgit v1.3