diff options
author | markd <markd@pkgsrc.org> | 2014-12-11 20:00:15 +0000 |
---|---|---|
committer | markd <markd@pkgsrc.org> | 2014-12-11 20:00:15 +0000 |
commit | 1c7737585e7e63ab387d5207edf31b4c7c2d5d53 (patch) | |
tree | 59bc75104a88b121fab0a226c9e4d038feb4a1dc | |
parent | 43d115201c484370431410fd7657ca614879867c (diff) | |
download | pkgsrc-1c7737585e7e63ab387d5207edf31b4c7c2d5d53.tar.gz |
Sanitize path
-rw-r--r-- | x11/kde-runtime4/Makefile | 3 | ||||
-rw-r--r-- | x11/kde-runtime4/distinfo | 3 | ||||
-rw-r--r-- | x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/x11/kde-runtime4/Makefile b/x11/kde-runtime4/Makefile index e9be41135d1..bc4bf73fd16 100644 --- a/x11/kde-runtime4/Makefile +++ b/x11/kde-runtime4/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.52 2014/11/13 10:53:49 markd Exp $ +# $NetBSD: Makefile,v 1.53 2014/12/11 20:00:15 markd Exp $ DISTNAME= kde-runtime-${_KDE_VERSION} PKGNAME= ${DISTNAME:S/-4/4-4/} +PKGREVISION= 1 CATEGORIES= x11 COMMENT= Runtime requirements for the KDE integrated X11 desktop diff --git a/x11/kde-runtime4/distinfo b/x11/kde-runtime4/distinfo index c80e2e0bb18..f13e4cd7ef4 100644 --- a/x11/kde-runtime4/distinfo +++ b/x11/kde-runtime4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.10 2014/11/13 10:53:49 markd Exp $ +$NetBSD: distinfo,v 1.11 2014/12/11 20:00:15 markd Exp $ SHA1 (kde-runtime-4.14.3.tar.xz) = d25357bf7e5d3922ce0c9b60921fb2fd738b7251 RMD160 (kde-runtime-4.14.3.tar.xz) = dcbc8624066d83cc8dca85d5ceeb5b4cc327a8fa @@ -11,5 +11,6 @@ SHA1 (patch-af) = 1a8f15ac1c8dadd59fe00ca7ca304ba41521f896 SHA1 (patch-ag) = 5ca9064552379792c32577875d07562d3f736ab7 SHA1 (patch-ai) = 3742a827c4b18cde06828ff585d3130062803b9a SHA1 (patch-ak) = 4fee3877613afddf179a7a8376586a6391b53c89 +SHA1 (patch-kioslave_bookmarks_kio_bookmarks.cpp) = 03b1c2680bc024604372cab0c1d7829fea68f658 SHA1 (patch-kioslave_nfs_nfs__prot__xdr.c) = 3b779d367a90dbdf158e8f299b4f1de818a6180a SHA1 (patch-kwalletd_backend_blowfish.h) = 23bd9bf9671a770d203a10c46dc602145d2b9457 diff --git a/x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp b/x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp new file mode 100644 index 00000000000..9b4a8e9d58b --- /dev/null +++ b/x11/kde-runtime4/patches/patch-kioslave_bookmarks_kio_bookmarks.cpp @@ -0,0 +1,24 @@ +$NetBSD: patch-kioslave_bookmarks_kio_bookmarks.cpp,v 1.1 2014/12/11 20:00:15 markd Exp $ + +Sanitize path +http://quickgit.kde.org/?p=kde-runtime.git&a=commit&h=d68703900edc8416fbcd2550cd336cbbb76decb9 + +--- kioslave/bookmarks/kio_bookmarks.cpp.orig 2014-10-30 23:50:20.000000000 +0000 ++++ 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& + 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(); + } |