From 8c6dbe66123bf5306b7b35717ab96a5d1130880cccf04644e38539d6f54f9a93 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Sun, 21 Dec 2014 10:59:33 +0000
Subject: [PATCH] Accepting request 265490 from KDE:Frameworks5

Update to 5.1.2

OBS-URL: https://build.opensuse.org/request/show/265490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio-extras5?expand=0&rev=14
---
 kio-extras-5.1.1.tar.xz |  3 ---
 kio-extras-5.1.2.tar.xz |  3 +++
 kio-extras5.changes     | 10 ++++++++++
 kio-extras5.spec        |  5 +----
 sanitize_path.patch     | 31 -------------------------------
 5 files changed, 14 insertions(+), 38 deletions(-)
 delete mode 100644 kio-extras-5.1.1.tar.xz
 create mode 100644 kio-extras-5.1.2.tar.xz
 delete mode 100644 sanitize_path.patch

diff --git a/kio-extras-5.1.1.tar.xz b/kio-extras-5.1.1.tar.xz
deleted file mode 100644
index 755014b..0000000
--- a/kio-extras-5.1.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a97b519bdb83a721c83732dee5fa72dc2116eb3e5a3eb1904d8f66fb6d0a1b15
-size 485648
diff --git a/kio-extras-5.1.2.tar.xz b/kio-extras-5.1.2.tar.xz
new file mode 100644
index 0000000..3360c52
--- /dev/null
+++ b/kio-extras-5.1.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1f00f6d661b465d2053fa68e32dead851e272e71d493945d5e8ab516b5f69e34
+size 487412
diff --git a/kio-extras5.changes b/kio-extras5.changes
index 06ca8a2..7543201 100644
--- a/kio-extras5.changes
+++ b/kio-extras5.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Dec 11 17:59:55 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.1.2:
+  * Bugfix release
+  * Fixed CVE-2014-8600
+  * For more details please see:
+    https://www.kde.org/announcements/plasma-5.1.2.php
+- Drop sanitize_path.patch, merged upstream
+
 -------------------------------------------------------------------
 Thu Nov 13 22:15:00 UTC 2014 - hrvoje.senjan@gmail.com
 
diff --git a/kio-extras5.spec b/kio-extras5.spec
index 93b7626..24c44c2 100644
--- a/kio-extras5.spec
+++ b/kio-extras5.spec
@@ -17,7 +17,7 @@
 
 
 Name:           kio-extras5
-Version:        5.1.1
+Version:        5.1.2
 Release:        0
 Summary:        Additional KIO-slaves for KDE applications
 License:        GPL-2.0+
@@ -35,8 +35,6 @@ Patch2:         0003-don-t-screw-up-the-filenames.patch
 Patch3:         0004-Added-support-for-NFSv3-major-refactoring-fixed-bugs.patch
 # PATCH-FIX-UPSTREAM 0005-kio_sftp-Use-the-right-type-for-timeout_sec-and-time.patch
 Patch4:         0005-kio_sftp-Use-the-right-type-for-timeout_sec-and-time.patch
-# PATCH-FIX-UPSTREAM sanitize_path.patch
-Patch5:         sanitize_path.patch
 BuildRequires:  OpenEXR-devel
 BuildRequires:  karchive-devel
 BuildRequires:  kconfig-devel
@@ -86,7 +84,6 @@ Additional KIO-slaves for KDE applications.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt
 
 %build
diff --git a/sanitize_path.patch b/sanitize_path.patch
deleted file mode 100644
index 2d17527..0000000
--- a/sanitize_path.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Martin Sandsmark <martin.sandsmark@kde.org>
-Date: Thu, 13 Nov 2014 12:42:49 +0000
-Subject: Sanitize path
-X-Git-Url: http://quickgit.kde.org/?p=kio-extras.git&a=commitdiff&h=13155c8eb71d1c946bea21c38ea0f8ca7c7013cd
----
-Sanitize path
-
-Reviewed at security@kde.org
----
-
-
---- a/bookmarks/kio_bookmarks.cpp
-+++ b/bookmarks/kio_bookmarks.cpp
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- 
- #include <qregexp.h>
-+#include <qtextdocument.h>
- #include <qurlquery.h>
- 
- #include <kapplication.h>
-@@ -198,7 +199,7 @@
-     echoImage(regexp.cap(1), regexp.cap(2), QUrlQuery(url).queryItemValue("size"));
-   } else {
-     echoHead();
--    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
-+    echo("<p class=\"message\">" + i18n("Wrong request: %1", Qt::escape(url.toDisplayString())) + "</p>");
-   }
-   finished();
- }
-