rpm/kdeconnect-kde
SHA256
1
0
Fork 0
forked from pool/kdeconnect-kde
Code Pull Requests Activity

Accepting request 939023 from KDE:Applications

Browse Source 
KDE Gear 21.12.0

OBS-URL: https://build.opensuse.org/request/show/939023
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kdeconnect-kde?expand=0&rev=44
This commit is contained in:
Dominique Leuenberger 2021-12-13 19:40:17 +00:00 committed by Git OBS Bridge
commit 0e8059aa60
8 changed files with 48 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kdeconnect-add-back-ssh-dss.patch
View File

@ -1,20 +0,0 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Add back HostKeyAlgorithms=+ssh-dsa
The previous patch removed the old option, presumably by accident.
Also fix the bugref.
Index: kdeconnect-kde-21.08.2/plugins/sftp/mounter.cpp
===================================================================
--- kdeconnect-kde-21.08.2.orig/plugins/sftp/mounter.cpp
+++ kdeconnect-kde-21.08.2/plugins/sftp/mounter.cpp
@@ -129,7 +129,8 @@ void Mounter::onPackageReceived(const Ne
<< 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-rsa") //https://bugs.kde.org/show_bug.cgi?id=351725
+ << 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=443155
<< QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa")
<< QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid())
<< QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid())

3
kdeconnect-kde-21.08.3.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:324663336db1000163eae91a63be84b6a614131ed62bd6dd6563639ecd5bdabd
size 591412

16
kdeconnect-kde-21.08.3.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmGAhE4ACgkQu0YzUNbv
Me8sgw//f4KiOiPwGum3Y4KB87B3KFUKCgxWW/KtEsvRve94OteXhKe9iLsTzbEB
9bOQ51HHXib6yNN1StY5CuzyuqR7nNSmIpxpPTOGhUZ3scL4ZhPkcxvPaaWL5DAg
2cW4Qriqt7oQhhNmYYuw5QnG/J6UYMcv7B3u52EMKkMl3ZLsT4LoGkOJ1nNPYLEm
yBF3TmRiANIekN5Atyez0aYHtKVCg75jZ6yFz9dHZqLfD/9hN7p7aGMpfdNkc2Fi
Q+iywc1MGFvz2DFzCmpnQfw4AFDPpi4HDMPU1r2jQCvpB4ozRQD8ZMub9Ze0btv6
AkdJ31oIkhOEYC8cglFz2FrgBuN08LZFNjHkE9om5R+s9V0fq8PW5whrTEWX/pQV
D998Hzk9IeaDqe4nzeBXO0ov2A3ky+9aEKWbFqF8P7kkdgvQW+hcN4BU+Y1PalYY
MEaCberOSvCBw3XnqjeLV6em7cPBr0Q3QRg0rsVvKpum2uLPlRTOj55rOPTp904X
kzjQo7iYsGdBgnAW+//RGoA2k6ozW0R9Z9HEYFzGsn3J8JthZqVH1K5DAnejfBLS
JZ3OYV9IcSyxFsEP20xgUH0y2gK9dTJfdBapYUUR913xl+HbsDQL9RNV2p6rSsZH
J/XgOI0+u5vXNE5SQUBGP2SEdxc0Z8iU7jIleg3zngEr2e5wQ2M=
=Zb1Z
-----END PGP SIGNATURE-----

3
kdeconnect-kde-21.12.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:519e1d03cef6c8b68902be7907fada4988b34c20816a977077576bf168369d4a
size 608688

16
kdeconnect-kde-21.12.0.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmGpY3MACgkQOmpNuDnq
ptcA6w//cdQsELamv9/4wTqYZs4rxISDP8uaY0/Zh97hQIQejCZruC453Sym5HTh
2hpRJKiEba6I0846slgpip3mo2SZzXPpOp5k8mqUoggA9e/kY2cg2quCk/Cx5VIh
zIxRPh2KgNF72YmQ8ZX7JcTuP+IHcaPrbKg/0BSBAtQaxXWljCPLuupV1UGOzSzi
55p0mFygHbWSH1RMV7edn0sy7SXRctNKKrzuuk53oML693Tw4CMTU0hIQ65dE0Dw
Ao4rSJ5Z1fWY1SMEQTVtiZaajdzev2o13vT8WbcltKlilLk3Q8j+XiLEQp3AVurE
xS8tNUxnAmmLEMulEKAxpsRT/BIDA4bU6L7AX55v7XNR00xK1bqRESYHOo6t9g8l
q7uKN4FBP0Y6cWqFllJ+hkBWvnB6QmfX/WjQrP5K94ZbIJgsTkqgLt4vtjE8YFon
sak4kffGFa5Jnzir9ez8tmx8lDjLZH3OQSUdvZ825gffDaJf4bLedlsFPpX0rEmC
0RpbKC9fX91MN0QIlA89iYreLbbv8cxT2xRujfp/Qq13rjTDUQJ1UOIPukzNQpFR
vi+yMg9bKv24OMJaFyUOazxV2jlBFtHCBIs7KMF/Je+LncIa80uwfdyQ3IxnLqq6
r1TGCBB25NeByyMnMVJQF+7c9eWTm+mpbSqCaI7xuUm8YYroNyQ=
=sp3v
-----END PGP SIGNATURE-----

27
kdeconnect-kde.changes
View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Fri Dec 3 19:21:48 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.12.0
* New feature release
* For more details please see:
* https://kde.org/announcements/gear/21.12.0/
- No code change since 21.11.90
-------------------------------------------------------------------
Sat Nov 27 10:10:43 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.11.90
* New feature release
- Changes since 21.11.80:
* Fix unicode-decoding mistake in isInGsmAlphabet method
* Always show notification when receiving files (kde#417823)
- Drop kdeconnect-add-back-ssh-dss.patch
-------------------------------------------------------------------
Sat Nov 13 17:54:53 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
- Update to 21.11.80
* New feature release
- Too many changes to list here.
- Drop kdeconnect-openssh-8.8.patch
-------------------------------------------------------------------
Tue Nov 2 21:33:44 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>

6
kdeconnect-kde.spec
View File

@ -20,7 +20,7 @@
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
Name: kdeconnect-kde
Version: 21.08.3
Version: 21.12.0
Release: 0
Summary: Integration of Android with Linux desktops
License: GPL-2.0-or-later
@ -33,9 +33,6 @@ Source2: applications.keyring
%endif
Source100: kdeconnect-kde.SuSEfirewall
Source101: kdeconnect-kde-firewalld.xml
# PATCH-FIX-OPENSUSE kdeconnect-openssh-8.8.patch boo#1191886
Patch0: https://raw.githubusercontent.com/archlinux/svntogit-packages/packages/kdeconnect/trunk/kdeconnect-openssh-8.8.patch
Patch1: kdeconnect-add-back-ssh-dss.patch
BuildRequires: cmake >= 3.0
BuildRequires: extra-cmake-modules
BuildRequires: kf5-filesystem
@ -161,6 +158,7 @@ install -D -m 0644 %{SOURCE101} \
%{_datadir}/deepin/dde-file-manager/oem-menuextensions/kdeconnect-dde.desktop
%{_datadir}/nautilus-python/extensions/
%{_kf5_applicationsdir}/*.desktop
%{_kf5_appstreamdir}/org.kde.kdeconnect.appdata.xml
%{_kf5_appstreamdir}/org.kde.kdeconnect.kcm.appdata.xml
%{_kf5_bindir}/kdeconnect-app
%{_kf5_bindir}/kdeconnect-cli

14
kdeconnect-openssh-8.8.patch
View File

@ -1,14 +0,0 @@
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")