From df18203f434b45dc0f5f7864018f1122e02d0f17b9b45312a7f2820e40548be6 Mon Sep 17 00:00:00 2001
From: Luca Beltrame <lbeltrame@kde.org>
Date: Mon, 20 Mar 2017 15:24:26 +0000
Subject: [PATCH] - Drop sanitize-url-for-proxy.patch, merged upstream

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=172
---
 kio.changes                  |  5 +++++
 kio.spec                     |  3 ---
 sanitize-url-for-proxy.patch | 40 ------------------------------------
 3 files changed, 5 insertions(+), 43 deletions(-)
 delete mode 100644 sanitize-url-for-proxy.patch

diff --git a/kio.changes b/kio.changes
index 615378b..e022bae 100644
--- a/kio.changes
+++ b/kio.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/kio.spec b/kio.spec
index e484f0a..310f8fd 100644
--- a/kio.spec
+++ b/kio.spec
@@ -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
diff --git a/sanitize-url-for-proxy.patch b/sanitize-url-for-proxy.patch
deleted file mode 100644
index 835f962..0000000
--- a/sanitize-url-for-proxy.patch
+++ /dev/null
@@ -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()) {