[arch-commits] Commit in kdeconnect/trunk (3 files)

[Antonio Rojas]

    Date: Tuesday, October 5, 2021 @ 22:31:38
  Author: arojas
Revision: 425158

Fix file browsing with openssh 8.8 (FS#72350)

Added:
  kdeconnect/trunk/kdeconnect-openssh-8.8.patch
Modified:
  kdeconnect/trunk/PKGBUILD
Deleted:
  kdeconnect/trunk/kdeconnect-openssh-8.2.patch

------------------------------+
 PKGBUILD                     |   12 +++++++++---
 kdeconnect-openssh-8.2.patch |   12 ------------
 kdeconnect-openssh-8.8.patch |   14 ++++++++++++++
 3 files changed, 23 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-05 19:29:20 UTC (rev 425157)
+++ PKGBUILD	2021-10-05 22:31:38 UTC (rev 425158)
@@ -4,7 +4,7 @@
 
 pkgname=kdeconnect
 pkgver=21.08.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Adds communication between KDE and your smartphone'
 url='https://kdeconnect.kde.org/'
 arch=(x86_64)
@@ -13,13 +13,19 @@
 depends=(kcmutils kwayland libfakekey qca-qt5 kpeoplevcard pulseaudio-qt qqc2-desktop-style hicolor-icon-theme)
 makedepends=(extra-cmake-modules kdoctools)
 optdepends=('sshfs: remote filesystem browser' 'python-nautilus: Nautilus integration' 'qt5-tools: for some runcommand plugin actions')
-source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig})
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig}
+        kdeconnect-openssh-8.8.patch)
 sha256sums=('6330f74b432ecead1f99f8c74dcc24fd97672ca7009267569ff3bceeb3fedc06'
-            'SKIP')
+            'SKIP'
+            'e5cb803e7b21f31fd40639fa74e6f6aaaa7e136053a79f3b88f2bbb36bb58a4f')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
 
+prepare() {
+  patch -d $pkgname-kde-$pkgver -p1 < kdeconnect-openssh-8.8.patch # Fix file browsing with openssh 8.8
+}
+
 build() {
   cmake -B build -S $pkgname-kde-$pkgver \
     -DBUILD_TESTING=OFF \

Deleted: kdeconnect-openssh-8.2.patch
===================================================================
--- kdeconnect-openssh-8.2.patch	2021-10-05 19:29:20 UTC (rev 425157)
+++ kdeconnect-openssh-8.2.patch	2021-10-05 22:31:38 UTC (rev 425158)
@@ -1,12 +0,0 @@
-diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
-index fca9907c..f673c9f7 100644
---- a/plugins/sftp/mounter.cpp
-+++ b/plugins/sftp/mounter.cpp
-@@ -145,6 +145,7 @@ void Mounter::onPackageReceived(const NetworkPacket& np)
-         << QStringLiteral("-o") << QStringLiteral("reconnect")
-         << QStringLiteral("-o") << QStringLiteral("ServerAliveInterval=30")
-         << QStringLiteral("-o") << QStringLiteral("password_stdin")
-+        << QStringLiteral("-o") << QStringLiteral("KexAlgorithms=+diffie-hellman-group14-sha1")
-         ;
- 
-     m_proc->setProgram(program, arguments);

Added: kdeconnect-openssh-8.8.patch
===================================================================
--- kdeconnect-openssh-8.8.patch	                        (rev 0)
+++ kdeconnect-openssh-8.8.patch	2021-10-05 22:31:38 UTC (rev 425158)
@@ -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")