Pullup ticket #4462 - requested by markd

x11/kdelibs4: security patch

Revisions pulled up:
- x11/kdelibs4/Makefile                                         1.71
- x11/kdelibs4/distinfo                                         1.41
- x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp 1.1

---
   Module Name:	pkgsrc
   Committed By:	markd
   Date:		Thu Jul 24 21:30:10 UTC 2014

   Modified Files:
   	pkgsrc/x11/kdelibs4: Makefile distinfo
   Added Files:
   	pkgsrc/x11/kdelibs4/patches: patch-kio_kio_usernotificationhandler.cpp

   Log Message:
   Fix for http://www.kde.org/info/security/advisory-20140618-1.txt
   Bump PKGREVISION.

3 files changed, 52 insertions, 3 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 172b71089ca..f3eaa2f044c 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2014/05/31 15:56:28 wiz Exp $
+# $NetBSD: Makefile,v 1.70.2.1 2014/07/26 07:19:59 tron Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index f249b69a6ab..1b5dc647627 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.40 2014/05/18 12:27:51 markd Exp $
+$NetBSD: distinfo,v 1.40.2.1 2014/07/26 07:19:59 tron Exp $
 
 SHA1 (kdelibs-4.11.5.tar.xz) = b4926c62b590e48ac7547bead7e04ef4938d6981
 RMD160 (kdelibs-4.11.5.tar.xz) = 9ed91ef6f0860443ec584fdf75adde57d3236682
@@ -21,6 +21,7 @@ SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a
 SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
 SHA1 (patch-khtml_imload_decoders_gifloader.cpp) = 6e5720556e4a82c8d0528f1803663cee592a6a84
+SHA1 (patch-kio_kio_usernotificationhandler.cpp) = f0b3d408e90ad665e8e0cbf47856ded654c0b72e
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
 SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
 SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
diff --git a/x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp b/x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp
new file mode 100644
index 00000000000..b178f610c74
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp
@@ -0,0 +1,48 @@
+$NetBSD: patch-kio_kio_usernotificationhandler.cpp,v 1.1.2.2 2014/07/26 07:19:59 tron Exp $
+
+http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bbae87dc1be3ae063796a582774bd5642cacdd5d
+Don't require a job to handle messageboxes.
+http://www.kde.org/info/security/advisory-20140618-1.txt
+
+--- kio/kio/usernotificationhandler.cpp.orig	2014-01-02 19:26:52.000000000 +0000
++++ kio/kio/usernotificationhandler.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include "slave.h"
+ #include "job_p.h"
++#include "jobuidelegate.h"
+ 
+ #include <kdebug.h>
+ 
+@@ -76,19 +77,18 @@ void UserNotificationHandler::processReq
+ 
+         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<JobUiDelegate::MessageBoxType>(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 {