[arch-commits] Commit in kdeconnect/trunk (PKGBUILD kdeconnect-openssh-8.2.patch)

[Antonio Rojas]

    Date: Monday, February 17, 2020 @ 22:06:51
  Author: arojas
Revision: 574814

Workaround broken file browsing with openssh 8.2

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

------------------------------+
 PKGBUILD                     |   11 ++++++++---
 kdeconnect-openssh-8.2.patch |   12 ++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-17 22:00:11 UTC (rev 574813)
+++ PKGBUILD	2020-02-17 22:06:51 UTC (rev 574814)
@@ -4,7 +4,7 @@
 
 pkgname=kdeconnect
 pkgver=1.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Adds communication between KDE and your smartphone'
 url='https://community.kde.org/KDEConnect'
 license=(GPL)
@@ -12,14 +12,19 @@
 depends=(hicolor-icon-theme kcmutils kwayland libfakekey qca kpeoplevcard pulseaudio-qt kirigami2)
 makedepends=(extra-cmake-modules kdoctools)
 optdepends=('sshfs: remote filesystem browser' 'python-nautilus: Nautilus integration')
-source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-kde-$pkgver.tar.xz"{,.sig})
+source=("https://download.kde.org/stable/$pkgname/$pkgver/$pkgname-kde-$pkgver.tar.xz"{,.sig}
+         kdeconnect-openssh-8.2.patch)
 sha256sums=('caee7945a9d9bb881a943dc8d2fd0d702c04da5bdb2df14d4f875e7cf5d5261a'
-            'SKIP')
+            'SKIP'
+            '8bcf0d39dfe059af866f48719562dfe7db7fcb0f20ee75d7adda9784fca0ba64')
 validpgpkeys=(B3487CA0FF36258E2A2F338BD33E721DF877EFE8  # Albert Vaca Cintora <albertvaka at gmail.com>
               F53223F3337665C2CCEA122E873AC3459BBCF5C0) # Nicolas Fella <nicolas.fella at kdab.com>
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-kde-$pkgver
+  patch -p1 -i ../kdeconnect-openssh-8.2.patch # Fix file browsing with openssh 8.2
 }
 
 build() {

Added: kdeconnect-openssh-8.2.patch
===================================================================
--- kdeconnect-openssh-8.2.patch	                        (rev 0)
+++ kdeconnect-openssh-8.2.patch	2020-02-17 22:06:51 UTC (rev 574814)
@@ -0,0 +1,12 @@
+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);