diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2015-09-23 23:44:10 +1000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2015-09-23 23:44:54 +1000 |
| commit | 2a365015766962c41d29b5e0b3f1667a1aa9f460 (patch) | |
| tree | f768ab1a9fb73473c513d694e35c2184ce7413dd /kde-misc/kdeconnect/files | |
| parent | Revert "dev-ros/camera_calibration: fix broken deps on opencv" (diff) | |
| download | gentoo-2a365015766962c41d29b5e0b3f1667a1aa9f460.tar.gz gentoo-2a365015766962c41d29b5e0b3f1667a1aa9f460.tar.bz2 gentoo-2a365015766962c41d29b5e0b3f1667a1aa9f460.zip | |
kde-misc/kdeconnect: backport patch from upstream solving incompatibility with >=net-misc/openssh-7.0
Gentoo-bug: 560968
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'kde-misc/kdeconnect/files')
| -rw-r--r-- | kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch b/kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch new file mode 100644 index 000000000000..368915668212 --- /dev/null +++ b/kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch @@ -0,0 +1,32 @@ +From 56028b694176d1f52475ac073b0feb842c71a894 Mon Sep 17 00:00:00 2001 +From: Albert Vaca <albertvaka@gmail.com> +Date: Mon, 24 Aug 2015 21:27:24 -0700 +Subject: [PATCH] Fixed incompatibility with OpenSSH 7.0 + +BUG: 351725 + +Conflicts: + plugins/sftp/mounter.cpp +--- + plugins/sftp/mounter.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp +index c414f77..f13bb52 100644 +--- a/plugins/sftp/mounter.cpp ++++ b/plugins/sftp/mounter.cpp +@@ -136,8 +136,9 @@ void Mounter::onPakcageReceived(const NetworkPackage& np) + << "-f" + << "-o" << "IdentityFile=" + m_sftp->device()->privateKeyPath() + << "-o" << "StrictHostKeyChecking=no" //Do not ask for confirmation because it is not a known host +- << "-o" << "UserKnownHostsFile=/dev/null"; //Prevent storing as a known host +- ++ << "-o" << "UserKnownHostsFile=/dev/null" //Prevent storing as a known host ++ << "-o" << "HostKeyAlgorithms=+ssh-dss"; //https://bugs.kde.org/show_bug.cgi?id=351725 ++ + m_proc->setProgram(program, arguments); + + //To debug +-- +2.4.9 + |