From aa13d547f2b0a150daae98a87b67bef7235bc879 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 17 May 2022 13:08:47 +0200 Subject: [PATCH 01/15] Rebuild (qt5) --- kde-connect.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-connect.spec b/kde-connect.spec index 98c49d7..6dba5c5 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -5,7 +5,7 @@ Name: kde-connect Version: 22.04.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -190,6 +190,9 @@ done %changelog +* Tue May 17 2022 Jan Grulich - 22.04.1-3 +- Rebuild (qt5) + * Sun May 15 2022 Justin Zobel - 22.04.1-1 - Update to 22.04.1 From 3a6d73bdbd690e89f3ce2c312cb3211f4ccf869c Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 7 Jul 2022 16:39:35 +0200 Subject: [PATCH 02/15] 22.04.3 --- .gitignore | 1 + kde-connect.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 381f260..ae09e5f 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /kdeconnect-kde-21.12.3.tar.xz /kdeconnect-kde-22.04.1.tar.xz /kdeconnect-kde-22.04.1.tar.xz +/kdeconnect-kde-22.04.3.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index 6dba5c5..a3c33ea 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,8 +4,8 @@ %global module kdeconnect-kde Name: kde-connect -Version: 22.04.1 -Release: 3%{?dist} +Version: 22.04.3 +Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -190,6 +190,9 @@ done %changelog +* Thu Jul 07 2022 Than Ngo - 22.04.3-1 +- 22.04.3 + * Tue May 17 2022 Jan Grulich - 22.04.1-3 - Rebuild (qt5) diff --git a/sources b/sources index bf6ee16..30dbad8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdeconnect-kde-22.04.1.tar.xz) = 98c81deb2b97c5b24d6bbdfcb3a7efba487ae212cae7c8449b1b8d91cf61fbd485225f1f38139425ea6cd8736a617452daa2cf6c84ffbda57c2830d420038c27 +SHA512 (kdeconnect-kde-22.04.3.tar.xz) = b09577ee6e5cc9fb73a3691ddaf55a7e7e33dc599db9abeffeb1fa812867c96290af7d445a39da6b2309a84c21d777ecccdf4f0f3c02e3723d9793f8e4775a36 From 6c15555e78f5dfd43272692fc4629358aff21f45 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Thu, 14 Jul 2022 15:03:24 +0200 Subject: [PATCH 03/15] Rebuild (qt5) --- kde-connect.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-connect.spec b/kde-connect.spec index a3c33ea..a216610 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -5,7 +5,7 @@ Name: kde-connect Version: 22.04.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -190,6 +190,9 @@ done %changelog +* Thu Jul 14 2022 Jan Grulich - 22.04.3-2 +- Rebuild (qt5) + * Thu Jul 07 2022 Than Ngo - 22.04.3-1 - 22.04.3 From 5e57fc7304d87bcc9cd7b0a19de79327a38f2c80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:43:06 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 a216610..a48b852 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -5,7 +5,7 @@ Name: kde-connect Version: 22.04.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -190,6 +190,9 @@ done %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 22.04.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jul 14 2022 Jan Grulich - 22.04.3-2 - Rebuild (qt5) From 36697996f5773261d0feb7e7df34de20f4ecfa83 Mon Sep 17 00:00:00 2001 From: Marc Deop Date: Sun, 21 Aug 2022 22:56:59 +0200 Subject: [PATCH 05/15] 22.08.0 --- .gitignore | 1 + kde-connect.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ae09e5f..7a55a14 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /kdeconnect-kde-22.04.1.tar.xz /kdeconnect-kde-22.04.1.tar.xz /kdeconnect-kde-22.04.3.tar.xz +/kdeconnect-kde-22.08.0.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index a48b852..a390e3d 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,8 +4,8 @@ %global module kdeconnect-kde Name: kde-connect -Version: 22.04.3 -Release: 3%{?dist} +Version: 22.08.0 +Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -56,6 +56,7 @@ BuildRequires: cmake(Qt5Test) BuildRequires: cmake(Qt5X11Extras) # wayland/clipboard deps BuildRequires: cmake(Qt5WaylandClient) +BuildRequires: cmake(PlasmaWaylandProtocols) BuildRequires: pkgconfig(wayland-client) BuildRequires: qt5-qtbase-private-devel @@ -190,6 +191,9 @@ done %changelog +* Fri Aug 19 2022 Marc Deop - 22.08.0-1 +- 22.08.0 + * Thu Jul 21 2022 Fedora Release Engineering - 22.04.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 30dbad8..2fea10b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdeconnect-kde-22.04.3.tar.xz) = b09577ee6e5cc9fb73a3691ddaf55a7e7e33dc599db9abeffeb1fa812867c96290af7d445a39da6b2309a84c21d777ecccdf4f0f3c02e3723d9793f8e4775a36 +SHA512 (kdeconnect-kde-22.08.0.tar.xz) = eb468d724e071c461d78ae8726359a5870ba61d4895d98ee45dc5f9aca465a5645024130118d177a115803b642d691c8dd8d7fdcbdef1c0902e5cf72e8b3a8a2 From f32b3ff45e453d0d567f3bd16daa67d3a5b82e96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Thu, 8 Sep 2022 14:12:52 +0200 Subject: [PATCH 06/15] 22.08.1 --- .gitignore | 1 + kde-connect.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7a55a14..9e22ae3 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /kdeconnect-kde-22.04.1.tar.xz /kdeconnect-kde-22.04.3.tar.xz /kdeconnect-kde-22.08.0.tar.xz +/kdeconnect-kde-22.08.1.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index a390e3d..fb0db81 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,7 +4,7 @@ %global module kdeconnect-kde Name: kde-connect -Version: 22.08.0 +Version: 22.08.1 Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -191,6 +191,9 @@ done %changelog +* Thu Sep 08 2022 Marc Deop - 22.08.1-1 +- 22.08.1 + * Fri Aug 19 2022 Marc Deop - 22.08.0-1 - 22.08.0 diff --git a/sources b/sources index 2fea10b..36a5a33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdeconnect-kde-22.08.0.tar.xz) = eb468d724e071c461d78ae8726359a5870ba61d4895d98ee45dc5f9aca465a5645024130118d177a115803b642d691c8dd8d7fdcbdef1c0902e5cf72e8b3a8a2 +SHA512 (kdeconnect-kde-22.08.1.tar.xz) = 7089ca8ed7c3c48d77fab1a4d8e1086fc56c6b34ef8995d47c1d7f4fa589298150387e977dfae6a7497d48c65e5b059446caac10107b5c836bf3836779bba05c From 6e73e216a5e61d64fd436d1df993c3265e27870e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 15 Oct 2022 13:25:47 +0200 Subject: [PATCH 07/15] 22.08.2 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9e22ae3..9abfa88 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ /kdeconnect-kde-22.04.3.tar.xz /kdeconnect-kde-22.08.0.tar.xz /kdeconnect-kde-22.08.1.tar.xz +/kdeconnect-kde-22.08.2.tar.xz diff --git a/sources b/sources index 36a5a33..3880572 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdeconnect-kde-22.08.1.tar.xz) = 7089ca8ed7c3c48d77fab1a4d8e1086fc56c6b34ef8995d47c1d7f4fa589298150387e977dfae6a7497d48c65e5b059446caac10107b5c836bf3836779bba05c +SHA512 (kdeconnect-kde-22.08.2.tar.xz) = 45f38a6704c3d57cbb8e1d87eea3ee0d3da0b438e6f2ce156ad0de5c64743d4e3b95c0695419c2d6acfcdd26813d5775be27a7c11ba4bf367a7e7940ba6b4bf0 From c5f789505bd9d12a310c38b68cbef7a68b65953c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Sat, 15 Oct 2022 13:35:54 +0200 Subject: [PATCH 08/15] fix: update spec file --- kde-connect.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kde-connect.spec b/kde-connect.spec index fb0db81..da16bef 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,7 +4,7 @@ %global module kdeconnect-kde Name: kde-connect -Version: 22.08.1 +Version: 22.08.2 Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -191,6 +191,9 @@ done %changelog +* Fri Oct 14 2022 Marc Deop - 22.08.2-1 +- 22.08.2 + * Thu Sep 08 2022 Marc Deop - 22.08.1-1 - 22.08.1 From a50fcb7c1ca6c51b40788930b393322b3de0cfa4 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Thu, 3 Nov 2022 16:24:11 +0100 Subject: [PATCH 09/15] 22.08.3 --- .gitignore | 1 + kde-connect.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 9abfa88..6f377d6 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /kdeconnect-kde-22.08.0.tar.xz /kdeconnect-kde-22.08.1.tar.xz /kdeconnect-kde-22.08.2.tar.xz +/kdeconnect-kde-22.08.3.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index da16bef..680f830 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,7 +4,7 @@ %global module kdeconnect-kde Name: kde-connect -Version: 22.08.2 +Version: 22.08.3 Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -191,6 +191,9 @@ done %changelog +* Thu Nov 03 2022 Than Ngo - 22.08.3-1 +- 22.08.3 + * Fri Oct 14 2022 Marc Deop - 22.08.2-1 - 22.08.2 diff --git a/sources b/sources index 3880572..74857a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdeconnect-kde-22.08.2.tar.xz) = 45f38a6704c3d57cbb8e1d87eea3ee0d3da0b438e6f2ce156ad0de5c64743d4e3b95c0695419c2d6acfcdd26813d5775be27a7c11ba4bf367a7e7940ba6b4bf0 +SHA512 (kdeconnect-kde-22.08.3.tar.xz) = 94df4dd19fce1cedeec3682b8b7d5eec7cd26fc6ffce75460d9a425fdd36d8bdc705467c4d3adb86512a5d40801b325e7d92e76d13f6a58415a170873a0d40a0 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 10/15] 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 11/15] 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 12/15] 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 13/15] 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 From 1fdb342ff299e0bea4015a2b90482623de46d872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Tue, 31 Jan 2023 22:15:24 +0100 Subject: [PATCH 14/15] 22.12.2 --- .gitignore | 1 + a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff | 12 ------------ kde-connect.spec | 11 +++++------ sources | 4 +--- 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff diff --git a/.gitignore b/.gitignore index a35be32..e314652 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /kdeconnect-kde-22.08.3.tar.xz /kdeconnect-kde-22.12.0.tar.xz /kdeconnect-kde-22.12.1.tar.xz +/kdeconnect-kde-22.12.2.tar.xz diff --git a/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff b/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff deleted file mode 100644 index 317f5c1..0000000 --- a/a7c17468f0bf16e4ed87c093dac0b77749c61d50.diff +++ /dev/null @@ -1,12 +0,0 @@ -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 5c21a8f..eadaa35 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,8 +4,8 @@ %global base_name kdeconnect-kde Name: kde-connect -Version: 22.12.1 -Release: 3%{?dist} +Version: 22.12.2 +Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -18,10 +18,6 @@ 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 @@ -195,6 +191,9 @@ done %changelog +* Tue Jan 31 2023 Marc Deop - 22.12.2-1 +- 22.12.2 + * Tue Jan 24 2023 Marc Deop - 22.12.1-3 - Add upstream patch diff --git a/sources b/sources index a6a5cc0..b38ef50 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -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 +SHA512 (kdeconnect-kde-22.12.2.tar.xz) = 7c9cd7c6a0912d68c6fff0d92b1e311aff89db8243c76c39faaa35a51c8b4fde31e58ac32a3c19e0cb06046beefac1037fbcdf02e123c53f558d0050c2914b4c From 175f548f97683bad5b41449d09ecdbaeef097dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Deop=20i=20Argem=C3=AD?= Date: Thu, 2 Mar 2023 15:28:44 +0100 Subject: [PATCH 15/15] feat: 22.12.3 --- .gitignore | 1 + kde-connect.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e314652..3907df0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /kdeconnect-kde-22.12.0.tar.xz /kdeconnect-kde-22.12.1.tar.xz /kdeconnect-kde-22.12.2.tar.xz +/kdeconnect-kde-22.12.3.tar.xz diff --git a/kde-connect.spec b/kde-connect.spec index eadaa35..9456f41 100644 --- a/kde-connect.spec +++ b/kde-connect.spec @@ -4,7 +4,7 @@ %global base_name kdeconnect-kde Name: kde-connect -Version: 22.12.2 +Version: 22.12.3 Release: 1%{?dist} License: GPLv2+ Summary: KDE Connect client for communication with smartphones @@ -191,6 +191,9 @@ done %changelog +* Thu Mar 02 2023 Marc Deop i Argemí - 22.12.3-1 +- 22.12.3 + * Tue Jan 31 2023 Marc Deop - 22.12.2-1 - 22.12.2 diff --git a/sources b/sources index b38ef50..7e7b184 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (kdeconnect-kde-22.12.2.tar.xz) = 7c9cd7c6a0912d68c6fff0d92b1e311aff89db8243c76c39faaa35a51c8b4fde31e58ac32a3c19e0cb06046beefac1037fbcdf02e123c53f558d0050c2914b4c +SHA512 (kdeconnect-kde-22.12.3.tar.xz) = 2a6e0b76c49200662c2dcc7ce1ab60e6292d76727197f1b5cd8426422175180226a2b351b21bc947162d61358f906c319369f417c10561d2e9267f95912a629a