Accepting request 944335 from KDE:Applications
KDE Gear 21.12.1 OBS-URL: https://build.opensuse.org/request/show/944335 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio-extras5?expand=0&rev=105
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
3afb113091
43
0001-sftp-Allow-compression-if-necessary.patch
Normal file
43
0001-sftp-Allow-compression-if-necessary.patch
Normal file
@ -0,0 +1,43 @@
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:246234481d7a8ad4047b46cd7dde6b3eb4a7507122a0eb6df73893749ad19c96
|
||||
size 633524
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAmGpY3cACgkQOmpNuDnq
|
||||
pteDfw//ZfvJAPKF4ADhBo1o9HIc2qJSzgJ8C+hVeLL4DPxu6ep6wLqhOIJj0BgY
|
||||
+kCl93zAJTrdbXAxtcG9UYqEOIX9VYVHsOX/zqWdSGRe4PvWsYn+qyR+UDL/hj43
|
||||
s6BJA21F2QcXsyTqlCLmOPB3y0k1zBG2PLg2btgGbAbVlbnK5hoVw7hbpkFH3hqe
|
||||
AXh/xrSl1AKqOobclm+SIpN/qb/INcrqewlyqsKt/jSBS6OSv0coKOW0MsNH/g/c
|
||||
l9Lto0zKRSo8XmA2ZCgcHKwl0ixEqlcTZU60CIqq9RZn2pE+kJ/C897OG1Hj1tiR
|
||||
IflYldwK69TMiJP+N/04S7p5l1sjsxUOfTYEcVXgwOKVsX//GidbKvdMKnel3VAE
|
||||
eOjZWpuNItCVT0baceATY+39SJDyP8Mj7QITchpywgVp8QG3CERzeUbDKudL3fLM
|
||||
zJ1hGhrQp4W9b43nzX7U274+J5E9WQsvcF6WYFTX8EYfEeqEcTyDoxFzVHGQRlO8
|
||||
qL/1YEBfvYAK7/nMvNOUvwfCwZKxmIynPWC4JN7rUUw6d0RiurT8N1NFnJeOuK2o
|
||||
enyDbQpYFIzuOrj2+RT1lp1Dk2WHYd9LqEYu7RTaBSgHtyg9B4PGoMaf713r0fxh
|
||||
jnyE8R/tbCjkcuS9XstJLDFE4MIkfnhiYlBGgoRHKyxFrWba7Uc=
|
||||
=m7m6
|
||||
-----END PGP SIGNATURE-----
|
||||
3
kio-extras-21.12.1.tar.xz
Normal file
3
kio-extras-21.12.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cc7d5465602c0cd26577a30572ebfa3141414828a360f17e6e456a2d6faa505f
|
||||
size 633924
|
||||
16
kio-extras-21.12.1.tar.xz.sig
Normal file
16
kio-extras-21.12.1.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----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-----
|
||||
@ -1,3 +1,20 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Jan 5 13:50:36 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Add patch to fix sftp connection if the server requires compression
|
||||
(boo#1192731):
|
||||
* 0001-sftp-Allow-compression-if-necessary.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 4 10:25:44 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 21.12.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/gear/21.12.1/
|
||||
- Changes since 21.12.0:
|
||||
* Fix SMB URL (kde#447319)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Dec 3 19:22:06 UTC 2021 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
@ -19,20 +19,22 @@
|
||||
%define rname kio-extras
|
||||
# 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}')}
|
||||
%bcond_without lang
|
||||
%bcond_without released
|
||||
Name: kio-extras5
|
||||
Version: 21.12.0
|
||||
Version: 21.12.1
|
||||
Release: 0
|
||||
Summary: Additional KIO slaves for KDE applications
|
||||
License: GPL-2.0-or-later
|
||||
Group: System/GUI/KDE
|
||||
URL: https://www.kde.org
|
||||
Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
|
||||
%if %{with lang}
|
||||
%if %{with released}
|
||||
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig
|
||||
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
|
||||
@ -112,7 +114,7 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
|
||||
|
||||
%install
|
||||
%kf5_makeinstall -C build
|
||||
%if %{with lang}
|
||||
%if %{with released}
|
||||
%{kf5_find_lang}
|
||||
%{kf5_find_htmldocs}
|
||||
%endif
|
||||
@ -148,7 +150,7 @@ sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
|
||||
%license LICENSES/*
|
||||
%{_libdir}/libkioarchive.so.5*
|
||||
|
||||
%if %{with lang}
|
||||
%if %{with released}
|
||||
%files lang -f %{name}.lang
|
||||
%endif
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user