mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-30 14:11:21 +00:00
kdePackages.kdeconnect-kde: hardcode sshfs path, fix sshfs arguments
Fixes #311236
This commit is contained in:
parent
e526629d75
commit
5692481590
@ -19,6 +19,10 @@ mkKdeDerivation {
|
||||
src = ./hardcode-sshfs-path.patch;
|
||||
sshfs = lib.getExe sshfs;
|
||||
})
|
||||
# We build OpenSSH without ssh-dss support, so sshfs explodes at runtime.
|
||||
# See: https://github.com/NixOS/nixpkgs/commit/6ee4b8c8bf815567f7d0fa131576d2b8c0a18167
|
||||
# FIXME: upstream?
|
||||
./remove-ssh-dss.patch
|
||||
];
|
||||
|
||||
# Hardcoded as a QString, which is UTF-16 so Nix can't pick it up automatically
|
||||
|
13
pkgs/kde/gear/kdeconnect-kde/remove-ssh-dss.patch
Normal file
13
pkgs/kde/gear/kdeconnect-kde/remove-ssh-dss.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
|
||||
index 29e94f3b..0f300c63 100644
|
||||
--- a/plugins/sftp/mounter.cpp
|
||||
+++ b/plugins/sftp/mounter.cpp
|
||||
@@ -122,7 +122,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np)
|
||||
<< QStringLiteral("-o") << QStringLiteral("IdentityFile=") + KdeConnectConfig::instance().privateKeyPath()
|
||||
<< QStringLiteral("-o") << QStringLiteral("StrictHostKeyChecking=no") // Do not ask for confirmation because it is not a known host
|
||||
<< QStringLiteral("-o") << QStringLiteral("UserKnownHostsFile=/dev/null") // Prevent storing as a known host
|
||||
- << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss\\,ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725
|
||||
+ << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725
|
||||
<< QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=443155
|
||||
<< QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid())
|
||||
<< QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid())
|
Loading…
Reference in New Issue
Block a user