From 493c91b7e9febe5d490de21de8eae73c497429a438dc706c2f691cde360e9ecc Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 31 Oct 2021 12:14:36 +0000 Subject: [PATCH] - 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