diff --git a/kdeconnect-add-back-ssh-dss.patch b/kdeconnect-add-back-ssh-dss.patch deleted file mode 100644 index 2ea8141..0000000 --- a/kdeconnect-add-back-ssh-dss.patch +++ /dev/null @@ -1,20 +0,0 @@ -From: Fabian Vogt -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()) diff --git a/kdeconnect-kde-21.08.3.tar.xz b/kdeconnect-kde-21.08.3.tar.xz deleted file mode 100644 index 0f93d53..0000000 --- a/kdeconnect-kde-21.08.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:324663336db1000163eae91a63be84b6a614131ed62bd6dd6563639ecd5bdabd -size 591412 diff --git a/kdeconnect-kde-21.08.3.tar.xz.sig b/kdeconnect-kde-21.08.3.tar.xz.sig deleted file mode 100644 index ac95900..0000000 --- a/kdeconnect-kde-21.08.3.tar.xz.sig +++ /dev/null @@ -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----- diff --git a/kdeconnect-kde-21.11.90.tar.xz b/kdeconnect-kde-21.11.90.tar.xz new file mode 100644 index 0000000..bc6ca24 --- /dev/null +++ b/kdeconnect-kde-21.11.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd7fc11533a05f8e99ccdcfcd76f85cf9f2410b70e6d421d0b2beb2804888d79 +size 608516 diff --git a/kdeconnect-kde-21.11.90.tar.xz.sig b/kdeconnect-kde-21.11.90.tar.xz.sig new file mode 100644 index 0000000..0398ea6 --- /dev/null +++ b/kdeconnect-kde-21.11.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmGgKFAACgkQu0YzUNbv +Me/V7g/+PpAEUZ8a7edom3mZNKsFUjMHfCNEcML0Af4h6P6AK6GIwQWMsdzxTdXa +SJKMRWnSsFWP1aZMGks27jBnQt6lJaxrJ5COtkSeH5rjb//3rVmWRw4DiCtQUJwb +FEQCrmYzD2b5bcr3DNNhETSbXigCAf4oeiu2AzRw/kITOyDXCnusrYgu+mf1zNnm +ldVvBOnyOiwUb/w3BhJoJNhtoMEg8QiYY0uAC42n1PkSg7ZmxxqOjCjqnfhiGMLV +fp2g7YzzqSKtDmCwwUhSuhIVCLQQhlxUnlAK1Bg45BVo9YkVUyhetyP+W1vjEySS +3yIENvv/MBpkxodGKzHgl40pdT2ZQ5MFWmmILdwtDSfUrtBVfX96nHCk70TKNJzv +hZ0zybMl08wjhQEt3smxhk/BSXJdQhUquDibYMyjQTGi/vl0Wc0w1ibGWZwVDDTR +D3/vWq70z60nojNf70I3CDyLe4dGqTOEiPHE2vFxjKSInyAoA5o9uFQoNLoSZl7X +Bh/3OmhsiKfA1hY5XJAvVYntSUj0UciSJPCGZ6JAbU5L+C9TeSedj1O0/0Vsyps+ +/1CfrcyVioFYdVSG3qo8k3fwOZPOvZVFodwT7ZJ/Ng92eqNcUSgzsbwN8rKV89aL +S6OzIfUci1koBBsKZ3IAFeNLuvRdqj7MM9R5VQw/goud5+TzG98= +=sRn4 +-----END PGP SIGNATURE----- diff --git a/kdeconnect-kde.changes b/kdeconnect-kde.changes index bef60d1..fc67d4a 100644 --- a/kdeconnect-kde.changes +++ b/kdeconnect-kde.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Sat Nov 27 10:10:43 UTC 2021 - Christophe Giboudeaux + +- 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) + +------------------------------------------------------------------- +Sat Nov 13 17:54:53 UTC 2021 - Christophe Giboudeaux + +- 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 diff --git a/kdeconnect-kde.spec b/kdeconnect-kde.spec index d948f2c..fb71900 100644 --- a/kdeconnect-kde.spec +++ b/kdeconnect-kde.spec @@ -20,22 +20,19 @@ # 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.11.90 Release: 0 Summary: Integration of Android with Linux desktops License: GPL-2.0-or-later Group: Productivity/Networking/Other URL: https://community.kde.org/KDEConnect -Source: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig 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 diff --git a/kdeconnect-openssh-8.8.patch b/kdeconnect-openssh-8.8.patch deleted file mode 100644 index a131b0c..0000000 --- a/kdeconnect-openssh-8.8.patch +++ /dev/null @@ -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")