Accepting request 481518 from KDE:Frameworks5

KDE Frameworks 5.32.0

OBS-URL: https://build.opensuse.org/request/show/481518
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=44
This commit is contained in:
Yuchen Lin 2017-03-28 13:10:42 +00:00 committed by Git OBS Bridge
commit 5052b1bd74
5 changed files with 56 additions and 50 deletions

View File

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

3
kio-5.32.0.tar.xz Normal file
View File

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

View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Mon Mar 20 15:24:03 UTC 2017 - lbeltrame@kde.org
- Drop sanitize-url-for-proxy.patch, merged upstream
-------------------------------------------------------------------
Sun Mar 19 14:50:47 CET 2017 - lbeltrame@kde.org
- Update to 5.32.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.32.0.php
- Changes since 5.31.0:
* Too many changes to list here
* Commit translations from l10n-kf5
* Cookies KCM: disable "delete" button when there is no current item
* Use the new shared library exported by KDocTools
* Upgrade ECM and KF5 version requirements for 5.32.0 release.
* Sanitize URLs before passing them to FindProxyForURL
* make sure the cancel action is last
* kio_help: use doOutputBuffer and simplify unicodeError
* rename support: emit proper URL in FileRenamed
* fix rename support: keep trashId rather than expecting it as input
* remote: remove unused include
* remote: remove redundant check
* remote: rename kded module to allow co-installability with plasma-workspace <= 5.9
* remote: use QUrl::fromLocalFile()
* remote: just check if file exists
* remote: use QDir::mkpath() to create the remoteview folder
* remote: drop Messages.sh
* remote: use same debug category as other slaves
* remote: use json protocol
* remote: don't redefine TRANSLATION_DOMAIN
* remote: slots -> Q_SLOTS
* Import remote ioslave from plasma-workspace
* Fix TODO. We depend on Qt 5.3 by now
* kio_trash: implement renaming of toplevel files and dirs
* [PreviewJob] Remove maximum size for local files by default
* allow to add application actions on an open menu
* Port another use of QDateTime to QElapsedTimer. With proper / 1000 this time :)
* Fixup previous commit to slave.cpp, divide by 1000 was missing.
* [autotest] KTcpSocketTest was racy and leaky => simplify, fix.
* Port from QDateTime::currentDateTime() to QElapsedTimer
* Upgrade KF5 version to 5.32.0.
* Fix double export in already-exported class
* deprecate DrawFrame, as discussed in https://git.reviewboard.kde.org/r/129921/
-------------------------------------------------------------------
Wed Mar 1 21:02:49 UTC 2017 - fabian@ritter-vogt.de

View File

@ -17,9 +17,9 @@
%bcond_without lang
%define _tar_path 5.31
%define _tar_path 5.32
Name: kio
Version: 5.31.0
Version: 5.32.0
Release: 0
%define kf5_version %{version}
BuildRequires: cmake >= 3.0
@ -75,8 +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 sanitize-url-for-proxy.patch
Patch1: sanitize-url-for-proxy.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -123,7 +121,6 @@ Development files.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
%cmake_kf5 -d build
@ -226,8 +223,10 @@ echo "%doc %lang(uk) %{_kf5_mandir}/uk" >>%{name}5.lang
%dir %{_kf5_plugindir}/kf5/kded
%{_kf5_plugindir}/kf5/kded/kcookiejar.so
%{_kf5_plugindir}/kf5/kded/proxyscout.so
%{_kf5_plugindir}/kf5/kded/remotenotifier.so
%{_kf5_plugindir}/kf5/kiod/kpasswdserver.so
%{_kf5_plugindir}/kf5/urifilters/
%{_kf5_plugindir}/kf5/kio/remote.so
%{_kf5_servicesdir}/cache.desktop
%{_kf5_servicesdir}/cookies.desktop
%{_kf5_servicesdir}/fixhosturifilter.desktop

View File

@ -1,40 +0,0 @@
From f9d0cb47cf94e209f6171ac0e8d774e68156a6e4 Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <aacid@kde.org>
Date: Tue, 28 Feb 2017 19:00:48 +0100
Subject: [PATCH] Sanitize URLs before passing them to FindProxyForURL
Remove user/password information
For https: remove path and query
Thanks to safebreach.com for reporting the problem
CCMAIL: yoni.fridburg@safebreach.com
CCMAIL: amit.klein@safebreach.com
CCMAIL: itzik.kotler@safebreach.com
---
src/kpac/script.cpp | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/kpac/script.cpp b/src/kpac/script.cpp
index a0235f7..2485c54 100644
--- a/src/kpac/script.cpp
+++ b/src/kpac/script.cpp
@@ -754,9 +754,16 @@ QString Script::evaluate(const QUrl &url)
}
}
+ QUrl cleanUrl = url;
+ cleanUrl.setUserInfo(QString());
+ if (cleanUrl.scheme() == QLatin1String("https")) {
+ cleanUrl.setPath(QString());
+ cleanUrl.setQuery(QString());
+ }
+
QScriptValueList args;
- args << url.url();
- args << url.host();
+ args << cleanUrl.url();
+ args << cleanUrl.host();
QScriptValue result = func.call(QScriptValue(), args);
if (result.isError()) {