1 |
commit: 2a365015766962c41d29b5e0b3f1667a1aa9f460 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Sep 23 13:44:10 2015 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Sep 23 13:44:54 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a365015 |
7 |
|
8 |
kde-misc/kdeconnect: backport patch from upstream solving incompatibility with >=net-misc/openssh-7.0 |
9 |
|
10 |
Gentoo-bug: 560968 |
11 |
|
12 |
Package-Manager: portage-2.2.20.1 |
13 |
|
14 |
.../files/kdeconnect-0.8-openssh-7.0.patch | 32 ++++++++++++ |
15 |
kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild | 58 ++++++++++++++++++++++ |
16 |
2 files changed, 90 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 0000000..3689156 |
21 |
--- /dev/null |
22 |
+++ b/kde-misc/kdeconnect/files/kdeconnect-0.8-openssh-7.0.patch |
23 |
@@ -0,0 +1,32 @@ |
24 |
+From 56028b694176d1f52475ac073b0feb842c71a894 Mon Sep 17 00:00:00 2001 |
25 |
+From: Albert Vaca <albertvaka@×××××.com> |
26 |
+Date: Mon, 24 Aug 2015 21:27:24 -0700 |
27 |
+Subject: [PATCH] Fixed incompatibility with OpenSSH 7.0 |
28 |
+ |
29 |
+BUG: 351725 |
30 |
+ |
31 |
+Conflicts: |
32 |
+ plugins/sftp/mounter.cpp |
33 |
+--- |
34 |
+ plugins/sftp/mounter.cpp | 5 +++-- |
35 |
+ 1 file changed, 3 insertions(+), 2 deletions(-) |
36 |
+ |
37 |
+diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp |
38 |
+index c414f77..f13bb52 100644 |
39 |
+--- a/plugins/sftp/mounter.cpp |
40 |
++++ b/plugins/sftp/mounter.cpp |
41 |
+@@ -136,8 +136,9 @@ void Mounter::onPakcageReceived(const NetworkPackage& np) |
42 |
+ << "-f" |
43 |
+ << "-o" << "IdentityFile=" + m_sftp->device()->privateKeyPath() |
44 |
+ << "-o" << "StrictHostKeyChecking=no" //Do not ask for confirmation because it is not a known host |
45 |
+- << "-o" << "UserKnownHostsFile=/dev/null"; //Prevent storing as a known host |
46 |
+- |
47 |
++ << "-o" << "UserKnownHostsFile=/dev/null" //Prevent storing as a known host |
48 |
++ << "-o" << "HostKeyAlgorithms=+ssh-dss"; //https://bugs.kde.org/show_bug.cgi?id=351725 |
49 |
++ |
50 |
+ m_proc->setProgram(program, arguments); |
51 |
+ |
52 |
+ //To debug |
53 |
+-- |
54 |
+2.4.9 |
55 |
+ |
56 |
|
57 |
diff --git a/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild |
58 |
new file mode 100644 |
59 |
index 0000000..7e10f20 |
60 |
--- /dev/null |
61 |
+++ b/kde-misc/kdeconnect/kdeconnect-0.8-r1.ebuild |
62 |
@@ -0,0 +1,58 @@ |
63 |
+# Copyright 1999-2015 Gentoo Foundation |
64 |
+# Distributed under the terms of the GNU General Public License v2 |
65 |
+# $Id$ |
66 |
+ |
67 |
+EAPI=5 |
68 |
+ |
69 |
+MY_PN="${PN}-kde" |
70 |
+DECLARATIVE_REQUIRED="always" |
71 |
+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" |
72 |
+inherit kde4-base |
73 |
+ |
74 |
+if [[ ${KDE_BUILD_TYPE} != live ]]; then |
75 |
+ MY_P="${MY_PN}-${PV}" |
76 |
+ SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${MY_P}.tar.xz" |
77 |
+ KEYWORDS="~amd64 ~x86" |
78 |
+else |
79 |
+ EGIT_REPO_URI="git://anongit.kde.org/${MY_PN}" |
80 |
+ KEYWORDS="" |
81 |
+fi |
82 |
+ |
83 |
+DESCRIPTION="Adds communication between KDE and your smartphone" |
84 |
+HOMEPAGE="https://www.kde.org/" |
85 |
+ |
86 |
+LICENSE="GPL-2+" |
87 |
+SLOT="4" |
88 |
+IUSE="debug" |
89 |
+ |
90 |
+COMMON_DEPEND=" |
91 |
+ app-crypt/qca:2[qt4(+)] |
92 |
+ dev-libs/qjson |
93 |
+ x11-libs/libfakekey |
94 |
+ x11-libs/libX11 |
95 |
+ x11-libs/libXtst |
96 |
+" |
97 |
+RDEPEND="${COMMON_DEPEND} |
98 |
+ $(add_kdebase_dep plasma-workspace) |
99 |
+ app-crypt/qca:2[openssl] |
100 |
+" |
101 |
+DEPEND="${COMMON_DEPEND} |
102 |
+ sys-devel/gettext |
103 |
+" |
104 |
+ |
105 |
+[[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P} |
106 |
+ |
107 |
+PATCHES=( |
108 |
+ "${FILESDIR}/${P}-ninja.patch" |
109 |
+ "${FILESDIR}/${P}-openssh-7.0.patch" |
110 |
+) |
111 |
+ |
112 |
+pkg_postinst(){ |
113 |
+ elog |
114 |
+ elog "Optional dependency:" |
115 |
+ elog "sys-fs/sshfs-fuse (for 'remote filesystem browser' plugin)" |
116 |
+ elog |
117 |
+ elog "The Android .apk file is available via" |
118 |
+ elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp" |
119 |
+ elog |
120 |
+} |