Thu Jul 24 21:30:10 2014 UTC ()
Fix for http://www.kde.org/info/security/advisory-20140618-1.txt
Bump PKGREVISION.


(markd)
diff -r1.70 -r1.71 pkgsrc/x11/kdelibs4/Makefile
diff -r1.40 -r1.41 pkgsrc/x11/kdelibs4/distinfo
diff -r0 -r1.1 pkgsrc/x11/kdelibs4/patches/patch-kio_kio_usernotificationhandler.cpp
cvs diff -r1.70 -r1.71 pkgsrc/x11/kdelibs4/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/Makefile 2014/05/31 15:56:28 1.70
+++ pkgsrc/x11/kdelibs4/Makefile 2014/07/24 21:30:10 1.71
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.70 2014/05/31 15:56:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.71 2014/07/24 21:30:10 markd Exp $
2 2
3DISTNAME= kdelibs-${_KDE_VERSION} 3DISTNAME= kdelibs-${_KDE_VERSION}
4PKGNAME= ${DISTNAME:S/-4/4-4/} 4PKGNAME= ${DISTNAME:S/-4/4-4/}
5PKGREVISION= 4 5PKGREVISION= 5
6CATEGORIES= x11 6CATEGORIES= x11
7COMMENT= Support libraries for the KDE integrated X11 desktop 7COMMENT= Support libraries for the KDE integrated X11 desktop
8 8
9#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 9#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
10# http://mirrors.isc.org/pub/kde/security_patches/ 10# http://mirrors.isc.org/pub/kde/security_patches/
11#PATCHFILES= post-kde-4.0.3-khtml.diff 11#PATCHFILES= post-kde-4.0.3-khtml.diff
12 12
13.include "../../meta-pkgs/kde4/Makefile.kde4" 13.include "../../meta-pkgs/kde4/Makefile.kde4"
14 14
15CONFLICTS= kdelibs-[0-9]* 15CONFLICTS= kdelibs-[0-9]*
16 16
17# BUILD_MAKE_FLAGS+= VERBOSE=1 17# BUILD_MAKE_FLAGS+= VERBOSE=1
18 18
cvs diff -r1.40 -r1.41 pkgsrc/x11/kdelibs4/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/kdelibs4/distinfo 2014/05/18 12:27:51 1.40
+++ pkgsrc/x11/kdelibs4/distinfo 2014/07/24 21:30:10 1.41
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1$NetBSD: distinfo,v 1.40 2014/05/18 12:27:51 markd Exp $ 1$NetBSD: distinfo,v 1.41 2014/07/24 21:30:10 markd Exp $
2 2
3SHA1 (kdelibs-4.11.5.tar.xz) = b4926c62b590e48ac7547bead7e04ef4938d6981 3SHA1 (kdelibs-4.11.5.tar.xz) = b4926c62b590e48ac7547bead7e04ef4938d6981
4RMD160 (kdelibs-4.11.5.tar.xz) = 9ed91ef6f0860443ec584fdf75adde57d3236682 4RMD160 (kdelibs-4.11.5.tar.xz) = 9ed91ef6f0860443ec584fdf75adde57d3236682
5Size (kdelibs-4.11.5.tar.xz) = 11832556 bytes 5Size (kdelibs-4.11.5.tar.xz) = 11832556 bytes
6SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4 6SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
7SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d 7SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
8SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae 8SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
9SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505 9SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
10SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976 10SHA1 (patch-ad) = 08467b484f3df864d343d9151b13bedc4f001976
11SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd 11SHA1 (patch-ag) = 67561007567ba10f20d8e8572dd0a33c8139b7cd
12SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f 12SHA1 (patch-ah) = 368f4f641ce55257409137185357e796666ae42f
13SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5 13SHA1 (patch-aj) = 501e34c8fdf242c3718ecb26577ac5940d37fae5
14SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6 14SHA1 (patch-ak) = 73cc1bb149039d2fe3c05ee631426a8773f951c6
15SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f 15SHA1 (patch-al) = 5efa7d504fe75bec53837bfa062a4b3f910fd71f
16SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5 16SHA1 (patch-am) = b6c315d152d2c3d3c66ad85050549d0b39b263e5
17SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = b5f00d1df3c35f499f86aa1d8d234612e8bd130a 17SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = b5f00d1df3c35f499f86aa1d8d234612e8bd130a
18SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4 18SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
19SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688 19SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
20SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72 20SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
21SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f 21SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
22SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805 22SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
23SHA1 (patch-khtml_imload_decoders_gifloader.cpp) = 6e5720556e4a82c8d0528f1803663cee592a6a84 23SHA1 (patch-khtml_imload_decoders_gifloader.cpp) = 6e5720556e4a82c8d0528f1803663cee592a6a84
 24SHA1 (patch-kio_kio_usernotificationhandler.cpp) = f0b3d408e90ad665e8e0cbf47856ded654c0b72e
24SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a 25SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
25SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241 26SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
26SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2 27SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
27SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8 28SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
File Added: pkgsrc/x11/kdelibs4/patches/Attic/patch-kio_kio_usernotificationhandler.cpp
$NetBSD: patch-kio_kio_usernotificationhandler.cpp,v 1.1 2014/07/24 21:30:10 markd 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 {