From 16be64511bd21e32a29645b49e37611507709790 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Aug 2024 12:24:45 +0100 Subject: gentoo auto-resync : 18:08:2024 - 12:24:44 --- dev-python/asyncssh/Manifest | 5 +- dev-python/asyncssh/asyncssh-2.14.2.ebuild | 53 -------- dev-python/asyncssh/asyncssh-2.16.0.ebuild | 54 ++++++++ .../asyncssh/files/asyncssh-2.14.2-py313.patch | 151 --------------------- 4 files changed, 56 insertions(+), 207 deletions(-) delete mode 100644 dev-python/asyncssh/asyncssh-2.14.2.ebuild create mode 100644 dev-python/asyncssh/asyncssh-2.16.0.ebuild delete mode 100644 dev-python/asyncssh/files/asyncssh-2.14.2-py313.patch (limited to 'dev-python/asyncssh') diff --git a/dev-python/asyncssh/Manifest b/dev-python/asyncssh/Manifest index a28ef5cf0606..64278503fd2d 100644 --- a/dev-python/asyncssh/Manifest +++ b/dev-python/asyncssh/Manifest @@ -1,6 +1,5 @@ -AUX asyncssh-2.14.2-py313.patch 4720 BLAKE2B 7bc1d71906c22efe1aa03e65b165d66a98b985d11e15f81e514696d669a99c801cab2d1683e2df041ff7b95d5811c11d4098ff8274f1c7040edfcbc9ab05157e SHA512 8f02d1acca847d5ceaa2d08f639c2bc4c862a5219ee9558d43979b85d89c5d3c7f65f761ceda0748a314c32c6e85ecd91b488ddadce5c108cc33b4b8b8fd713e -DIST asyncssh-2.14.2.tar.gz 498190 BLAKE2B 66cc538322688d0782e203eb723c7c7a196fd5da725fe95df8b31e25e35e45b86bb01cb5c46f5516475614b9cf7b8076bc3994ec77daf552e030724b0734c2d1 SHA512 76952b8837832139274fbfc4ec4aa84841c66a4eb4c1bd09fd532727287574509fb2b94b684c14d6f76add80a1fe5c8236a3412ab6a71574c203706895b23f93 DIST asyncssh-2.15.0.tar.gz 516935 BLAKE2B 0e67dc6c2d7814479241d81e06d6a5290a99802490c097769137673980b798122718a3af99c6d71a3fb08b37d4e3e0c4cfc2fb69523b2b76c88cdbf638fd42ee SHA512 51f43bfcf27dadd9e79d7b306b11f6dc196d2de65a60663aa6e59f1b1246a6467a6324209bfb0607a9d2902ef8dde51cd172f9e32e36168954c67b8fcd7e1dd6 -EBUILD asyncssh-2.14.2.ebuild 1469 BLAKE2B 7b09bfaf45778156bc1f37f5a33681ee34196b59ca447d816f681ad2fd0ec7902cde2643056b9425c594a6a80856b3e3716d6152dae8f2d8080cdc0564e8efa0 SHA512 e1e17058678b5aaa61c7fcec6c1fcd1fb61760903d86d51cff4f29806822f94c852359a3bc0a9ad55c73d0aa8a2b3b5a9789a0a9999209a38978077148df7991 +DIST asyncssh-2.16.0.tar.gz 520697 BLAKE2B 113e079045dd0543966cc9de86c6de453f0da0803955a69948368f015e340f801a99db3cc15c97eaf0030c36edf92ad40071dcfbcd80f6243f8467ba311bb979 SHA512 d47a0450709e48cc781f03dc2fc1f153f4fd59bce59354085ff36ef3af37223071566136d5a48211024db41400e7b82b918921942d8f5df203b98275e6fd460a EBUILD asyncssh-2.15.0.ebuild 1530 BLAKE2B c6a81dd67681cdf19dcbdc4aa4a205e0ca43378266ef68a464ccc733285fcd687d80ce83e757c4feb0d201c18b5b8485b48679e37fa94d29893f47c944acf3b9 SHA512 50f7a9b2a5f7192aaa2b2e68d330f2a3d9d878a68e4df3cd6d1a99efb8037c15492c24b18582fd91fea69bf91fab10899bfd2ac136b74a1d6b862c0c7a637a07 +EBUILD asyncssh-2.16.0.ebuild 1530 BLAKE2B c6a81dd67681cdf19dcbdc4aa4a205e0ca43378266ef68a464ccc733285fcd687d80ce83e757c4feb0d201c18b5b8485b48679e37fa94d29893f47c944acf3b9 SHA512 50f7a9b2a5f7192aaa2b2e68d330f2a3d9d878a68e4df3cd6d1a99efb8037c15492c24b18582fd91fea69bf91fab10899bfd2ac136b74a1d6b862c0c7a637a07 MISC metadata.xml 402 BLAKE2B e4c5d013286a9519d2a2fe0807a3a92ee44bbeb3b862b81fba432a2cda5ec2531d5e1356776de401b9a1c57aaed97d172e3d293254e6e809b5b5cc8670c22489 SHA512 772970deecc78319abfff75ab660da279a92933e4d8efb39b35eb10f3d1edde117fe9b980b04a222e53674402443f48e57b91d07f7f6da395a800bc69632b364 diff --git a/dev-python/asyncssh/asyncssh-2.14.2.ebuild b/dev-python/asyncssh/asyncssh-2.14.2.ebuild deleted file mode 100644 index 0c7015523b72..000000000000 --- a/dev-python/asyncssh/asyncssh-2.14.2.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{10..13} ) - -inherit distutils-r1 optfeature pypi - -DESCRIPTION="Asynchronous SSHv2 client and server library" -HOMEPAGE=" - https://github.com/ronf/asyncssh - https://pypi.org/project/asyncssh/ -" - -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - virtual/openssh - >=dev-python/cryptography-39.0[${PYTHON_USEDEP}] - >=dev-python/typing-extensions-3.6[${PYTHON_USEDEP}] -" - -BDEPEND=" - test? ( - dev-python/aiofiles[${PYTHON_USEDEP}] - >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}] - >=dev-python/fido2-0.9.2[${PYTHON_USEDEP}] - >=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}] - >=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] - ) -" - -PATCHES=( - # https://github.com/ronf/asyncssh/issues/616 - "${FILESDIR}/${P}-py313.patch" -) - -EPYTEST_XDIST=1 -distutils_enable_tests pytest -distutils_enable_sphinx docs - -pkg_postinst() { - optfeature "OpenSSH private key encryption support" ">=dev-python/bcrypt-3.1.3" - optfeature "key exchange and authentication with U2F/FIDO2 security keys support" ">=dev-python/fido2-0.9.2" - optfeature "GSSAPI key exchange and authentication support" ">=dev-python/gssapi-1.2.0" - optfeature "using asyncssh with dev-libs/libsodium" "dev-python/libnacl" - optfeature "X.509 certificate authentication support" ">=dev-python/pyopenssl-23.0.0" -} diff --git a/dev-python/asyncssh/asyncssh-2.16.0.ebuild b/dev-python/asyncssh/asyncssh-2.16.0.ebuild new file mode 100644 index 000000000000..8dd7162e4b4b --- /dev/null +++ b/dev-python/asyncssh/asyncssh-2.16.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_PEP517=setuptools +PYTHON_COMPAT=( python3_{10..13} ) + +inherit distutils-r1 optfeature pypi + +DESCRIPTION="Asynchronous SSHv2 client and server library" +HOMEPAGE=" + https://github.com/ronf/asyncssh + https://pypi.org/project/asyncssh/ +" + +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + virtual/openssh + >=dev-python/cryptography-39.0[${PYTHON_USEDEP}] + >=dev-python/typing-extensions-4.0.0[${PYTHON_USEDEP}] +" + +BDEPEND=" + test? ( + dev-python/aiofiles[${PYTHON_USEDEP}] + >=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}] + >=dev-python/fido2-0.9.2[${PYTHON_USEDEP}] + >=dev-python/gssapi-1.2.0[${PYTHON_USEDEP}] + >=dev-python/libnacl-1.4.2[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-23.0.0[${PYTHON_USEDEP}] + dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] + ) +" + +EPYTEST_XDIST=1 +distutils_enable_tests pytest +distutils_enable_sphinx docs + +python_test() { + local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1 + epytest -p rerunfailures --reruns=5 +} + +pkg_postinst() { + optfeature "OpenSSH private key encryption support" ">=dev-python/bcrypt-3.1.3" + optfeature "key exchange and authentication with U2F/FIDO2 security keys support" ">=dev-python/fido2-0.9.2" + optfeature "GSSAPI key exchange and authentication support" ">=dev-python/gssapi-1.2.0" + optfeature "using asyncssh with dev-libs/libsodium" "dev-python/libnacl" + optfeature "X.509 certificate authentication support" ">=dev-python/pyopenssl-23.0.0" +} diff --git a/dev-python/asyncssh/files/asyncssh-2.14.2-py313.patch b/dev-python/asyncssh/files/asyncssh-2.14.2-py313.patch deleted file mode 100644 index fa3752a2b516..000000000000 --- a/dev-python/asyncssh/files/asyncssh-2.14.2-py313.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 58168139adcaa4bf12448904137cd77812636b18 Mon Sep 17 00:00:00 2001 -From: Ron Frederick -Date: Sat, 23 Dec 2023 10:25:14 -0800 -Subject: [PATCH] Guard against possible UNIX domain socket cleanup in Python - 3.13 - -This commit adds guards around code which cleans up UNIX domain -sockets, to protect against a change proposed at -https://github.com/python/cpython/issues/111246 -which would cause the socket to clean itself up on close. ---- - tests/test_agent.py | 5 ++++- - tests/test_forward.py | 50 +++++++++++++++++++++++++++++++++---------- - 2 files changed, 43 insertions(+), 12 deletions(-) - -diff --git a/tests/test_agent.py b/tests/test_agent.py -index 28ca730..2f0b83c 100644 ---- a/tests/test_agent.py -+++ b/tests/test_agent.py -@@ -85,7 +85,10 @@ async def stop(self): - self._server.close() - await self._server.wait_closed() - -- os.remove(self._path) -+ try: -+ os.remove(self._path) -+ except OSError: -+ pass - - - class _TestAgent(AsyncTestCase): -diff --git a/tests/test_forward.py b/tests/test_forward.py -index cae199d..4d30eda 100644 ---- a/tests/test_forward.py -+++ b/tests/test_forward.py -@@ -651,7 +651,10 @@ async def test_forward_local_path_to_port(self): - async with conn.forward_local_path_to_port('local', '', 7): - await self._check_local_unix_connection('local') - -- os.remove('local') -+ try: -+ os.remove('local') -+ except OSError: -+ pass - - @unittest.skipIf(sys.platform == 'win32', - 'skip UNIX domain socket tests on Windows') -@@ -665,7 +668,10 @@ async def test_forward_local_path_to_port_failure(self): - with self.assertRaises(OSError): - await conn.forward_local_path_to_port('local', '', 7) - -- os.remove('local') -+ try: -+ os.remove('local') -+ except OSError: -+ pass - - @asynctest - async def test_forward_local_port_pause(self): -@@ -798,7 +804,11 @@ async def test_forward_remote_port_to_path(self): - - server.close() - await server.wait_closed() -- os.remove('local') -+ -+ try: -+ os.remove('local') -+ except OSError: -+ pass - - @asynctest - async def test_forward_remote_specific_port(self): -@@ -1020,7 +1030,10 @@ async def test_unix_server(self): - await listener.wait_closed() - listener.close() - -- os.remove('echo') -+ try: -+ os.remove('echo') -+ except OSError: -+ pass - - @asynctest - async def test_unix_server_open(self): -@@ -1053,7 +1066,10 @@ async def test_unix_server_non_async(self): - async with conn.start_unix_server(_unix_listener_non_async, path): - await self._check_local_unix_connection('echo') - -- os.remove('echo') -+ try: -+ os.remove('echo') -+ except OSError: -+ pass - - @asynctest - async def test_unix_server_failure(self): -@@ -1071,7 +1087,10 @@ async def test_forward_local_path(self): - async with conn.forward_local_path('local', '/echo'): - await self._check_local_unix_connection('local') - -- os.remove('local') -+ try: -+ os.remove('local') -+ except OSError: -+ pass - - @asynctest - async def test_forward_local_port_to_path_accept_handler(self): -@@ -1149,8 +1168,11 @@ async def test_forward_remote_path(self): - server.close() - await server.wait_closed() - -- os.remove('echo') -- os.remove('local') -+ try: -+ os.remove('echo') -+ os.remove('local') -+ except OSError: -+ pass - - @asynctest - async def test_forward_remote_path_to_port(self): -@@ -1167,11 +1189,14 @@ async def test_forward_remote_path_to_port(self): - path, '127.0.0.1', server_port): - await self._check_local_unix_connection('echo') - -- os.remove('echo') -- - server.close() - await server.wait_closed() - -+ try: -+ os.remove('echo') -+ except OSError: -+ pass -+ - @asynctest - async def test_forward_remote_path_failure(self): - """Test failure of forwarding a remote UNIX domain path""" -@@ -1184,7 +1209,10 @@ async def test_forward_remote_path_failure(self): - with self.assertRaises(asyncssh.ChannelListenError): - await conn.forward_remote_path(path, 'local') - -- os.remove('echo') -+ try: -+ os.remove('echo') -+ except OSError: -+ pass - - @asynctest - async def test_forward_remote_path_not_permitted(self): -- cgit v1.2.3