diff --git a/0001-Fix-kio-using-only-tls1.0.patch b/0001-Fix-kio-using-only-tls1.0.patch deleted file mode 100644 index ce09609..0000000 --- a/0001-Fix-kio-using-only-tls1.0.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/Fix-launching-terminal-desktop-files-with-konsole.patch b/Fix-launching-terminal-desktop-files-with-konsole.patch deleted file mode 100644 index 12c685f..0000000 --- a/Fix-launching-terminal-desktop-files-with-konsole.patch +++ /dev/null @@ -1,26 +0,0 @@ -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-5.26.0.tar.xz b/kio-5.26.0.tar.xz deleted file mode 100644 index 461f789..0000000 --- a/kio-5.26.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:40d546074af313be97f64b644daad46fc9c287dbcf4bc41ca9fb5ff6c02976cf -size 2953124 diff --git a/kio-5.27.0.tar.xz b/kio-5.27.0.tar.xz new file mode 100644 index 0000000..c014357 --- /dev/null +++ b/kio-5.27.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3627f362c4aa31fa6bc96d66003492ebeac1c334dbb71ee2d80091c0157d3a89 +size 3118268 diff --git a/kio.changes b/kio.changes index b8ce9b2..9cc6b43 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Oct 9 12:56:16 UTC 2016 - hrvoje.senjan@gmail.com + +- Update to 5.27.0 + * Fix KIO slaves using only tls1.0 + * Fix ABI break in kio + * KFileItemActions: add addPluginActionsTo(QMenu *) + * Show copy buttons only after checksum has been calculated + * Add missing feedback when computing a checksum (kde#368520) + * Fix KFileItem::overlays returning empty string values + * Fix launching terminal .desktop files with konsole + * Classify nfs4 mounts as probablySlow, like nfs/cifs/.. + * KNewFileMenu: show New Folder action shortcut (kde#366075) + * For more details please see: + https://www.kde.org/announcements/kde-frameworks-5.27.0.php +- Drop upstreamed 0001-Fix-kio-using-only-tls1.0.patch and + Fix-launching-terminal-desktop-files-with-konsole.patch + ------------------------------------------------------------------- Sun Oct 9 09:08:59 UTC 2016 - fabian@ritter-vogt.de diff --git a/kio.spec b/kio.spec index 4454508..8b2b5c4 100644 --- a/kio.spec +++ b/kio.spec @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.26 +%define _tar_path 5.27 Name: kio -Version: 5.26.0 +Version: 5.27.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 2.8.12 @@ -75,10 +75,6 @@ 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 @@ -125,8 +121,6 @@ Development files. %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build %cmake_kf5 -d build