From 1cc2be4160eab8385b7fc3f2c371b6774f447f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= <marcdeop@fedoraproject.org>
Date: Tue, 24 Jan 2023 16:53:13 +0100
Subject: [PATCH] feat: add patch to fix upstream bug #443155

---
 a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff | 12 ++++++++++++
 kde-connect.spec                              |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff

diff --git a/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff b/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff
new file mode 100644
index 0000000..317f5c1
--- /dev/null
+++ b/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff
@@ -0,0 +1,12 @@
+diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
+index 10059960ccae88c6c262bc9dd1fe960e47efbd7f..518213ecda59cdae0f05ce85c8d07b2449cce2aa 100644
+--- a/plugins/sftp/mounter.cpp
++++ b/plugins/sftp/mounter.cpp
+@@ -127,6 +127,7 @@ void Mounter::onPackageReceived(const NetworkPacket &np)
+                       << 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("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()) << QStringLiteral("-o") << QStringLiteral("reconnect") << QStringLiteral("-o")
+                       << QStringLiteral("ServerAliveInterval=30") << QStringLiteral("-o") << QStringLiteral("password_stdin");
diff --git a/kde-connect.spec b/kde-connect.spec
index 73e1556..5c21a8f 100644
--- a/kde-connect.spec
+++ b/kde-connect.spec
@@ -5,7 +5,7 @@
 
 Name:    kde-connect
 Version: 22.12.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Summary: KDE Connect client for communication with smartphones
 
@@ -18,6 +18,10 @@ Url:     https://community.kde.org/KDEConnect
 %endif
 Source0:        http://download.kde.org/%{stable}/release-service/%{version}/src/%{base_name}-%{version}.tar.xz
 
+# Fixes https://bugs.kde.org/show_bug.cgi?id=443155
+# https://invent.kde.org/network/kdeconnect-kde/-/commit/a7c17468
+Patch0:         a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff
+
 ## upstream patches (lookaside cache)
 
 BuildRequires:  desktop-file-utils
@@ -191,6 +195,9 @@ done
 
 
 %changelog
+* Tue Jan 24 2023 Marc Deop <marcdeop@fedoraproject.org> - 22.12.1-3
+- Add upstream patch
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 22.12.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild