[arch-commits] Commit in plasma-workspace/repos (12 files)
Andrea Scarpino
andrea at archlinux.org
Tue Jan 27 12:18:27 UTC 2015
Date: Tuesday, January 27, 2015 @ 13:18:26
Author: andrea
Revision: 230080
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
plasma-workspace/repos/extra-i686/PKGBUILD
(from rev 230079, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/extra-i686/kde.pam
(from rev 230079, plasma-workspace/trunk/kde.pam)
plasma-workspace/repos/extra-x86_64/PKGBUILD
(from rev 230079, plasma-workspace/trunk/PKGBUILD)
plasma-workspace/repos/extra-x86_64/kde.pam
(from rev 230079, plasma-workspace/trunk/kde.pam)
Deleted:
plasma-workspace/repos/extra-i686/PKGBUILD
plasma-workspace/repos/extra-i686/dbus.patch
plasma-workspace/repos/extra-i686/kde.pam
plasma-workspace/repos/extra-i686/screenlocker-network.patch
plasma-workspace/repos/extra-x86_64/PKGBUILD
plasma-workspace/repos/extra-x86_64/dbus.patch
plasma-workspace/repos/extra-x86_64/kde.pam
plasma-workspace/repos/extra-x86_64/screenlocker-network.patch
-----------------------------------------+
/PKGBUILD | 106 ++++++++++++++++++
/kde.pam | 12 ++
extra-i686/PKGBUILD | 60 ----------
extra-i686/dbus.patch | 38 ------
extra-i686/kde.pam | 6 -
extra-i686/screenlocker-network.patch | 171 ------------------------------
extra-x86_64/PKGBUILD | 60 ----------
extra-x86_64/dbus.patch | 38 ------
extra-x86_64/kde.pam | 6 -
extra-x86_64/screenlocker-network.patch | 171 ------------------------------
10 files changed, 118 insertions(+), 550 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-i686/PKGBUILD 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgname=plasma-workspace
-pkgver=5.1.2
-pkgrel=5
-pkgdesc='KDE Plasma Workspace'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
-license=('LGPL')
-depends=('knewstuff' 'baloo-frameworks' 'kjsembed' 'knotifyconfig' 'libxcursor'
- 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
- 'qt5-tools' 'kded' 'kde-cli-tools' 'kio-extras' 'milou' 'breeze'
- 'xorg-xrdb' 'xorg-xsetroot' 'xorg-xmessage' 'xorg-xprop')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd')
-optdepends=('plasma-workspace-wallpapers: additional wallpapers'
- 'gpsd: GPS support for geolocation')
-conflicts=('kdebase-workspace')
-groups=('plasma-next')
-options=('!buildflags')
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
- 'kde.pam'
- 'screenlocker-network.patch' 'dbus.patch')
-md5sums=('8a01835179b25e3a7ff644fd7e52ec96'
- '929b182dec8a096206ad493477c09d2c'
- 'd67e504422a7e80a91b7adf3f41563f5'
- '45f12d6fec8a5e08ce1080f5efb8fb21')
-
-prepare() {
- mkdir -p build
-
- cd ${pkgname}-${pkgver}
- patch -p1 -i ../screenlocker-network.patch
- patch -p1 -i ../dbus.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DLIB_INSTALL_DIR=lib \
- -DLIBEXEC_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-
- # be sure to use the Qt5 version of qtpaths
- sed 's:qtpaths:qtpaths-qt5:' -i "$pkgdir"/usr/bin/startkde
-
- install -D "${srcdir}"/kde.pam \
- "${pkgdir}"/etc/pam.d/kde
-}
Copied: plasma-workspace/repos/extra-i686/PKGBUILD (from rev 230079, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-01-27 12:18:26 UTC (rev 230080)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgname=plasma-workspace
+pkgver=5.2.0
+pkgrel=1
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxcursor' 'kwayland'
+ 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks')
+optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS support for geolocation')
+conflicts=('kdebase-workspace')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
+ 'kde.pam')
+md5sums=('4ffdb4c7e310dff222abd452fd67e74d'
+ '929b182dec8a096206ad493477c09d2c')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ # be sure to use the Qt5 version of qtpaths
+ sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -D "${srcdir}"/kde.pam \
+ "${pkgdir}"/etc/pam.d/kde
+}
Deleted: extra-i686/dbus.patch
===================================================================
--- extra-i686/dbus.patch 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-i686/dbus.patch 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,38 +0,0 @@
-commit c0ace3a3994ab024ba5301b0c6be24a907d57eaf
-Author: Lukáš Tinkl <lukas at kde.org>
-Date: Thu Jan 8 16:57:30 2015 +0100
-
- make the call on the right path
-
- as dbus says
-
-diff --git a/startkde/ksyncdbusenv/ksyncdbusenv.cpp b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
-index 05ffb0e..8a01e7d 100644
---- a/startkde/ksyncdbusenv/ksyncdbusenv.cpp
-+++ b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
-@@ -23,6 +23,7 @@
- #include <QDBusMetaType>
- #include <QDBusPendingCall>
- #include <QProcessEnvironment>
-+#include <QDebug>
-
- typedef QMap<QString,QString> EnvMap;
- Q_DECLARE_METATYPE(EnvMap)
-@@ -39,7 +40,7 @@ int main(int argc, char **argv)
- }
-
- QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"),
-- QStringLiteral("/"),
-+ QStringLiteral("/org/freedesktop/DBus"),
- QStringLiteral("org.freedesktop.DBus"),
- QStringLiteral("UpdateActivationEnvironment"));
- qDBusRegisterMetaType<EnvMap>();
-@@ -47,5 +48,8 @@ int main(int argc, char **argv)
-
- QDBusPendingCall reply = QDBusConnection::sessionBus().asyncCall(msg);
- reply.waitForFinished();
-+ if (reply.isError()) {
-+ qDebug() << reply.error().name() << reply.error().message();
-+ }
- return reply.isError() ? 1 : 0;
- }
Deleted: extra-i686/kde.pam
===================================================================
--- extra-i686/kde.pam 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-i686/kde.pam 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth include system-login
-account include system-login
-password include system-login
-session include system-login
Copied: plasma-workspace/repos/extra-i686/kde.pam (from rev 230079, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-i686/kde.pam (rev 0)
+++ extra-i686/kde.pam 2015-01-27 12:18:26 UTC (rev 230080)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth include system-login
+account include system-login
+password include system-login
+session include system-login
Deleted: extra-i686/screenlocker-network.patch
===================================================================
--- extra-i686/screenlocker-network.patch 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-i686/screenlocker-network.patch 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,171 +0,0 @@
-commit 0a9cea625dfcb068fb03a4deab7430b1c4ad8aa4
-Author: Martin Gräßlin <mgraesslin at kde.org>
-Date: Fri Jan 2 15:50:15 2015 +0100
-
- [ksld] Provide custom QQmlNetworkAccessManagerFactory in greeter
-
- The greeter installs a custom QQmlNetworkAccessManagerFactory which
- creates QNetworkAccessManagers which do not have access to the
- network.
-
- Unfortunately this is not a 100 % secure way to disable network, any
- plugin could change the factory again and thus enable network. This
- is done for example by KDeclarative, so the greeter now first creates
- KDeclarative and then sets the custom factory.
-
- It is a sufficient solution to block all network access for pure
- QtQuick without a binary package as we would find in a look'n'feel
- package.
-
- Network access needs to be blocked in the greeter as otherwise a
- look'n'feel package were able to send the entered password (and other
- information to the creator of the look'n'feel package.
-
- REVIEW: 121847
-
-diff --git a/ksmserver/screenlocker/greeter/CMakeLists.txt b/ksmserver/screenlocker/greeter/CMakeLists.txt
-index 14a34f0..5ec0104 100644
---- a/ksmserver/screenlocker/greeter/CMakeLists.txt
-+++ b/ksmserver/screenlocker/greeter/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(kscreenlocker_greet_SRCS
- sessions.cpp
- greeterapp.cpp
- main.cpp
-+ noaccessnetworkaccessmanagerfactory.cpp
- )
-
- qt5_add_resources(kscreenlocker_greet_SRCS fallbacktheme.qrc)
-@@ -34,6 +35,7 @@ target_link_libraries(kscreenlocker_greet
- KF5::Crash
- KF5::I18n
- KF5::ConfigGui
-+ KF5::Declarative
- KF5::WindowSystem
- KF5::Solid
- Qt5::Quick
-diff --git a/ksmserver/screenlocker/greeter/greeterapp.cpp b/ksmserver/screenlocker/greeter/greeterapp.cpp
-index 824ba60..a23b562 100644
---- a/ksmserver/screenlocker/greeter/greeterapp.cpp
-+++ b/ksmserver/screenlocker/greeter/greeterapp.cpp
-@@ -22,10 +22,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
- #include "kscreensaversettings.h"
- #include "sessions.h"
- #include "authenticator.h"
-+#include "noaccessnetworkaccessmanagerfactory.h"
-
- // KDE
- #include <KAuthorized>
- #include <KCrash>
-+#include <kdeclarative/kdeclarative.h>
- #include <KUser>
- #include <KWindowSystem>
- #include <Solid/PowerManagement>
-@@ -162,6 +164,16 @@ void UnlockApp::desktopResized()
- QQuickView *view = new QQuickView();
- connect(view, &QQuickView::statusChanged, this, &UnlockApp::viewStatusChanged);
-
-+ // first create KDecoration, to be sure that it created a KIO Network Factory
-+ KDeclarative::KDeclarative declarative;
-+ declarative.setDeclarativeEngine(view->engine());
-+ declarative.setupBindings();
-+ // overwrite the factory set by kdeclarative
-+ auto oldFactory = view->engine()->networkAccessManagerFactory();
-+ view->engine()->setNetworkAccessManagerFactory(nullptr);
-+ delete oldFactory;
-+ view->engine()->setNetworkAccessManagerFactory(new NoAccessNetworkAccessManagerFactory);
-+
- if (!m_testing) {
- view->setFlags(Qt::X11BypassWindowManagerHint);
- }
-@@ -202,6 +214,9 @@ void UnlockApp::desktopResized()
- connect(view->rootObject(), SIGNAL(suspendToDisk()), SLOT(suspendToDisk()));
- }
-
-+ // verify that the engine's controller didn't change
-+ Q_ASSERT(dynamic_cast<NoAccessNetworkAccessManagerFactory*>(view->engine()->networkAccessManagerFactory()));
-+
- m_views << view;
- }
-
-diff --git a/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.cpp b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.cpp
-new file mode 100644
-index 0000000..eaa58c1
---- /dev/null
-+++ b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.cpp
-@@ -0,0 +1,34 @@
-+/********************************************************************
-+ KSld - the KDE Screenlocker Daemon
-+ This file is part of the KDE project.
-+
-+Copyright (C) 2015 Martin Gräßlin <mgraesslin at kde.org>
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or
-+(at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program. If not, see <http://www.gnu.org/licenses/>.
-+*********************************************************************/
-+#include "noaccessnetworkaccessmanagerfactory.h"
-+
-+#include <QNetworkAccessManager>
-+
-+namespace ScreenLocker
-+{
-+
-+QNetworkAccessManager *NoAccessNetworkAccessManagerFactory::create(QObject *parent)
-+{
-+ QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
-+ manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible);
-+ return manager;
-+}
-+
-+}
-diff --git a/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.h b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.h
-new file mode 100644
-index 0000000..6b2f739
---- /dev/null
-+++ b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.h
-@@ -0,0 +1,36 @@
-+/********************************************************************
-+ KSld - the KDE Screenlocker Daemon
-+ This file is part of the KDE project.
-+
-+Copyright (C) 2015 Martin Gräßlin <mgraesslin at kde.org>
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or
-+(at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program. If not, see <http://www.gnu.org/licenses/>.
-+*********************************************************************/
-+#ifndef NOACCESSNETWORKACCESSMANAGERFACTORY_H
-+#define NOACCESSNETWORKACCESSMANAGERFACTORY_H
-+
-+#include <QQmlNetworkAccessManagerFactory>
-+
-+namespace ScreenLocker
-+{
-+
-+class NoAccessNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
-+{
-+public:
-+ QNetworkAccessManager *create(QObject *parent) override;
-+};
-+
-+}
-+
-+#endif
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-x86_64/PKGBUILD 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,60 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Antonio Rojas
-# Contributor: Alexey D. <lq07829icatm at rambler.ru>
-
-pkgname=plasma-workspace
-pkgver=5.1.2
-pkgrel=5
-pkgdesc='KDE Plasma Workspace'
-arch=('i686' 'x86_64')
-url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
-license=('LGPL')
-depends=('knewstuff' 'baloo-frameworks' 'kjsembed' 'knotifyconfig' 'libxcursor'
- 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
- 'qt5-tools' 'kded' 'kde-cli-tools' 'kio-extras' 'milou' 'breeze'
- 'xorg-xrdb' 'xorg-xsetroot' 'xorg-xmessage' 'xorg-xprop')
-makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd')
-optdepends=('plasma-workspace-wallpapers: additional wallpapers'
- 'gpsd: GPS support for geolocation')
-conflicts=('kdebase-workspace')
-groups=('plasma-next')
-options=('!buildflags')
-source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
- 'kde.pam'
- 'screenlocker-network.patch' 'dbus.patch')
-md5sums=('8a01835179b25e3a7ff644fd7e52ec96'
- '929b182dec8a096206ad493477c09d2c'
- 'd67e504422a7e80a91b7adf3f41563f5'
- '45f12d6fec8a5e08ce1080f5efb8fb21')
-
-prepare() {
- mkdir -p build
-
- cd ${pkgname}-${pkgver}
- patch -p1 -i ../screenlocker-network.patch
- patch -p1 -i ../dbus.patch
-}
-
-build() {
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DLIB_INSTALL_DIR=lib \
- -DLIBEXEC_INSTALL_DIR=lib \
- -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
- -DBUILD_TESTING=OFF
- make
-}
-
-package() {
- cd build
- make DESTDIR="${pkgdir}" install
-
- # be sure to use the Qt5 version of qtpaths
- sed 's:qtpaths:qtpaths-qt5:' -i "$pkgdir"/usr/bin/startkde
-
- install -D "${srcdir}"/kde.pam \
- "${pkgdir}"/etc/pam.d/kde
-}
Copied: plasma-workspace/repos/extra-x86_64/PKGBUILD (from rev 230079, plasma-workspace/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-01-27 12:18:26 UTC (rev 230080)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Antonio Rojas
+# Contributor: Alexey D. <lq07829icatm at rambler.ru>
+
+pkgname=plasma-workspace
+pkgver=5.2.0
+pkgrel=1
+pkgdesc='KDE Plasma Workspace'
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/workspace/plasma-workspace'
+license=('LGPL')
+depends=('knewstuff' 'kjsembed' 'knotifyconfig' 'libxcursor' 'kwayland'
+ 'libksysguard' 'libkscreen-frameworks' 'ktexteditor' 'libqalculate'
+ 'qt5-tools' 'kded' 'kde-cli-tools' 'xorg-xrdb' 'xorg-xsetroot'
+ 'xorg-xmessage' 'xorg-xprop')
+makedepends=('extra-cmake-modules' 'kdoctools' 'kwin' 'gpsd' 'baloo-frameworks')
+optdepends=('plasma-workspace-wallpapers: additional wallpapers'
+ 'gpsd: GPS support for geolocation')
+conflicts=('kdebase-workspace')
+groups=('plasma')
+source=("http://download.kde.org/stable/plasma/${pkgver}/$pkgname-$pkgver.tar.xz"
+ 'kde.pam')
+md5sums=('4ffdb4c7e310dff222abd452fd67e74d'
+ '929b182dec8a096206ad493477c09d2c')
+
+prepare() {
+ mkdir build
+
+ cd ${pkgname}-${pkgver}
+ # be sure to use the Qt5 version of qtpaths
+ sed -i 's:qtpaths:qtpaths-qt5:' startkde/startkde.cmake
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DLIB_INSTALL_DIR=lib \
+ -DLIBEXEC_INSTALL_DIR=lib \
+ -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+ -DBUILD_TESTING=OFF
+ make
+}
+
+package() {
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ install -D "${srcdir}"/kde.pam \
+ "${pkgdir}"/etc/pam.d/kde
+}
Deleted: extra-x86_64/dbus.patch
===================================================================
--- extra-x86_64/dbus.patch 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-x86_64/dbus.patch 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,38 +0,0 @@
-commit c0ace3a3994ab024ba5301b0c6be24a907d57eaf
-Author: Lukáš Tinkl <lukas at kde.org>
-Date: Thu Jan 8 16:57:30 2015 +0100
-
- make the call on the right path
-
- as dbus says
-
-diff --git a/startkde/ksyncdbusenv/ksyncdbusenv.cpp b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
-index 05ffb0e..8a01e7d 100644
---- a/startkde/ksyncdbusenv/ksyncdbusenv.cpp
-+++ b/startkde/ksyncdbusenv/ksyncdbusenv.cpp
-@@ -23,6 +23,7 @@
- #include <QDBusMetaType>
- #include <QDBusPendingCall>
- #include <QProcessEnvironment>
-+#include <QDebug>
-
- typedef QMap<QString,QString> EnvMap;
- Q_DECLARE_METATYPE(EnvMap)
-@@ -39,7 +40,7 @@ int main(int argc, char **argv)
- }
-
- QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.freedesktop.DBus"),
-- QStringLiteral("/"),
-+ QStringLiteral("/org/freedesktop/DBus"),
- QStringLiteral("org.freedesktop.DBus"),
- QStringLiteral("UpdateActivationEnvironment"));
- qDBusRegisterMetaType<EnvMap>();
-@@ -47,5 +48,8 @@ int main(int argc, char **argv)
-
- QDBusPendingCall reply = QDBusConnection::sessionBus().asyncCall(msg);
- reply.waitForFinished();
-+ if (reply.isError()) {
-+ qDebug() << reply.error().name() << reply.error().message();
-+ }
- return reply.isError() ? 1 : 0;
- }
Deleted: extra-x86_64/kde.pam
===================================================================
--- extra-x86_64/kde.pam 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-x86_64/kde.pam 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,6 +0,0 @@
-#%PAM-1.0
-
-auth include system-login
-account include system-login
-password include system-login
-session include system-login
Copied: plasma-workspace/repos/extra-x86_64/kde.pam (from rev 230079, plasma-workspace/trunk/kde.pam)
===================================================================
--- extra-x86_64/kde.pam (rev 0)
+++ extra-x86_64/kde.pam 2015-01-27 12:18:26 UTC (rev 230080)
@@ -0,0 +1,6 @@
+#%PAM-1.0
+
+auth include system-login
+account include system-login
+password include system-login
+session include system-login
Deleted: extra-x86_64/screenlocker-network.patch
===================================================================
--- extra-x86_64/screenlocker-network.patch 2015-01-27 12:18:17 UTC (rev 230079)
+++ extra-x86_64/screenlocker-network.patch 2015-01-27 12:18:26 UTC (rev 230080)
@@ -1,171 +0,0 @@
-commit 0a9cea625dfcb068fb03a4deab7430b1c4ad8aa4
-Author: Martin Gräßlin <mgraesslin at kde.org>
-Date: Fri Jan 2 15:50:15 2015 +0100
-
- [ksld] Provide custom QQmlNetworkAccessManagerFactory in greeter
-
- The greeter installs a custom QQmlNetworkAccessManagerFactory which
- creates QNetworkAccessManagers which do not have access to the
- network.
-
- Unfortunately this is not a 100 % secure way to disable network, any
- plugin could change the factory again and thus enable network. This
- is done for example by KDeclarative, so the greeter now first creates
- KDeclarative and then sets the custom factory.
-
- It is a sufficient solution to block all network access for pure
- QtQuick without a binary package as we would find in a look'n'feel
- package.
-
- Network access needs to be blocked in the greeter as otherwise a
- look'n'feel package were able to send the entered password (and other
- information to the creator of the look'n'feel package.
-
- REVIEW: 121847
-
-diff --git a/ksmserver/screenlocker/greeter/CMakeLists.txt b/ksmserver/screenlocker/greeter/CMakeLists.txt
-index 14a34f0..5ec0104 100644
---- a/ksmserver/screenlocker/greeter/CMakeLists.txt
-+++ b/ksmserver/screenlocker/greeter/CMakeLists.txt
-@@ -13,6 +13,7 @@ set(kscreenlocker_greet_SRCS
- sessions.cpp
- greeterapp.cpp
- main.cpp
-+ noaccessnetworkaccessmanagerfactory.cpp
- )
-
- qt5_add_resources(kscreenlocker_greet_SRCS fallbacktheme.qrc)
-@@ -34,6 +35,7 @@ target_link_libraries(kscreenlocker_greet
- KF5::Crash
- KF5::I18n
- KF5::ConfigGui
-+ KF5::Declarative
- KF5::WindowSystem
- KF5::Solid
- Qt5::Quick
-diff --git a/ksmserver/screenlocker/greeter/greeterapp.cpp b/ksmserver/screenlocker/greeter/greeterapp.cpp
-index 824ba60..a23b562 100644
---- a/ksmserver/screenlocker/greeter/greeterapp.cpp
-+++ b/ksmserver/screenlocker/greeter/greeterapp.cpp
-@@ -22,10 +22,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
- #include "kscreensaversettings.h"
- #include "sessions.h"
- #include "authenticator.h"
-+#include "noaccessnetworkaccessmanagerfactory.h"
-
- // KDE
- #include <KAuthorized>
- #include <KCrash>
-+#include <kdeclarative/kdeclarative.h>
- #include <KUser>
- #include <KWindowSystem>
- #include <Solid/PowerManagement>
-@@ -162,6 +164,16 @@ void UnlockApp::desktopResized()
- QQuickView *view = new QQuickView();
- connect(view, &QQuickView::statusChanged, this, &UnlockApp::viewStatusChanged);
-
-+ // first create KDecoration, to be sure that it created a KIO Network Factory
-+ KDeclarative::KDeclarative declarative;
-+ declarative.setDeclarativeEngine(view->engine());
-+ declarative.setupBindings();
-+ // overwrite the factory set by kdeclarative
-+ auto oldFactory = view->engine()->networkAccessManagerFactory();
-+ view->engine()->setNetworkAccessManagerFactory(nullptr);
-+ delete oldFactory;
-+ view->engine()->setNetworkAccessManagerFactory(new NoAccessNetworkAccessManagerFactory);
-+
- if (!m_testing) {
- view->setFlags(Qt::X11BypassWindowManagerHint);
- }
-@@ -202,6 +214,9 @@ void UnlockApp::desktopResized()
- connect(view->rootObject(), SIGNAL(suspendToDisk()), SLOT(suspendToDisk()));
- }
-
-+ // verify that the engine's controller didn't change
-+ Q_ASSERT(dynamic_cast<NoAccessNetworkAccessManagerFactory*>(view->engine()->networkAccessManagerFactory()));
-+
- m_views << view;
- }
-
-diff --git a/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.cpp b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.cpp
-new file mode 100644
-index 0000000..eaa58c1
---- /dev/null
-+++ b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.cpp
-@@ -0,0 +1,34 @@
-+/********************************************************************
-+ KSld - the KDE Screenlocker Daemon
-+ This file is part of the KDE project.
-+
-+Copyright (C) 2015 Martin Gräßlin <mgraesslin at kde.org>
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or
-+(at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program. If not, see <http://www.gnu.org/licenses/>.
-+*********************************************************************/
-+#include "noaccessnetworkaccessmanagerfactory.h"
-+
-+#include <QNetworkAccessManager>
-+
-+namespace ScreenLocker
-+{
-+
-+QNetworkAccessManager *NoAccessNetworkAccessManagerFactory::create(QObject *parent)
-+{
-+ QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
-+ manager->setNetworkAccessible(QNetworkAccessManager::NotAccessible);
-+ return manager;
-+}
-+
-+}
-diff --git a/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.h b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.h
-new file mode 100644
-index 0000000..6b2f739
---- /dev/null
-+++ b/ksmserver/screenlocker/greeter/noaccessnetworkaccessmanagerfactory.h
-@@ -0,0 +1,36 @@
-+/********************************************************************
-+ KSld - the KDE Screenlocker Daemon
-+ This file is part of the KDE project.
-+
-+Copyright (C) 2015 Martin Gräßlin <mgraesslin at kde.org>
-+
-+This program is free software; you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation; either version 2 of the License, or
-+(at your option) any later version.
-+
-+This program is distributed in the hope that it will be useful,
-+but WITHOUT ANY WARRANTY; without even the implied warranty of
-+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+GNU General Public License for more details.
-+
-+You should have received a copy of the GNU General Public License
-+along with this program. If not, see <http://www.gnu.org/licenses/>.
-+*********************************************************************/
-+#ifndef NOACCESSNETWORKACCESSMANAGERFACTORY_H
-+#define NOACCESSNETWORKACCESSMANAGERFACTORY_H
-+
-+#include <QQmlNetworkAccessManagerFactory>
-+
-+namespace ScreenLocker
-+{
-+
-+class NoAccessNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
-+{
-+public:
-+ QNetworkAccessManager *create(QObject *parent) override;
-+};
-+
-+}
-+
-+#endif
More information about the arch-commits
mailing list