From 4edfdaf536802c1c859cf508983ff6d2cb81933a5218f266b40329b32e4fabc1 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 31 Oct 2021 12:07:09 +0000 Subject: [PATCH] Accepting request 928351 from home:munix9:branches:KDE:Applications - Add kdeconnect-openssh-8.8.patch (boo#1191886), (kde#351725) and (kde#443155) See also https://bugs.archlinux.org/task/72350 This fixes the problem that kdeconnect with openssh >= 8.8 can no longer browse devices. Depends on sr#928350 OBS-URL: https://build.opensuse.org/request/show/928351 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kdeconnect-kde?expand=0&rev=52 --- kdeconnect-kde.changes | 7 +++++++ kdeconnect-kde.spec | 2 ++ kdeconnect-openssh-8.8.patch | 14 ++++++++++++++ 3 files changed, 23 insertions(+) create mode 100644 kdeconnect-openssh-8.8.patch diff --git a/kdeconnect-kde.changes b/kdeconnect-kde.changes index 1dc6876..398db34 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 31 08:47:15 UTC 2021 - munix9@googlemail.com + +- Add kdeconnect-openssh-8.8.patch (boo#1191886), + (kde#351725) and (kde#443155) + See also https://bugs.archlinux.org/task/72350 + ------------------------------------------------------------------- Tue Oct 5 16:28:01 UTC 2021 - Christophe Giboudeaux diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index f19a96a..cb60e2c 100644 --- a/kdeconnect-kde.spec +++ b/kdeconnect-kde.spec @@ -33,6 +33,8 @@ Source2: applications.keyring %endif Source100: kdeconnect-kde.SuSEfirewall Source101: kdeconnect-kde-firewalld.xml +# PATCH-FIX-OPENSUSE kdeconnect-openssh-8.8.patch boo#1191886 +Patch0: https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/kdeconnect/trunk/kdeconnect-openssh-8.8.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem diff --git a/kdeconnect-openssh-8.8.patch b/kdeconnect-openssh-8.8.patch new file mode 100644 index 0000000..a131b0c --- /dev/null +++ b/kdeconnect-openssh-8.8.patch @@ -0,0 +1,14 @@ +diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp +index 2a484186..23ddc616 100644 +--- a/plugins/sftp/mounter.cpp ++++ b/plugins/sftp/mounter.cpp +@@ -129,7 +129,8 @@ void Mounter::onPackageReceived(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") //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") + << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) + << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid()) + << QStringLiteral("-o") << QStringLiteral("reconnect")