[arch-commits] Commit in kauth/repos (6 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Wed Jul 30 20:15:42 UTC 2014
Date: Wednesday, July 30, 2014 @ 22:15:41
Author: svenstaro
Revision: 218412
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
kauth/repos/extra-i686/PKGBUILD
(from rev 218411, kauth/trunk/PKGBUILD)
kauth/repos/extra-i686/kauth-cve-2014-5033.patch
(from rev 218411, kauth/trunk/kauth-cve-2014-5033.patch)
kauth/repos/extra-x86_64/PKGBUILD
(from rev 218411, kauth/trunk/PKGBUILD)
kauth/repos/extra-x86_64/kauth-cve-2014-5033.patch
(from rev 218411, kauth/trunk/kauth-cve-2014-5033.patch)
Deleted:
kauth/repos/extra-i686/PKGBUILD
kauth/repos/extra-x86_64/PKGBUILD
----------------------------------------+
/PKGBUILD | 86 +++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 37 -------------
extra-i686/kauth-cve-2014-5033.patch | 36 ++++++++++++
extra-x86_64/PKGBUILD | 37 -------------
extra-x86_64/kauth-cve-2014-5033.patch | 36 ++++++++++++
5 files changed, 158 insertions(+), 74 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2014-07-30 20:15:36 UTC (rev 218411)
+++ extra-i686/PKGBUILD 2014-07-30 20:15:41 UTC (rev 218412)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kauth
-pkgver=5.0.0
-pkgrel=1
-pkgdesc='KAuth'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kauth'
-license=('LGPL')
-depends=('kcoreaddons' 'polkit-qt5')
-makedepends=('extra-cmake-modules' 'qt5-tools')
-groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('eeb5e576c9d0d098cfb9def812f04089')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DECM_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
- -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kauth/repos/extra-i686/PKGBUILD (from rev 218411, kauth/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2014-07-30 20:15:41 UTC (rev 218412)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kauth
+pkgver=5.0.0
+pkgrel=2
+pkgdesc='KAuth'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kauth'
+license=('LGPL')
+depends=('kcoreaddons' 'polkit-qt5')
+makedepends=('extra-cmake-modules' 'qt5-tools')
+groups=('kf5')
+source=("http://download.kde.org/stable/frameworks/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ "${pkgname}-cve-2014-5033.patch")
+md5sums=('eeb5e576c9d0d098cfb9def812f04089'
+ 'c24d35b0e96f98f1cfaff8e69e5fe8f6')
+
+prepare() {
+ mkdir -p build
+
+ cd ${pkgname}-${pkgver}
+
+ patch -p1 -i "${srcdir}/kauth-cve-2014-5033.patch"
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DECM_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
+ -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kauth/repos/extra-i686/kauth-cve-2014-5033.patch (from rev 218411, kauth/trunk/kauth-cve-2014-5033.patch)
===================================================================
--- extra-i686/kauth-cve-2014-5033.patch (rev 0)
+++ extra-i686/kauth-cve-2014-5033.patch 2014-07-30 20:15:41 UTC (rev 218412)
@@ -0,0 +1,36 @@
+--- a/src/backends/polkit-1/Polkit1Backend.cpp
++++ b/src/backends/polkit-1/Polkit1Backend.cpp
+@@ -142,7 +142,7 @@
+
+ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
+ {
+- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
+ PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
+ PolkitQt1::Authority::None);
+ switch (r) {
+@@ -158,21 +158,12 @@
+
+ QByteArray Polkit1Backend::callerID() const
+ {
+- QByteArray a;
+- QDataStream s(&a, QIODevice::WriteOnly);
+- s << QCoreApplication::applicationPid();
+-
+- return a;
++ return QDBusConnection::systemBus().baseService().toUtf8();
+ }
+
+ bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
+ {
+- QDataStream s(&callerID, QIODevice::ReadOnly);
+- qint64 pid;
+-
+- s >> pid;
+-
+- PolkitQt1::UnixProcessSubject subject(pid);
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
+ PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
+
+ PolkitResultEventLoop e;
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2014-07-30 20:15:36 UTC (rev 218411)
+++ extra-x86_64/PKGBUILD 2014-07-30 20:15:41 UTC (rev 218412)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kauth
-pkgver=5.0.0
-pkgrel=1
-pkgdesc='KAuth'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/frameworks/kauth'
-license=('LGPL')
-depends=('kcoreaddons' 'polkit-qt5')
-makedepends=('extra-cmake-modules' 'qt5-tools')
-groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('eeb5e576c9d0d098cfb9def812f04089')
-
-prepare() {
- mkdir -p build
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_INSTALL_DIR=lib \
- -DECM_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
- -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-}
Copied: kauth/repos/extra-x86_64/PKGBUILD (from rev 218411, kauth/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2014-07-30 20:15:41 UTC (rev 218412)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kauth
+pkgver=5.0.0
+pkgrel=2
+pkgdesc='KAuth'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/frameworks/kauth'
+license=('LGPL')
+depends=('kcoreaddons' 'polkit-qt5')
+makedepends=('extra-cmake-modules' 'qt5-tools')
+groups=('kf5')
+source=("http://download.kde.org/stable/frameworks/${pkgver}/${pkgname}-${pkgver}.tar.xz"
+ "${pkgname}-cve-2014-5033.patch")
+md5sums=('eeb5e576c9d0d098cfb9def812f04089'
+ 'c24d35b0e96f98f1cfaff8e69e5fe8f6')
+
+prepare() {
+ mkdir -p build
+
+ cd ${pkgname}-${pkgver}
+
+ patch -p1 -i "${srcdir}/kauth-cve-2014-5033.patch"
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_INSTALL_DIR=lib \
+ -DECM_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
+ -DQT_PLUGIN_INSTALL_DIR=lib/qt/plugins \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+}
Copied: kauth/repos/extra-x86_64/kauth-cve-2014-5033.patch (from rev 218411, kauth/trunk/kauth-cve-2014-5033.patch)
===================================================================
--- extra-x86_64/kauth-cve-2014-5033.patch (rev 0)
+++ extra-x86_64/kauth-cve-2014-5033.patch 2014-07-30 20:15:41 UTC (rev 218412)
@@ -0,0 +1,36 @@
+--- a/src/backends/polkit-1/Polkit1Backend.cpp
++++ b/src/backends/polkit-1/Polkit1Backend.cpp
+@@ -142,7 +142,7 @@
+
+ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
+ {
+- PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
+ PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
+ PolkitQt1::Authority::None);
+ switch (r) {
+@@ -158,21 +158,12 @@
+
+ QByteArray Polkit1Backend::callerID() const
+ {
+- QByteArray a;
+- QDataStream s(&a, QIODevice::WriteOnly);
+- s << QCoreApplication::applicationPid();
+-
+- return a;
++ return QDBusConnection::systemBus().baseService().toUtf8();
+ }
+
+ bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
+ {
+- QDataStream s(&callerID, QIODevice::ReadOnly);
+- qint64 pid;
+-
+- s >> pid;
+-
+- PolkitQt1::UnixProcessSubject subject(pid);
++ PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
+ PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
+
+ PolkitResultEventLoop e;
+
More information about the arch-commits
mailing list