From 480206d47c5141ecab5f87c3f6956326c3ef797bc986e819df03af827cfa5c7d Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Wed, 5 Oct 2016 12:27:29 +0000 Subject: [PATCH 1/3] osc copypac from project:KDE:Frameworks5 package:kio revision:150 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kio?expand=0&rev=1 --- kio-4.96.0.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 kio-4.96.0.tar.xz diff --git a/kio-4.96.0.tar.xz b/kio-4.96.0.tar.xz new file mode 100644 index 0000000..5e9f6dd --- /dev/null +++ b/kio-4.96.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e556711d615832d7386a745810c27af7a3cefdaf8b0b93f31ddca7ed69a081d +size 797944 From 5345e8c3fee4461da9166d3493d5fde8ea9dab4915bd8c9471d900224d396871 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Wed, 5 Oct 2016 15:59:37 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kio?expand=0&rev=3 --- ...-terminal-desktop-files-with-konsole.patch | 26 +++++++++++++++++++ kio.changes | 6 +++++ kio.spec | 3 +++ 3 files changed, 35 insertions(+) create mode 100644 Fix-launching-terminal-desktop-files-with-konsole.patch diff --git a/Fix-launching-terminal-desktop-files-with-konsole.patch b/Fix-launching-terminal-desktop-files-with-konsole.patch new file mode 100644 index 0000000..12c685f --- /dev/null +++ b/Fix-launching-terminal-desktop-files-with-konsole.patch @@ -0,0 +1,26 @@ +From: Antonio Rojas +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(); diff --git a/kio.changes b/kio.changes index 2c16497..8cf22e8 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/kio.spec b/kio.spec index 11600c4..2e8baac 100644 --- a/kio.spec +++ b/kio.spec @@ -75,6 +75,8 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -121,6 +123,7 @@ Development files. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake_kf5 -d build From 7ec02dd1c08854ed8dafb077fa6b027a3eaf1b714b58d9559d5b485fcb859304 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Mon, 10 Oct 2016 06:59:31 +0000 Subject: [PATCH 3/3] Accepting request 434030 from home:Vogtinator:branches:KDE:Frameworks5:LTS Note to myself: Don't patch late at night... OBS-URL: https://build.opensuse.org/request/show/434030 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5:LTS/kio?expand=0&rev=4 --- 0001-Fix-kio-using-only-tls1.0.patch | 29 ++++++++++++++++++++++++++++ kio.changes | 5 +++++ kio.spec | 3 +++ 3 files changed, 37 insertions(+) create mode 100644 0001-Fix-kio-using-only-tls1.0.patch diff --git a/0001-Fix-kio-using-only-tls1.0.patch b/0001-Fix-kio-using-only-tls1.0.patch new file mode 100644 index 0000000..ce09609 --- /dev/null +++ b/0001-Fix-kio-using-only-tls1.0.patch @@ -0,0 +1,29 @@ +From 428b3b7b07a76a46e235cf9f491d1c1aa0bebf1e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= +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 + diff --git a/kio.changes b/kio.changes index 8cf22e8..b8ce9b2 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/kio.spec b/kio.spec index 2e8baac..4454508 100644 --- a/kio.spec +++ b/kio.spec @@ -77,6 +77,8 @@ Source1: baselibs.conf 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 @@ -124,6 +126,7 @@ Development files. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %cmake_kf5 -d build