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

2 files changed, 90 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
+
diff --git a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
new file mode 100644
index 000000000000..7e10f20c480f
--- /dev/null
+++ b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN="${PN}-kde"
+DECLARATIVE_REQUIRED="always"
+KDE_LINGUAS="ar bg bs ca cs da de es fi fr gl hu it ja ko lt nl pl pt pt_BR ro ru sk sv tr uk"
+inherit kde4-base
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	MY_P="${MY_PN}-${PV}"
+	SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+else
+	EGIT_REPO_URI="git://anongit.kde.org/${MY_PN}"
+	KEYWORDS=""
+fi
+
+DESCRIPTION="Adds communication between KDE and your smartphone"
+HOMEPAGE="https://www.kde.org/"
+
+LICENSE="GPL-2+"
+SLOT="4"
+IUSE="debug"
+
+COMMON_DEPEND="
+	app-crypt/qca:2[qt4(+)]
+	dev-libs/qjson
+	x11-libs/libfakekey
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_kdebase_dep plasma-workspace)
+	app-crypt/qca:2[openssl]
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+
+[[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${P}-ninja.patch"
+	"${FILESDIR}/${P}-openssh-7.0.patch"
+)
+
+pkg_postinst(){
+	elog
+	elog "Optional dependency:"
+	elog "sys-fs/sshfs-fuse (for 'remote filesystem browser' plugin)"
+	elog
+	elog "The Android .apk file is available via"
+	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
+	elog
+}