Date: Wednesday, November 19, 2014 @ 17:32:30 Author: fyan Revision: 226407
archrelease: copy trunk to testing-i686, testing-x86_64 Added: kdebase-runtime/repos/testing-i686/ kdebase-runtime/repos/testing-i686/CVE-2014-8600.patch (from rev 226406, kdebase-runtime/trunk/CVE-2014-8600.patch) kdebase-runtime/repos/testing-i686/PKGBUILD (from rev 226406, kdebase-runtime/trunk/PKGBUILD) kdebase-runtime/repos/testing-i686/kdebase-runtime.install (from rev 226406, kdebase-runtime/trunk/kdebase-runtime.install) kdebase-runtime/repos/testing-x86_64/ kdebase-runtime/repos/testing-x86_64/CVE-2014-8600.patch (from rev 226406, kdebase-runtime/trunk/CVE-2014-8600.patch) kdebase-runtime/repos/testing-x86_64/PKGBUILD (from rev 226406, kdebase-runtime/trunk/PKGBUILD) kdebase-runtime/repos/testing-x86_64/kdebase-runtime.install (from rev 226406, kdebase-runtime/trunk/kdebase-runtime.install) ----------------------------------------+ testing-i686/CVE-2014-8600.patch | 20 ++++++++++ testing-i686/PKGBUILD | 58 +++++++++++++++++++++++++++++++ testing-i686/kdebase-runtime.install | 13 ++++++ testing-x86_64/CVE-2014-8600.patch | 20 ++++++++++ testing-x86_64/PKGBUILD | 58 +++++++++++++++++++++++++++++++ testing-x86_64/kdebase-runtime.install | 13 ++++++ 6 files changed, 182 insertions(+) Copied: kdebase-runtime/repos/testing-i686/CVE-2014-8600.patch (from rev 226406, kdebase-runtime/trunk/CVE-2014-8600.patch) =================================================================== --- testing-i686/CVE-2014-8600.patch (rev 0) +++ testing-i686/CVE-2014-8600.patch 2014-11-19 16:32:30 UTC (rev 226407) @@ -0,0 +1,20 @@ +--- 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(); + } + Copied: kdebase-runtime/repos/testing-i686/PKGBUILD (from rev 226406, kdebase-runtime/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-11-19 16:32:30 UTC (rev 226407) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdebase-runtime +pkgver=4.14.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>=${pkgver}" 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' + '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' + 'gdb: needed by DrKonqi to generate backtrace' + 'htdig: to build the search index in the KHelpCenter' + 'rarian: needed by KHelpCenter') +provides=('khelpcenter' 'notification-daemon') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" + CVE-2014-8600.patch) +sha1sums=('d25357bf7e5d3922ce0c9b60921fb2fd738b7251' + '63588c9843c68c9b59e5b5e24dbc62c690ce68ce') + +prepare() { + mkdir build + + cd kde-runtime-${pkgver} + patch -p1 -i ../CVE-2014-8600.patch +} + +build() { + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_QNtrack=OFF \ + -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \ + -DWITH_NepomukCore=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + rm "${pkgdir}"/usr/share/icons/hicolor/index.theme + + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" + + # FS#36668 + chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud + chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud +} Copied: kdebase-runtime/repos/testing-i686/kdebase-runtime.install (from rev 226406, kdebase-runtime/trunk/kdebase-runtime.install) =================================================================== --- testing-i686/kdebase-runtime.install (rev 0) +++ testing-i686/kdebase-runtime.install 2014-11-19 16:32:30 UTC (rev 226407) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: kdebase-runtime/repos/testing-x86_64/CVE-2014-8600.patch (from rev 226406, kdebase-runtime/trunk/CVE-2014-8600.patch) =================================================================== --- testing-x86_64/CVE-2014-8600.patch (rev 0) +++ testing-x86_64/CVE-2014-8600.patch 2014-11-19 16:32:30 UTC (rev 226407) @@ -0,0 +1,20 @@ +--- 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(); + } + Copied: kdebase-runtime/repos/testing-x86_64/PKGBUILD (from rev 226406, kdebase-runtime/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-11-19 16:32:30 UTC (rev 226407) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Andrea Scarpino <and...@archlinux.org> +# Contributor: Pierre Schmitz <pie...@archlinux.de> + +pkgname=kdebase-runtime +pkgver=4.14.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>=${pkgver}" 'kactivities' 'libkactivities4' 'smbclient' 'libssh' 'libcanberra' + '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' + 'gdb: needed by DrKonqi to generate backtrace' + 'htdig: to build the search index in the KHelpCenter' + 'rarian: needed by KHelpCenter') +provides=('khelpcenter' 'notification-daemon') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" + CVE-2014-8600.patch) +sha1sums=('d25357bf7e5d3922ce0c9b60921fb2fd738b7251' + '63588c9843c68c9b59e5b5e24dbc62c690ce68ce') + +prepare() { + mkdir build + + cd kde-runtime-${pkgver} + patch -p1 -i ../CVE-2014-8600.patch +} + +build() { + cd build + cmake ../kde-runtime-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_QNtrack=OFF \ + -DSAMBA_INCLUDE_DIR=/usr/include/samba-4.0 \ + -DWITH_NepomukCore=OFF + make +} + +package() { + cd build + make DESTDIR="$pkgdir" install + + rm "${pkgdir}"/usr/share/icons/hicolor/index.theme + + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" + + # FS#36668 + chown :nobody "${pkgdir}"/usr/lib/kde4/libexec/kdesud + chmod g+s "${pkgdir}"/usr/lib/kde4/libexec/kdesud +} Copied: kdebase-runtime/repos/testing-x86_64/kdebase-runtime.install (from rev 226406, kdebase-runtime/trunk/kdebase-runtime.install) =================================================================== --- testing-x86_64/kdebase-runtime.install (rev 0) +++ testing-x86_64/kdebase-runtime.install 2014-11-19 16:32:30 UTC (rev 226407) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}