author | Andrea Scarpino
<andrea@archlinux.org> 2014-08-05 11:08:13 UTC |
committer | Andrea Scarpino
<andrea@archlinux.org> 2014-08-05 11:08:13 UTC |
parent | 2b486d491d5c970abc9dc1463cb0768f8d1c0a6f |
PKGBUILD | +4 | -10 |
kauth-cve-2014-5033.patch | +0 | -36 |
diff --git a/PKGBUILD b/PKGBUILD index 325d0f5..b083b30 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,8 +1,8 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kauth -pkgver=5.0.0 -pkgrel=2 +pkgver=5.1.0 +pkgrel=1 pkgdesc='KAuth' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/frameworks/kauth' @@ -10,17 +10,11 @@ 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') +source=("http://download.kde.org/stable/frameworks/${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('20c3bf546f16d52f8cfc1129e87773bc') prepare() { mkdir -p build - - cd ${pkgname}-${pkgver} - - patch -p1 -i "${srcdir}/kauth-cve-2014-5033.patch" } build() { diff --git a/kauth-cve-2014-5033.patch b/kauth-cve-2014-5033.patch deleted file mode 100644 index a7736cd..0000000 --- a/kauth-cve-2014-5033.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- 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; -