diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
| commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
| tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /dev-python/pyopenssl | |
| parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) | |
gentoo resync : 14.12.2020
Diffstat (limited to 'dev-python/pyopenssl')
| -rw-r--r-- | dev-python/pyopenssl/Manifest | 5 | ||||
| -rw-r--r-- | dev-python/pyopenssl/files/pyopenssl-20.0.0-libressl.patch | 30 | ||||
| -rw-r--r-- | dev-python/pyopenssl/metadata.xml | 1 | ||||
| -rw-r--r-- | dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild (renamed from dev-python/pyopenssl/pyopenssl-20.0.0.ebuild) | 2 |
4 files changed, 36 insertions, 2 deletions
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest index 76e45216edd5..5643e7bc861e 100644 --- a/dev-python/pyopenssl/Manifest +++ b/dev-python/pyopenssl/Manifest @@ -1,5 +1,6 @@ +AUX pyopenssl-20.0.0-libressl.patch 1021 BLAKE2B b2158cc4bcde97221d0c18204020f1cb5331a3c38826ebda16bdf8018b038a87bdf1ab4aa81cd2c690b868411663d4a6303eecdeb6743afb60e956512e1dee34 SHA512 aa2ea27211fc06bbca62ff78305d69b9fd9f0cf5d5318f956fd9b386f378b33cf99f7596f35c37343404940d9fe7f9734efcbebadff7a98e5f0f650a71bc84a1 DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916 DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a EBUILD pyopenssl-19.1.0-r1.ebuild 1395 BLAKE2B 29ec3a4e7ca4ac8c60f6227046e80c136e12db62d493619e852cdd657a332543806e48915ee0b9613258427230e9b696d07d2295bb0ed80c837ffc5cfba91aa0 SHA512 1620336ea740370145277b48c4836d5b8d9e2c4f5d476d29c4c321194ca04adc04d1972d4278309b8dac65dd6bb8da0a1b14cb6e3689e41c3be88f8fd5a50952 -EBUILD pyopenssl-20.0.0.ebuild 1402 BLAKE2B 2ca98de775ce7d213f38ebf58ae0ade0f1afab3132b034bbaedc351436e3ca3b895e948e7238b3b0b5dfc7e0694ee2c2444ea3639868409d23ba6b3b22b4ee75 SHA512 907ca7f0a92aad565cc76483cfecd6f689162ec5cef244eae3c3e29641d08d3291b2a3046bc4b22fa9da9ec5e89ccfb9436d31282ccf0056695ac1240255f23e -MISC metadata.xml 481 BLAKE2B e25a44e19e9e7fb701742e1c4916a41a777efcaa046b8147510fc8d9d021cbaad9fb887d8df6769b91006acdc9418df6cec4ba20a78fdec88d26b7cc4ac5c2f0 SHA512 d568654867ca274e7c67a9b30a7f50e739309a22d78c3c1f06f4216a224b00e3a05be022920614befaf96a65ac55782966c9a1fd0ae88c806acc559af307ca38 +EBUILD pyopenssl-20.0.0-r1.ebuild 1449 BLAKE2B dec6086e443725609c7bf5a583c65a006a5cb14a711677e8bf96f29452d920766042a16459cdc23314f3b586d3f25ad8425e84ada6c4cb8864bc5899fb55de29 SHA512 fdbd12bdc40ab48f3fe7fb0397523ba0543efcc604e7c53c34705dbf7874940859c7a7215de8292dc3f219c1c0da54415536df2cd0168e96f48251267c61088a +MISC metadata.xml 535 BLAKE2B bf6dde29d0d101534792aab82e884425a32a6d96385e21e46d760902684b32d0560c57eb8be37db82365f5332906540d145f88bcd76626f00a11e12428664ced SHA512 64f374479e80652f5803b3c6ef3fbeb94c3dc23c5805b11390979be02c312c631ad8ddca0056f439f41da7ebf245119c7da1110cad637efb0e4290be9fadd4f3 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" <njs@pobox.com> +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 <steils@gentoo.org> +--- + 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/metadata.xml b/dev-python/pyopenssl/metadata.xml index 037166d772aa..d5c951e41acc 100644 --- a/dev-python/pyopenssl/metadata.xml +++ b/dev-python/pyopenssl/metadata.xml @@ -10,5 +10,6 @@ <remote-id type="launchpad">pyopenssl</remote-id> <remote-id type="sourceforge">pyopenssl</remote-id> <remote-id type="cpe">cpe:/a:pyopenssl:pyopenssl</remote-id> + <remote-id type="github">pyca/pyopenssl</remote-id> </upstream> </pkgmetadata> diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild index b09f1b1bdec6..0e4a096a48ac 100644 --- a/dev-python/pyopenssl/pyopenssl-20.0.0.ebuild +++ b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild @@ -37,6 +37,8 @@ DEPEND="${RDEPEND} >=dev-python/pytest-3.0.1[${PYTHON_USEDEP}] )" +PATCHES=( "${FILESDIR}"/${P}-libressl.patch ) + distutils_enable_sphinx doc \ dev-python/sphinx_rtd_theme |