Accepting request 951046 from KDE:Applications

KDE Gear 21.12.2

OBS-URL: https://build.opensuse.org/request/show/951046
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio-extras5?expand=0&rev=106

0001-sftp-Allow-compression-if-necessary.patch

@@ -1,43 +0,0 @@
-From f3ad370f237c69c018c968bab6f79b16c27edbba Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Tue, 16 Nov 2021 08:35:45 +0100
-Subject: [PATCH] sftp: Allow compression if necessary
-
-Specifying only "none" as compression method causes the exchange to fail if
-the server doesn't support "none".
-
-Use the same options as OpenSSH does by default. The Compression=yes/no option
-in the config file overrides them if specified.
-
-Setting the options explicitly can be dropped in the future after libssh
-adjusts its built-in defaults.
-
-(cherry picked from commit c5a9722de86f111ded36488e9bb676a70e80aea0)
----
- sftp/kio_sftp.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/sftp/kio_sftp.cpp b/sftp/kio_sftp.cpp
-index 1afc51f5..c90aab76 100644
---- a/sftp/kio_sftp.cpp
-+++ b/sftp/kio_sftp.cpp
-@@ -592,13 +592,13 @@ Result SFTPInternal::sftpOpenConnection(const AuthInfo &info)
-         return Result::fail(KIO::ERR_INTERNAL, i18n("Could not disable Nagle's Algorithm."));
-     }
- 
--    // Don't use any compression
--    rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_C_S, "none");
-+    // Prefer not to use compression
-+    rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_C_S, "none,zlib@openssh.com,zlib");
-     if (rc < 0) {
-         return Result::fail(KIO::ERR_INTERNAL, i18n("Could not set compression."));
-     }
- 
--    rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_S_C, "none");
-+    rc = ssh_options_set(mSession, SSH_OPTIONS_COMPRESSION_S_C, "none,zlib@openssh.com,zlib");
-     if (rc < 0) {
-         return Result::fail(KIO::ERR_INTERNAL, i18n("Could not set compression."));
-     }
--- 
-2.33.1
-

kio-extras-21.12.1.tar.xz

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

kio-extras-21.12.1.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmHTkvsACgkQu0YzUNbv
-Me//ow/9FpJ4+IPBMN3c7pWkiXYCCgrNWrCzDfEIZr5QAKt5LHCNinKMMqJUDSQd
-mQNWtr4Hk9UcSblZjinkpNUexZ1/6KTnAjCMOaahw4KHbWVDUoaUsKxDZxMmHAc0
-T/JNuDxMeniI/MNZ1AlqcLEKalp0UZDn76ySJAyYld2Y1y+P3m0j4rLC/BabDN2h
-gzmg+pL/PeDo7RLl0/zQN9ctaIi0VGSgaZWZi1o85wQPrezpzwDdYEcxVCd33zO0
-XufOSSCPWnwJQPDbfjI3pAmNgaQhZxpJ9t8Fs/+VeRYWSwZJ4+A/Fww5ohyzJPhi
-hvVC8l5QXACvNL0nKPcw1mCmJYrgDxqjk8eZbC+372Te2yrYtCi1KH4sBvaWlPhc
-NrsiWr4kOo8xebWAmvcLHMl8mdElBPP5f2ZSm8IQXY9O1w8qHpOR/NtkeSNFjuLd
-pA+a66UmKpEU88Vdh+CoiQ96f9RaqcJi4UEUkVn4OO5iVwZ6lOzFGuP8LUQSCPly
-JVBl0/zKsb4n2XVAY3wLpSOqriCRfKKY1oDhoOOq8To2r+4R3T7ihIvR+GTenX39
-eBttDuHM1QUq0MXu9hsN6TYP2Kj4QIlHnwUkFGcGd+/YZV7isS89CUOMXMWqFQGk
-HKO6mtJUIqtt2rNoVgmHvp1lajyzy2+CUFeZgQJjxy5ptOR+NmQ=
-=Whac
------END PGP SIGNATURE-----

kio-extras-21.12.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:44e2d6f5ad926b77e74be5bf235a02ef83cd396bcb01bed9b15b8b4938676304
+size 633504

kio-extras-21.12.2.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmH4eukACgkQu0YzUNbv
+Me/tSxAAhoqhCkJgJxjiQsmRWfVF8cY8YKyQjtrlKtjU/uumcACf50Rge8mRqfWb
+l/iWzcIhaHtSImHuzfEl6BSTE3mqNdLwTCZ1wNmVFodrWm3hfGiOHLYG80d3/R5o
+nUSc2Gl3mKjENsjQzgbyH9zEPm4+ggSu4bsx3kgCd97n1t/X6/fvFC4TzuNcDh6z
+RsK9eVUgvnmvmjtECfUB3kDXJHTt/BFPyYUpsKPm2T0xtcYAZLFVpj1Lj7ObHbgO
+iyUd2daTjE+NUIWaBJczYwh4mz1aIpNlErEywpaNZPQzUaUMEQRLTIfPr9E3btWI
+LSJwtRUVSIJFg1IVuF/iPOThTkA5Gnm9/PuUobY3bQ4UmGa1vyURUNALAJnrSoxa
+2gI273vriEeQ9khy2HVrLFTWZ5lKDJfKoRqh6sm8fMRXecjnoAMtkYVhPOIJ2Yoh
+6NtwN+heTfgPD01qz0C6+FiZhcL/N0/Y9VRKvxt/20QwEfOIJH+D3r6EUqdRIBqs
+TACUvPw5wNHckCCeAH6rEv1OKN9s8URrLRRkY7D6SACvi8X1NuaCwLIYyytadIUQ
+EnxedTuawqqpEsf1HxMWBvrMxbyvQE3TDfsfZ4eGlq8scNVp0N/pfFptDJAvX9me
+/4bID261NIHKgFqbjIMCBk5CETFnKpNtRo97rO7UkvOswo02Xck=
+=drBG
+-----END PGP SIGNATURE-----

kio-extras5.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Feb  1 13:03:04 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 21.12.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/21.12.2/
+- Changes since 21.12.1:
+  * sftp: Don't compare size_t against -1
+  * sftp: Allow compression if necessary
+- Drop upstream patch:
+  * 0001-sftp-Allow-compression-if-necessary.patch
+
 -------------------------------------------------------------------
 Wed Jan  5 13:50:36 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
 

kio-extras5.spec

@@ -21,7 +21,7 @@
 %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
 %bcond_without released
 Name:           kio-extras5
-Version:        21.12.1
+Version:        21.12.2
 Release:        0
 Summary:        Additional KIO slaves for KDE applications
 License:        GPL-2.0-or-later
@@ -33,8 +33,6 @@ Source1:        https://download.kde.org/stable/release-service/%{version}/src/%
 Source2:        applications.keyring
 %endif
 Source99:       %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-sftp-Allow-compression-if-necessary.patch
 # openEXR causes build issues for Leap 15.2 & 15.3
 %if 0%{?suse_version} > 1500
 BuildRequires:  OpenEXR-devel