pool/kio
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 434063 from KDE:Frameworks5:LTS

Browse Source 
- Add 0001-Fix-kio-using-only-tls1.0.patch

- Added Fix-launching-terminal-desktop-files-with-konsole.patch
  (kde#368949, boo#1003125)

OBS-URL: https://build.opensuse.org/request/show/434063
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2016-10-10 15:29:39 +00:00 committed by Git OBS Bridge
commit 48419901ee
4 changed files with 72 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-Fix-kio-using-only-tls1.0.patch Normal file
View File

@ -0,0 +1,29 @@
From 428b3b7b07a76a46e235cf9f491d1c1aa0bebf1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Mon, 26 Sep 2016 18:15:02 +0100
Subject: [PATCH] Fix kio using only tls1.0.
Now kio should use QSsl::SslProtocol::SecureProtocols which will deprecate
unsafe TLS versions when they are no longer safe.
REVIEW: 129031
---
src/core/tcpslavebase.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/core/tcpslavebase.cpp b/src/core/tcpslavebase.cpp
index b9be69d..27fe3d0 100644
--- a/src/core/tcpslavebase.cpp
+++ b/src/core/tcpslavebase.cpp
@@ -492,7 +492,7 @@ bool TCPSlaveBase::startSsl()
if (d->usingSSL) {
return false;
}
- return d->startTLSInternal(KTcpSocket::TlsV1) & ResultOk;
+ return d->startTLSInternal(KTcpSocket::SecureProtocols) & ResultOk;
}
TCPSlaveBase::SslResult TCPSlaveBase::TcpSlaveBasePrivate::startTLSInternal(KTcpSocket::SslVersion version,
--
2.10.0

26
Fix-launching-terminal-desktop-files-with-konsole.patch Normal file
View File

@ -0,0 +1,26 @@
From: Antonio Rojas <arojas@archlinux.org>
Date: Sat, 10 Sep 2016 22:14:56 +0000
Subject: Fix launching terminal .desktop files with konsole
X-Git-Tag: v5.27.0-rc1
X-Git-Url: http://quickgit.kde.org/?p=kio.git&a=commitdiff&h=c784a879eaba0babc6274bc32e761772add3d4f8
---
Fix launching terminal .desktop files with konsole
Launching .desktop files which have Terminal=true currently fails, because kio adds to the konsole command the obsolete KDE4 command line options,
which are not recognized by the KF5 konsole.
REVIEW: 128882
---
--- a/src/core/desktopexecparser.cpp
+++ b/src/core/desktopexecparser.cpp
@@ -363,7 +363,7 @@
if (!d->service.path().isEmpty()) {
terminal += " --workdir " + KShell::quoteArg(d->service.path());
}
- terminal += QLatin1String(" -caption=%c %i %m");
+ terminal += QLatin1String(" -qwindowtitle '%c' %i");
}
terminal += ' ';
terminal += d->service.terminalOptions();

11
kio.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sun Oct 9 09:08:59 UTC 2016 - fabian@ritter-vogt.de
- Add 0001-Fix-kio-using-only-tls1.0.patch
-------------------------------------------------------------------
Wed Oct 5 15:58:21 UTC 2016 - hrvoje.senjan@gmail.com
- Added Fix-launching-terminal-desktop-files-with-konsole.patch
(kde#368949, boo#1003125)
-------------------------------------------------------------------
Tue Sep 6 20:50:52 UTC 2016 - hrvoje.senjan@gmail.com

6
kio.spec
View File

@ -75,6 +75,10 @@ Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%
Source1: baselibs.conf
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
Patch0: kio_help-fallback-to-kde4-docs.patch
# PATCH-FIX-UPSTREAM Fix-launching-terminal-desktop-files-with-konsole.patch
Patch1: Fix-launching-terminal-desktop-files-with-konsole.patch
# PATCH-FIX-UPSTREAM 0001-Fix-kio-using-only-tls1.0.patch
Patch2: 0001-Fix-kio-using-only-tls1.0.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -121,6 +125,8 @@ Development files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%cmake_kf5 -d build