From 4edfdaf536802c1c859cf508983ff6d2cb81933a5218f266b40329b32e4fabc1 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 31 Oct 2021 12:07:09 +0000 Subject: [PATCH 1/3] 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") From 493c91b7e9febe5d490de21de8eae73c497429a438dc706c2f691cde360e9ecc Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 31 Oct 2021 12:14:36 +0000 Subject: [PATCH 2/3] - Make sshfs depencency versioned for kdeconnect-openssh-8.8.patch - Add patch to add back option removed by kdeconnect-openssh-8.8.patch: * kdeconnect-add-back-ssh-dsa.patch OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kdeconnect-kde?expand=0&rev=53 --- kdeconnect-add-back-ssh-dsa.patch | 20 ++++++++++++++++++++ kdeconnect-kde.changes | 7 +++++++ kdeconnect-kde.spec | 5 ++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 kdeconnect-add-back-ssh-dsa.patch diff --git a/kdeconnect-add-back-ssh-dsa.patch b/kdeconnect-add-back-ssh-dsa.patch new file mode 100644 index 0000000..45189a0 --- /dev/null +++ b/kdeconnect-add-back-ssh-dsa.patch @@ -0,0 +1,20 @@ +From: Fabian Vogt +Subject: Add back HostKeyAlgorithms=+ssh-dsa + +The previous patch removed the old option, presumably by accident. +Also fix the bugref. + +Index: kdeconnect-kde-21.08.2/plugins/sftp/mounter.cpp +=================================================================== +--- kdeconnect-kde-21.08.2.orig/plugins/sftp/mounter.cpp ++++ kdeconnect-kde-21.08.2/plugins/sftp/mounter.cpp +@@ -129,7 +129,8 @@ void Mounter::onPackageReceived(const Ne + << 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-rsa") //https://bugs.kde.org/show_bug.cgi?id=351725 ++ << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dsa") //https://bugs.kde.org/show_bug.cgi?id=351725 ++ << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-rsa") //https://bugs.kde.org/show_bug.cgi?id=443155 + << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") + << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) + << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid()) diff --git a/kdeconnect-kde.changes b/kdeconnect-kde.changes index 398db34..766a488 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Oct 31 12:09:10 UTC 2021 - Fabian Vogt + +- Make sshfs depencency versioned for kdeconnect-openssh-8.8.patch +- Add patch to add back option removed by kdeconnect-openssh-8.8.patch: + * kdeconnect-add-back-ssh-dsa.patch + ------------------------------------------------------------------- Sun Oct 31 08:47:15 UTC 2021 - munix9@googlemail.com diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index cb60e2c..0e149d1 100644 --- a/kdeconnect-kde.spec +++ b/kdeconnect-kde.spec @@ -35,6 +35,7 @@ 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 +Patch1: kdeconnect-add-back-ssh-dsa.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem @@ -70,7 +71,9 @@ BuildRequires: pkgconfig(xtst) Requires: kirigami2 Requires: libqt5-qtquickcontrols2 Requires: plasma-framework-components -Requires: sshfs +# kdeconnect-openssh-8.8.patch needs https://github.com/libfuse/sshfs/pull/269, +# which is so far only on the way to TW. +Requires: sshfs >= 3.7.2 Recommends: kpeoplevcard Conflicts: kdeconnect-kde4 From 471d6cfef46e9b6d5f662d98c7a686c406e7c26dad96c07e8f4f61ca10de26fe Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 31 Oct 2021 12:16:43 +0000 Subject: [PATCH 3/3] It's ssh-dss, not ssh-dsa OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kdeconnect-kde?expand=0&rev=54 --- ...-add-back-ssh-dsa.patch => kdeconnect-add-back-ssh-dss.patch | 2 +- kdeconnect-kde.changes | 2 +- kdeconnect-kde.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename kdeconnect-add-back-ssh-dsa.patch => kdeconnect-add-back-ssh-dss.patch (95%) diff --git a/kdeconnect-add-back-ssh-dsa.patch b/kdeconnect-add-back-ssh-dss.patch similarity index 95% rename from kdeconnect-add-back-ssh-dsa.patch rename to kdeconnect-add-back-ssh-dss.patch index 45189a0..2ea8141 100644 --- a/kdeconnect-add-back-ssh-dsa.patch +++ b/kdeconnect-add-back-ssh-dss.patch @@ -13,7 +13,7 @@ Index: kdeconnect-kde-21.08.2/plugins/sftp/mounter.cpp << 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-rsa") //https://bugs.kde.org/show_bug.cgi?id=351725 -+ << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dsa") //https://bugs.kde.org/show_bug.cgi?id=351725 ++ << 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=443155 << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) diff --git a/kdeconnect-kde.changes b/kdeconnect-kde.changes index 766a488..c9c3e24 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -3,7 +3,7 @@ Sun Oct 31 12:09:10 UTC 2021 - Fabian Vogt - Make sshfs depencency versioned for kdeconnect-openssh-8.8.patch - Add patch to add back option removed by kdeconnect-openssh-8.8.patch: - * kdeconnect-add-back-ssh-dsa.patch + * kdeconnect-add-back-ssh-dss.patch ------------------------------------------------------------------- Sun Oct 31 08:47:15 UTC 2021 - munix9@googlemail.com diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index 0e149d1..5905a15 100644 --- a/kdeconnect-kde.spec +++ b/kdeconnect-kde.spec @@ -35,7 +35,7 @@ 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 -Patch1: kdeconnect-add-back-ssh-dsa.patch +Patch1: kdeconnect-add-back-ssh-dss.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem