[arch-commits] Commit in kdebase-runtime/trunk (CVE-2014-8600.patch PKGBUILD)

[Felix Yan]

    Date: Wednesday, March 4, 2015 @ 06:15:26
  Author: fyan
Revision: 232526

upgpkg: kdebase-runtime 14.12.3-1

- make kdepimlibs optional again (FS#43701)

Modified:
  kdebase-runtime/trunk/PKGBUILD
Deleted:
  kdebase-runtime/trunk/CVE-2014-8600.patch

---------------------+
 CVE-2014-8600.patch |   20 --------------------
 PKGBUILD            |   10 +++++-----
 2 files changed, 5 insertions(+), 25 deletions(-)

Deleted: CVE-2014-8600.patch
===================================================================
--- CVE-2014-8600.patch	2015-03-04 04:03:22 UTC (rev 232525)
+++ CVE-2014-8600.patch	2015-03-04 05:15:26 UTC (rev 232526)
@@ -1,20 +0,0 @@
---- a/kioslave/bookmarks/kio_bookmarks.cpp
-+++ b/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 @@
-     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();
- }
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-03-04 04:03:22 UTC (rev 232525)
+++ PKGBUILD	2015-03-04 05:15:26 UTC (rev 232526)
@@ -4,17 +4,17 @@
 # Contributor: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdebase-runtime
-pkgver=14.12.2
-pkgrel=2
+pkgver=14.12.3
+pkgrel=1
 pkgdesc="Plugins and applications necessary for the running of KDE applications"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-runtime'
 license=('GPL' 'LGPL')
 depends=("kdelibs" 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra'
-         'oxygen-icons' 'xorg-xauth' 'libwebp' 'kdepimlibs')
+         'oxygen-icons' 'xorg-xauth' 'libwebp')
 makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'doxygen'
              'networkmanager' 'boost')
-optdepends=('kdepimlibs: needed by DrKonqi to send crash reports to KDE.org'
+optdepends=('kdepimlibs: for kwalletd, and is needed by DrKonqi to send crash reports to KDE.org'
             'gdb: needed by DrKonqi to generate backtrace'
             'htdig: to build the search index in the KHelpCenter'
             'rarian: needed by KHelpCenter')
@@ -21,7 +21,7 @@
 provides=('khelpcenter' 'notification-daemon')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('96811840cb04a879109739f3df4f8075fb876ea7')
+sha1sums=('f597893c4801106d790b3beb17b213a91ee89b9a')
 
 prepare() {
   mkdir build