From 8c30edab590878bff753a9ed5343fb29c28a5234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Mon, 19 Dec 2022 16:25:02 +0100 Subject: [PATCH 1/4] 22.12.0 --- .gitignore | 1 + kde-connect.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6f377d6..72a8403 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /kdeconnect-kde-22.08.1.tar.xz /kdeconnect-kde-22.08.2.tar.xz /kdeconnect-kde-22.08.3.tar.xz +/kdeconnect-kde-22.12.0.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index 680f830..9577a9b 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,7 +4,7 @@ %global module kdeconnect-kde Name: kde-connect -Version: 22.08.3 +Version: 22.12.0 Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -191,6 +191,9 @@ done %changelog +* Mon Dec 19 2022 Marc Deop - 22.12.0-1 +- 22.12.0 + * Thu Nov 03 2022 Than Ngo - 22.08.3-1 - 22.08.3 diff --git a/sources b/sources index 74857a3..55a056f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdeconnect-kde-22.08.3.tar.xz) = 94df4dd19fce1cedeec3682b8b7d5eec7cd26fc6ffce75460d9a425fdd36d8bdc705467c4d3adb86512a5d40801b325e7d92e76d13f6a58415a170873a0d40a0 +SHA512 (kdeconnect-kde-22.12.0.tar.xz) = 0de56bccd828e407a246dbf3f6e2e5b602db64df5ad03f4921a5c8f5e59d8a31646f9e7804906c3451aa39f0daa9b9a2d9a7343b5773f00c906df5a5b2d784d4 From d1880fac00457812976f54f4ae7f698ef6fe4db3 Mon Sep 17 00:00:00 2001 From: Justin Zobel Date: Wed, 4 Jan 2023 14:53:39 +1030 Subject: [PATCH 2/4] Update to 22.12.1 --- .gitignore | 1 + kde-connect.spec | 11 +++++++---- sources | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 72a8403..a35be32 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /kdeconnect-kde-22.08.2.tar.xz /kdeconnect-kde-22.08.3.tar.xz /kdeconnect-kde-22.12.0.tar.xz +/kdeconnect-kde-22.12.1.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index 9577a9b..5b7ecdf 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -1,10 +1,10 @@ # enable experimental (default off) bluetooth support #global bluetooth 1 -%global module kdeconnect-kde +%global base_name kdeconnect-kde Name: kde-connect -Version: 22.12.0 +Version: 22.12.1 Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -16,7 +16,7 @@ Url: https://community.kde.org/KDEConnect %else %global stable stable %endif -Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{module}-%{version}.tar.xz +Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{base_name}-%{version}.tar.xz ## upstream patches (lookaside cache) @@ -122,7 +122,7 @@ Supplements: (kdeconnectd and nautilus) %prep -%autosetup -n %{module}-%{version} -p1 +%autosetup -n %{base_name}-%{version} -p1 %build @@ -191,6 +191,9 @@ done %changelog +* Wed Jan 04 2023 Justin Zobel - 22.12.1-1 +- Update to 22.12.1 + * Mon Dec 19 2022 Marc Deop - 22.12.0-1 - 22.12.0 diff --git a/sources b/sources index 55a056f..a6a5cc0 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ SHA512 (kdeconnect-kde-22.12.0.tar.xz) = 0de56bccd828e407a246dbf3f6e2e5b602db64df5ad03f4921a5c8f5e59d8a31646f9e7804906c3451aa39f0daa9b9a2d9a7343b5773f00c906df5a5b2d784d4 +SHA512 (kdeconnect-kde-22.04.1.tar.xz) = 98c81deb2b97c5b24d6bbdfcb3a7efba487ae212cae7c8449b1b8d91cf61fbd485225f1f38139425ea6cd8736a617452daa2cf6c84ffbda57c2830d420038c27 +SHA512 (kdeconnect-kde-22.12.1.tar.xz) = cc5162b965cc1544776a66ef0689804978078b829b2f8567d30a6d1808e929a706d493293ddfe4dcc91d0c1898bfa8b05bf476ef10e552e9daaf60a067d00924 From 66a224150eaee1a1366a69221b5ef4df05278ed4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:12:39 +0000 Subject: [PATCH 3/4] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- kde-connect.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-connect.spec b/kde-connect.spec index 5b7ecdf..73e1556 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -5,7 +5,7 @@ Name: kde-connect Version: 22.12.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -191,6 +191,9 @@ done %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 22.12.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Justin Zobel - 22.12.1-1 - Update to 22.12.1 From 1cc2be4160eab8385b7fc3f2c371b6774f447f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 24 Jan 2023 16:53:13 +0100 Subject: [PATCH 4/4] feat: add patch to fix upstream bug #443155 --- a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff | 12 ++++++++++++ kde-connect.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff diff --git a/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff b/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff new file mode 100644 index 0000000..317f5c1 --- /dev/null +++ b/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff @@ -0,0 +1,12 @@ +diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp +index 10059960ccae88c6c262bc9dd1fe960e47efbd7f..518213ecda59cdae0f05ce85c8d07b2449cce2aa 100644 +--- a/plugins/sftp/mounter.cpp ++++ b/plugins/sftp/mounter.cpp +@@ -127,6 +127,7 @@ void Mounter::onPackageReceived(const NetworkPacket &np) + << 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\\,ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=351725 ++ << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa") // https://bugs.kde.org/show_bug.cgi?id=443155 + << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid()) << QStringLiteral("-o") + << QStringLiteral("gid=") + QString::number(getgid()) << QStringLiteral("-o") << QStringLiteral("reconnect") << QStringLiteral("-o") + << QStringLiteral("ServerAliveInterval=30") << QStringLiteral("-o") << QStringLiteral("password_stdin"); diff --git a/kde-connect.spec b/kde-connect.spec index 73e1556..5c21a8f 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -5,7 +5,7 @@ Name: kde-connect Version: 22.12.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -18,6 +18,10 @@ Url: https://community.kde.org/KDEConnect %endif Source0: http://download.kde.org/%{stable}/release-service/%{version}/src/%{base_name}-%{version}.tar.xz +# Fixes https://bugs.kde.org/show_bug.cgi?id=443155 +# https://invent.kde.org/network/kdeconnect-kde/-/commit/a7c17468 +Patch0: a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff + ## upstream patches (lookaside cache) BuildRequires: desktop-file-utils @@ -191,6 +195,9 @@ done %changelog +* Tue Jan 24 2023 Marc Deop - 22.12.1-3 +- Add upstream patch + * Thu Jan 19 2023 Fedora Release Engineering - 22.12.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild