From owner-svn-ports-head@FreeBSD.ORG  Thu Nov 20 21:31:56 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1F55F1E4;
 Thu, 20 Nov 2014 21:31:56 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id E67FEF65;
 Thu, 20 Nov 2014 21:31:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAKLVtJi099965;
 Thu, 20 Nov 2014 21:31:55 GMT (envelope-from rakuco@FreeBSD.org)
Received: (from rakuco@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAKLVtlv099958;
 Thu, 20 Nov 2014 21:31:55 GMT (envelope-from rakuco@FreeBSD.org)
Message-Id: <201411202131.sAKLVtlv099958@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: rakuco set sender to
 rakuco@FreeBSD.org using -f
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Thu, 20 Nov 2014 21:31:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r372966 - in head/x11/kde4-runtime: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Nov 2014 21:31:56 -0000

Author: rakuco
Date: Thu Nov 20 21:31:54 2014
New Revision: 372966
URL: https://svnweb.freebsd.org/changeset/ports/372966
QAT: https://qat.redports.org/buildarchive/r372966/

Log:
  Add upstream patch for CVE-2014-8600 (insufficient input validation).
  
  MFH:		2014Q4
  Security:	890b6b22-70fa-11e4-91ae-5453ed2e2b49

Added:
  head/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp   (contents, props changed)
Modified:
  head/x11/kde4-runtime/Makefile

Modified: head/x11/kde4-runtime/Makefile
==============================================================================
--- head/x11/kde4-runtime/Makefile	Thu Nov 20 21:31:17 2014	(r372965)
+++ head/x11/kde4-runtime/Makefile	Thu Nov 20 21:31:54 2014	(r372966)
@@ -2,7 +2,7 @@
 
 PORTNAME=	kde-runtime
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}

Added: head/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11/kde4-runtime/files/patch-kioslave__bookmarks__kio_bookmarks.cpp	Thu Nov 20 21:31:54 2014	(r372966)
@@ -0,0 +1,25 @@
+commit d68703900edc8416fbcd2550cd336cbbb76decb9
+Author: Martin Sandsmark <martin.sandsmark@kde.org>
+Date:   Thu Nov 13 13:29:01 2014 +0100
+
+    Sanitize path
+
+--- kioslave/bookmarks/kio_bookmarks.cpp
++++ 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 @@ void BookmarksProtocol::get( const KUrl& url )
+     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();
+ }