[arch-commits] Commit in kdebase-runtime/repos (12 files)
Felix Yan
fyan at archlinux.org
Sun Feb 8 12:38:06 UTC 2015
Date: Sunday, February 8, 2015 @ 13:38:06
Author: fyan
Revision: 231146
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kdebase-runtime/repos/extra-i686/CVE-2014-8600.patch
(from rev 231145, kdebase-runtime/trunk/CVE-2014-8600.patch)
kdebase-runtime/repos/extra-i686/PKGBUILD
(from rev 231145, kdebase-runtime/trunk/PKGBUILD)
kdebase-runtime/repos/extra-i686/kdebase-runtime.install
(from rev 231145, kdebase-runtime/trunk/kdebase-runtime.install)
kdebase-runtime/repos/extra-x86_64/CVE-2014-8600.patch
(from rev 231145, kdebase-runtime/trunk/CVE-2014-8600.patch)
kdebase-runtime/repos/extra-x86_64/PKGBUILD
(from rev 231145, kdebase-runtime/trunk/PKGBUILD)
kdebase-runtime/repos/extra-x86_64/kdebase-runtime.install
(from rev 231145, kdebase-runtime/trunk/kdebase-runtime.install)
Deleted:
kdebase-runtime/repos/extra-i686/CVE-2014-8600.patch
kdebase-runtime/repos/extra-i686/PKGBUILD
kdebase-runtime/repos/extra-i686/kdebase-runtime.install
kdebase-runtime/repos/extra-x86_64/CVE-2014-8600.patch
kdebase-runtime/repos/extra-x86_64/PKGBUILD
kdebase-runtime/repos/extra-x86_64/kdebase-runtime.install
--------------------------------------+
/CVE-2014-8600.patch | 40 +++++++++++
/PKGBUILD | 112 +++++++++++++++++++++++++++++++++
/kdebase-runtime.install | 26 +++++++
extra-i686/CVE-2014-8600.patch | 20 -----
extra-i686/PKGBUILD | 56 ----------------
extra-i686/kdebase-runtime.install | 13 ---
extra-x86_64/CVE-2014-8600.patch | 20 -----
extra-x86_64/PKGBUILD | 56 ----------------
extra-x86_64/kdebase-runtime.install | 13 ---
9 files changed, 178 insertions(+), 178 deletions(-)
Deleted: extra-i686/CVE-2014-8600.patch
===================================================================
--- extra-i686/CVE-2014-8600.patch 2015-02-08 12:37:19 UTC (rev 231145)
+++ extra-i686/CVE-2014-8600.patch 2015-02-08 12:38:06 UTC (rev 231146)
@@ -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();
- }
-
Copied: kdebase-runtime/repos/extra-i686/CVE-2014-8600.patch (from rev 231145, kdebase-runtime/trunk/CVE-2014-8600.patch)
===================================================================
--- extra-i686/CVE-2014-8600.patch (rev 0)
+++ extra-i686/CVE-2014-8600.patch 2015-02-08 12:38:06 UTC (rev 231146)
@@ -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();
+ }
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-02-08 12:37:19 UTC (rev 231145)
+++ extra-i686/PKGBUILD 2015-02-08 12:38:06 UTC (rev 231146)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=14.12.2
-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')
-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/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('96811840cb04a879109739f3df4f8075fb876ea7')
-
-prepare() {
- mkdir build
-
- cd kde-runtime-${pkgver}
-}
-
-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/extra-i686/PKGBUILD (from rev 231145, kdebase-runtime/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-02-08 12:38:06 UTC (rev 231146)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-runtime
+pkgver=14.12.2
+pkgrel=2
+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')
+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/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
+sha1sums=('96811840cb04a879109739f3df4f8075fb876ea7')
+
+prepare() {
+ mkdir build
+
+ cd kde-runtime-${pkgver}
+}
+
+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
+}
Deleted: extra-i686/kdebase-runtime.install
===================================================================
--- extra-i686/kdebase-runtime.install 2015-02-08 12:37:19 UTC (rev 231145)
+++ extra-i686/kdebase-runtime.install 2015-02-08 12:38:06 UTC (rev 231146)
@@ -1,13 +0,0 @@
-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/extra-i686/kdebase-runtime.install (from rev 231145, kdebase-runtime/trunk/kdebase-runtime.install)
===================================================================
--- extra-i686/kdebase-runtime.install (rev 0)
+++ extra-i686/kdebase-runtime.install 2015-02-08 12:38:06 UTC (rev 231146)
@@ -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
+}
Deleted: extra-x86_64/CVE-2014-8600.patch
===================================================================
--- extra-x86_64/CVE-2014-8600.patch 2015-02-08 12:37:19 UTC (rev 231145)
+++ extra-x86_64/CVE-2014-8600.patch 2015-02-08 12:38:06 UTC (rev 231146)
@@ -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();
- }
-
Copied: kdebase-runtime/repos/extra-x86_64/CVE-2014-8600.patch (from rev 231145, kdebase-runtime/trunk/CVE-2014-8600.patch)
===================================================================
--- extra-x86_64/CVE-2014-8600.patch (rev 0)
+++ extra-x86_64/CVE-2014-8600.patch 2015-02-08 12:38:06 UTC (rev 231146)
@@ -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();
+ }
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-02-08 12:37:19 UTC (rev 231145)
+++ extra-x86_64/PKGBUILD 2015-02-08 12:38:06 UTC (rev 231146)
@@ -1,56 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=14.12.2
-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')
-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/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
-sha1sums=('96811840cb04a879109739f3df4f8075fb876ea7')
-
-prepare() {
- mkdir build
-
- cd kde-runtime-${pkgver}
-}
-
-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/extra-x86_64/PKGBUILD (from rev 231145, kdebase-runtime/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-02-08 12:38:06 UTC (rev 231146)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdebase-runtime
+pkgver=14.12.2
+pkgrel=2
+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')
+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/applications/${pkgver}/src/kde-runtime-${pkgver}.tar.xz")
+sha1sums=('96811840cb04a879109739f3df4f8075fb876ea7')
+
+prepare() {
+ mkdir build
+
+ cd kde-runtime-${pkgver}
+}
+
+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
+}
Deleted: extra-x86_64/kdebase-runtime.install
===================================================================
--- extra-x86_64/kdebase-runtime.install 2015-02-08 12:37:19 UTC (rev 231145)
+++ extra-x86_64/kdebase-runtime.install 2015-02-08 12:38:06 UTC (rev 231146)
@@ -1,13 +0,0 @@
-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/extra-x86_64/kdebase-runtime.install (from rev 231145, kdebase-runtime/trunk/kdebase-runtime.install)
===================================================================
--- extra-x86_64/kdebase-runtime.install (rev 0)
+++ extra-x86_64/kdebase-runtime.install 2015-02-08 12:38:06 UTC (rev 231146)
@@ -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
+}
More information about the arch-commits
mailing list