diff --git a/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch b/pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch similarity index 55% rename from pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch rename to pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch index 760d23cea18d..dd8f76c33379 100644 --- a/pkgs/by-name/rc/rcu/Port-to-paramiko-3.x.patch +++ b/pkgs/by-name/rc/rcu/Port-to-paramiko-4.x.patch @@ -1,17 +1,15 @@ -From aad61b320d65953fddec10b019a186fc67f57a5d Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Sat, 10 Feb 2024 12:20:29 +0100 -Subject: [PATCH] src/model/transport.py: Port to paramiko 3.x - ---- - src/model/transport.py | 19 +++++++++---------- - 1 file changed, 9 insertions(+), 10 deletions(-) - -diff --git a/src/model/transport.py b/src/model/transport.py -index 0c2ee16..5a2bd22 100644 ---- a/src/model/transport.py -+++ b/src/model/transport.py -@@ -117,7 +117,6 @@ from paramiko.kex_gss import KexGSSGex, KexGSSGroup1, KexGSSGroup14 +diff '--color=auto' -ruN a/src/model/transport.py b/src/model/transport.py +--- a/src/model/transport.py 2025-08-27 17:12:23.761436314 +0200 ++++ b/src/model/transport.py 2025-08-27 17:17:35.723006746 +0200 +@@ -105,7 +105,6 @@ + MSG_NAMES, + ) + from paramiko.compress import ZlibCompressor, ZlibDecompressor +-from paramiko.dsskey import DSSKey + from paramiko.ed25519key import Ed25519Key + from paramiko.kex_curve25519 import KexCurve25519 + from paramiko.kex_gex import KexGex, KexGexSHA256 +@@ -117,7 +116,6 @@ from paramiko.message import Message from paramiko.packet import Packetizer, NeedRekeyException from paramiko.primes import ModulusPack @@ -19,7 +17,7 @@ index 0c2ee16..5a2bd22 100644 from paramiko.rsakey import RSAKey from paramiko.ecdsakey import ECDSAKey from paramiko.server import ServerInterface -@@ -128,7 +127,7 @@ from paramiko.ssh_exception import ( +@@ -128,7 +126,7 @@ ChannelException, ProxyCommandFailure, ) @@ -28,7 +26,24 @@ index 0c2ee16..5a2bd22 100644 # for thread cleanup -@@ -396,7 +395,7 @@ class Transport(threading.Thread, ClosingContextManager): +@@ -192,7 +190,6 @@ + "ecdsa-sha2-nistp384", + "ecdsa-sha2-nistp521", + "ssh-rsa", +- "ssh-dss", + ) + _preferred_kex = ( + "ecdh-sha2-nistp256", +@@ -273,8 +270,6 @@ + _key_info = { + "ssh-rsa": RSAKey, + "ssh-rsa-cert-v01@openssh.com": RSAKey, +- "ssh-dss": DSSKey, +- "ssh-dss-cert-v01@openssh.com": DSSKey, + "ecdsa-sha2-nistp256": ECDSAKey, + "ecdsa-sha2-nistp256-cert-v01@openssh.com": ECDSAKey, + "ecdsa-sha2-nistp384": ECDSAKey, +@@ -396,7 +391,7 @@ self.active = False self.hostname = None @@ -37,7 +52,7 @@ index 0c2ee16..5a2bd22 100644 # convert "host:port" into (host, port) hl = sock.split(":", 1) self.hostname = hl[0] -@@ -419,7 +418,7 @@ class Transport(threading.Thread, ClosingContextManager): +@@ -419,7 +414,7 @@ sock = socket.socket(af, socket.SOCK_STREAM) sock.settimeout(1) try: @@ -46,7 +61,7 @@ index 0c2ee16..5a2bd22 100644 except socket.error as e: reason = str(e) else: -@@ -542,7 +541,7 @@ class Transport(threading.Thread, ClosingContextManager): +@@ -542,7 +537,7 @@ """ Returns a string representation of this object, for debugging. """ @@ -55,7 +70,31 @@ index 0c2ee16..5a2bd22 100644 out = "