4 files changed, 101 insertions, 2 deletions
diff --git a/kde-base/kdebase-kioslaves/ChangeLog b/kde-base/kdebase-kioslaves/ChangeLog
index 11024ab05df0..6942d82e222a 100644
--- a/kde-base/kdebase-kioslaves/ChangeLog
+++ b/kde-base/kdebase-kioslaves/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdebase-kioslaves
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.374 2014/11/14 19:33:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/ChangeLog,v 1.375 2014/11/16 12:21:27 alexxy Exp $
+
+*kdebase-kioslaves-4.14.3 (16 Nov 2014)
+
+  16 Nov 2014; Alexey Shvetsov <alexxy@gentoo.org>
+  +kdebase-kioslaves-4.14.3.ebuild:
+  Version bump KDE SC 4.14.3
 
   14 Nov 2014; Manuel Rüger <mrueg@gentoo.org> -kdebase-kioslaves-4.13.3.ebuild,
   -kdebase-kioslaves-4.14.1.ebuild:
diff --git a/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-CVE-2014-8600.patch b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-CVE-2014-8600.patch
new file mode 100644
index 000000000000..dcb20f8cb1f7
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/files/kdebase-kioslaves-CVE-2014-8600.patch
@@ -0,0 +1,29 @@
+From: Martin Sandsmark <martin.sandsmark@kde.org>
+Date: Thu, 13 Nov 2014 12:29:01 +0000
+Subject: Sanitize path
+X-Git-Url: http://quickgit.kde.org/?p=kde-runtime.git&a=commitdiff&h=d68703900edc8416fbcd2550cd336cbbb76decb9
+---
+Sanitize path
+---
+
+
+--- a/kioslave/bookmarks/kio_bookmarks.cpp
++++ b/kioslave/bookmarks/kio_bookmarks.cpp
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ 
+ #include <qregexp.h>
++#include <qtextdocument.h>
+ 
+ #include <kapplication.h>
+ #include <kcmdlineargs.h>
+@@ -197,7 +198,7 @@
+     echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size"));
+   } else {
+     echoHead();
+-    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
++    echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>");
+   }
+   finished();
+ }
+
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.2-r1.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.2-r1.ebuild
new file mode 100644
index 000000000000..ca7145d1b7b6
--- /dev/null
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.2-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.2-r1.ebuild,v 1.1 2014/11/16 12:21:27 alexxy Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-runtime"
+KMMODULE="kioslave"
+inherit kde4-meta
+
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+DESCRIPTION="kioslave: the kde VFS framework - kioslave plugins present a filesystem-like view of arbitrary data"
+IUSE="+bzip2 exif debug lzma minimal openexr samba +sftp"
+
+# tests hang, last checked for 4.2.96
+RESTRICT="test"
+
+DEPEND="
+	virtual/jpeg:0
+	!aqua? ( x11-libs/libXcursor )
+	bzip2? ( app-arch/bzip2 )
+	exif? ( media-gfx/exiv2:= )
+	openexr? ( media-libs/openexr:= )
+	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
+	sftp? ( >=net-libs/libssh-0.4.0:=[sftp] )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdelibs 'bzip2?,lzma?')
+	$(add_kdebase_dep kdialog)
+	virtual/ssh
+	!aqua? ( !kernel_SunOS? ( virtual/eject ) )
+"
+
+KMEXTRA="
+	kioexec
+	kdeeject
+"
+
+PATCHES=( "${FILESDIR}/${PN}-CVE-2014-8600.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DWITH_SLP=OFF
+		$(cmake-utils_use_with bzip2 BZip2)
+		$(cmake-utils_use_with exif Exiv2)
+		$(cmake-utils_use_with lzma LibLZMA)
+		$(cmake-utils_use_with openexr OpenEXR)
+		$(cmake-utils_use_with samba)
+		$(cmake-utils_use_with sftp LibSSH)
+	)
+	kde4-meta_src_configure
+}
+
+src_install() {
+	kde4-meta_src_install
+
+	if use minimal; then
+		rm "${D}"/usr/lib64/libmolletnetwork.so "${D}"/usr/share/config.kcfg/jpegcreatorsettings.kcfg
+		rmdir "${D}"/usr/share/config.kcfg/
+	fi
+}
diff --git a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.2.ebuild b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.3.ebuild
index 820c90f0d6b0..c87c9a919ab4 100644
--- a/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.2.ebuild
+++ b/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.2.ebuild,v 1.1 2014/10/25 19:58:28 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase-kioslaves/kdebase-kioslaves-4.14.3.ebuild,v 1.1 2014/11/16 12:21:27 alexxy Exp $
 
 EAPI=5
 
@@ -37,6 +37,8 @@ KMEXTRA="
 	kdeeject
 "
 
+PATCHES=( "${FILESDIR}/${PN}-CVE-2014-8600.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_SLP=OFF