pool/kdeconnect-kde
SHA256
8
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 928370 from KDE:Applications

Browse Source 
- 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-dss.patch

- Add kdeconnect-openssh-8.8.patch (boo#1191886),
  (kde#351725) and (kde#443155)
  See also https://bugs.archlinux.org/task/72350

OBS-URL: https://build.opensuse.org/request/show/928370
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=42
This commit is contained in:
Dominique Leuenberger
2021-11-03 16:25:12 +00:00
committed by Git OBS Bridge
parent 05683ffdff 471d6cfef4
commit 016146c26e
4 changed files with 54 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kdeconnect-add-back-ssh-dss.patch Normal file
View File

@@ -0,0 +1,20 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
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-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())
<< QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid())

14
kdeconnect-kde.changes
View File

@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Sun Oct 31 12:09:10 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- 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-dss.patch
-------------------------------------------------------------------
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 <christophe@krop.fr>

7
kdeconnect-kde.spec
View File

@@ -33,6 +33,9 @@ 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
Patch1: kdeconnect-add-back-ssh-dss.patch
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem
@@ -68,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

14
kdeconnect-openssh-8.8.patch Normal file
View File

@@ -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")