From owner-svn-ports-all@FreeBSD.ORG Wed Jul 16 20:18:48 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0B861E1D; Wed, 16 Jul 2014 20:18:48 +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 EC53B2EC5; Wed, 16 Jul 2014 20:18:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GKIlXA084544; Wed, 16 Jul 2014 20:18:47 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GKIlVJ084540; Wed, 16 Jul 2014 20:18:47 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201407162018.s6GKIlVJ084540@svn.freebsd.org> From: Raphael Kubo da Costa Date: Wed, 16 Jul 2014 20:18:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r362106 - in branches/2014Q3/x11/kdelibs4: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jul 2014 20:18:48 -0000 Author: rakuco Date: Wed Jul 16 20:18:47 2014 New Revision: 362106 URL: http://svnweb.freebsd.org/changeset/ports/362106 QAT: https://qat.redports.org/buildarchive/r362106/ Log: MFH: r362104 Add patch to fix a SSL MITM vulnerability in the POP3 ioslave. Security: 4a114331-0d24-11e4-8dd2-5453ed2e2b49 Approved by: portmgr (erwin) Added: branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-3494 - copied unchanged from r362104, head/x11/kdelibs4/files/patch-CVE-2014-3494 Modified: branches/2014Q3/x11/kdelibs4/Makefile Directory Properties: branches/2014Q3/ (props changed) Modified: branches/2014Q3/x11/kdelibs4/Makefile ============================================================================== --- branches/2014Q3/x11/kdelibs4/Makefile Wed Jul 16 20:17:33 2014 (r362105) +++ branches/2014Q3/x11/kdelibs4/Makefile Wed Jul 16 20:18:47 2014 (r362106) @@ -3,7 +3,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 kde MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src DIST_SUBDIR= KDE/${PORTVERSION} Copied: branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-3494 (from r362104, head/x11/kdelibs4/files/patch-CVE-2014-3494) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q3/x11/kdelibs4/files/patch-CVE-2014-3494 Wed Jul 16 20:18:47 2014 (r362106, copy of r362104, head/x11/kdelibs4/files/patch-CVE-2014-3494) @@ -0,0 +1,56 @@ +From: David Faure +Date: Wed, 18 Jun 2014 18:29:04 +0000 +Subject: Don't require a job to handle messageboxes. +X-Git-Tag: v4.13.3 +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d +--- +Don't require a job to handle messageboxes. + +The POP3 ioslave doesn't have a job when it gets here. +--- + + +--- kio/kio/usernotificationhandler.cpp ++++ kio/kio/usernotificationhandler.cpp +@@ -19,7 +19,7 @@ + #include "usernotificationhandler_p.h" + + #include "slave.h" +-#include "job_p.h" ++#include "jobuidelegate.h" + + #include + +@@ -76,19 +76,18 @@ + + if (m_cachedResults.contains(key)) { + result = *(m_cachedResults[key]); +- } else if (r->slave->job()) { +- SimpleJobPrivate* jobPrivate = SimpleJobPrivate::get(r->slave->job()); +- if (jobPrivate) { +- result = jobPrivate->requestMessageBox(r->type, +- r->data.value(MSG_TEXT).toString(), +- r->data.value(MSG_CAPTION).toString(), +- r->data.value(MSG_YES_BUTTON_TEXT).toString(), +- r->data.value(MSG_NO_BUTTON_TEXT).toString(), +- r->data.value(MSG_YES_BUTTON_ICON).toString(), +- r->data.value(MSG_NO_BUTTON_ICON).toString(), +- r->data.value(MSG_DONT_ASK_AGAIN).toString(), +- r->data.value(MSG_META_DATA).toMap()); +- } ++ } else { ++ JobUiDelegate ui; ++ const JobUiDelegate::MessageBoxType type = static_cast(r->type); ++ result = ui.requestMessageBox(type, ++ r->data.value(MSG_TEXT).toString(), ++ r->data.value(MSG_CAPTION).toString(), ++ r->data.value(MSG_YES_BUTTON_TEXT).toString(), ++ r->data.value(MSG_NO_BUTTON_TEXT).toString(), ++ r->data.value(MSG_YES_BUTTON_ICON).toString(), ++ r->data.value(MSG_NO_BUTTON_ICON).toString(), ++ r->data.value(MSG_DONT_ASK_AGAIN).toString(), ++ r->data.value(MSG_META_DATA).toMap()); + m_cachedResults.insert(key, new int(result)); + } + } else { +