diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-11-05 19:02:56 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2025-11-05 19:02:56 +0000 |
| commit | 864ccd3aba62b24728eb0b963d8a1093555475c0 (patch) | |
| tree | bb5a89762d7f5ee123655bf5cdf9406b27dc1759 /dev-python/sshtunnel | |
| parent | 64f2ecf7f878941ddcb49fbeb10e26352844b683 (diff) | |
| download | srcux-864ccd3aba62b24728eb0b963d8a1093555475c0.tar.gz srcux-864ccd3aba62b24728eb0b963d8a1093555475c0.tar.xz srcux-864ccd3aba62b24728eb0b963d8a1093555475c0.zip | |
Adding metadata
Diffstat (limited to 'dev-python/sshtunnel')
| -rw-r--r-- | dev-python/sshtunnel/files/sshtunnel-0.4.0-paramiko-4-compat.patch | 27 | ||||
| -rw-r--r-- | dev-python/sshtunnel/sshtunnel-0.4.0-r1.ebuild | 37 | ||||
| -rw-r--r-- | dev-python/sshtunnel/sshtunnel-0.4.0-r2.ebuild (renamed from dev-python/sshtunnel/sshtunnel-0.4.0.ebuild) | 4 |
3 files changed, 67 insertions, 1 deletions
diff --git a/dev-python/sshtunnel/files/sshtunnel-0.4.0-paramiko-4-compat.patch b/dev-python/sshtunnel/files/sshtunnel-0.4.0-paramiko-4-compat.patch new file mode 100644 index 000000000000..d015fbb42832 --- /dev/null +++ b/dev-python/sshtunnel/files/sshtunnel-0.4.0-paramiko-4-compat.patch @@ -0,0 +1,27 @@ +https://github.com/pahaz/sshtunnel/issues/302 +https://github.com/pahaz/sshtunnel/pull/300 + +From 7030d0c76c679c2934bdc27adc48ff5a84d1ae9a Mon Sep 17 00:00:00 2001 +From: lglines <lglines@fleetio.com> +Date: Mon, 4 Aug 2025 08:58:11 -0600 +Subject: [PATCH] remove DSSKey, which is no longer supported by paramiko + +--- a/sshtunnel.py ++++ b/sshtunnel.py +@@ -1090,7 +1090,6 @@ def get_keys(logger=None, host_pkey_directories=None, allow_agent=False): + host_pkey_directories = [DEFAULT_SSH_DIRECTORY] + + paramiko_key_types = {'rsa': paramiko.RSAKey, +- 'dsa': paramiko.DSSKey, + 'ecdsa': paramiko.ECDSAKey} + if hasattr(paramiko, 'Ed25519Key'): + # NOQA: new in paramiko>=2.2: http://docs.paramiko.org/en/stable/api/keys.html#module-paramiko.ed25519key +@@ -1295,7 +1294,7 @@ def read_private_key_file(pkey_file, + paramiko.Pkey + """ + ssh_pkey = None +- key_types = (paramiko.RSAKey, paramiko.DSSKey, paramiko.ECDSAKey) ++ key_types = (paramiko.RSAKey, paramiko.ECDSAKey) + if hasattr(paramiko, 'Ed25519Key'): + # NOQA: new in paramiko>=2.2: http://docs.paramiko.org/en/stable/api/keys.html#module-paramiko.ed25519key + key_types += (paramiko.Ed25519Key, ) diff --git a/dev-python/sshtunnel/sshtunnel-0.4.0-r1.ebuild b/dev-python/sshtunnel/sshtunnel-0.4.0-r1.ebuild new file mode 100644 index 000000000000..4d563aa45375 --- /dev/null +++ b/dev-python/sshtunnel/sshtunnel-0.4.0-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +EPYTEST_XDIST=1 +PYTHON_COMPAT=( python3_{10..14} ) +inherit distutils-r1 pypi + +DESCRIPTION="Pure Python SSH tunnels" +HOMEPAGE="https://pypi.org/project/sshtunnel/" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 ~arm ~arm64 x86" + +# https://github.com/pahaz/sshtunnel/issues/302 +RDEPEND="<dev-python/paramiko-4[${PYTHON_USEDEP}]" +BDEPEND=" + test? ( + dev-python/paramiko[server(+),${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + ) +" + +PATCHES=( + "${FILESDIR}"/sshtunnel-0.4.0-dont-deadlock-tests.patch +) + +EPYTEST_PLUGINS=() +distutils_enable_tests pytest + +EPYTEST_DESELECT=( + # network-sandbox + tests/test_forwarder.py::SSHClientTest::test_gateway_ip_unresolvable_raises_exception +) diff --git a/dev-python/sshtunnel/sshtunnel-0.4.0.ebuild b/dev-python/sshtunnel/sshtunnel-0.4.0-r2.ebuild index cc47ec2fc00b..f6bd2eaa7d9a 100644 --- a/dev-python/sshtunnel/sshtunnel-0.4.0.ebuild +++ b/dev-python/sshtunnel/sshtunnel-0.4.0-r2.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="https://pypi.org/project/sshtunnel/" LICENSE="MIT" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" RDEPEND="dev-python/paramiko[${PYTHON_USEDEP}]" BDEPEND=" @@ -25,8 +25,10 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/sshtunnel-0.4.0-dont-deadlock-tests.patch + "${FILESDIR}"/sshtunnel-0.4.0-paramiko-4-compat.patch ) +EPYTEST_PLUGINS=() distutils_enable_tests pytest EPYTEST_DESELECT=( |
