[SCM] kauth packaging branch, kubuntu_wily_archive, updated. debian/5.9.0-1-3-g981f224
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Tue May 19 10:53:42 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kauth.git;a=commitdiff;h=9f97193
The following commit has been merged in the kubuntu_wily_archive branch:
commit 9f971931f0ddbc7fc43843782ead74a0b5576449
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Jan 25 10:33:17 2015 +0100
Remove unused patches
---
debian/patches/series | 0
...ng-slash-to-searched-backend-helper-plugi.patch | 27 ----
.../v5.0.0/0002-Switch-to-PolkitQt5-1.patch | 176 ---------------------
debian/patches/v5.0.0/0003-Use-correct-var.patch | 30 ----
...stem-bus-name-instead-of-PID-for-authenti.patch | 54 -------
...5-don-t-crash-poor-systemsettings-on-exit.patch | 46 ------
6 files changed, 333 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29..0000000
diff --git a/debian/patches/v5.0.0/0001-Pass-trailing-slash-to-searched-backend-helper-plugi.patch b/debian/patches/v5.0.0/0001-Pass-trailing-slash-to-searched-backend-helper-plugi.patch
deleted file mode 100644
index 2192137..0000000
--- a/debian/patches/v5.0.0/0001-Pass-trailing-slash-to-searched-backend-helper-plugi.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f900d7d4798503479b88346a2689ec6bee417193 Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan at gmail.com>
-Date: Wed, 2 Jul 2014 09:32:23 +0200
-Subject: [PATCH 1/5] Pass trailing slash to searched backend/helper plugin dir
- Unbreaks plugin loading
-
-CCMAIL: aleixpol at kde.org
----
- src/BackendsManager.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/BackendsManager.cpp b/src/BackendsManager.cpp
-index cd0bf3f..0dd4661 100644
---- a/src/BackendsManager.cpp
-+++ b/src/BackendsManager.cpp
-@@ -44,7 +44,7 @@ QList< QObject * > BackendsManager::retrieveInstancesIn(const QString &subdir)
- {
- QList<QObject *> retlist;
- foreach (const QString& pPath, QCoreApplication::libraryPaths()) {
-- QDir pluginPath(pPath + subdir);
-+ QDir pluginPath(pPath + QLatin1Char('/') + subdir);
- if (!pluginPath.exists() || pPath.isEmpty()) {
- continue;
- }
---
-2.0.1
-
diff --git a/debian/patches/v5.0.0/0002-Switch-to-PolkitQt5-1.patch b/debian/patches/v5.0.0/0002-Switch-to-PolkitQt5-1.patch
deleted file mode 100644
index 47d3286..0000000
--- a/debian/patches/v5.0.0/0002-Switch-to-PolkitQt5-1.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 09c745976fd75ac3330776cb14255de33500dc5b Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan at gmail.com>
-Date: Mon, 7 Jul 2014 21:39:46 +0200
-Subject: [PATCH 2/5] Switch to PolkitQt5-1
-
-This will avoid problems where people
-linked to Qt4 version of polkit-qt-1
-
-REVIEW: 118264
-BUG: 337143
----
- cmake/KF5AuthMacros.cmake | 2 +-
- src/ConfigureChecks.cmake | 50 +++++++++++++++++++++++------------------------
- 2 files changed, 25 insertions(+), 27 deletions(-)
-
-diff --git a/cmake/KF5AuthMacros.cmake b/cmake/KF5AuthMacros.cmake
-index 66ba949..ab0b30a 100644
---- a/cmake/KF5AuthMacros.cmake
-+++ b/cmake/KF5AuthMacros.cmake
-@@ -42,7 +42,7 @@ function(KAUTH_INSTALL_ACTIONS HELPER_ID ACTIONS_FILE)
- if(KAUTH_BACKEND_NAME STREQUAL "APPLE")
- get_target_property(kauth_policy_gen KF5::kauth-policy-gen LOCATION)
- install(CODE "execute_process(COMMAND ${kauth_policy_gen} ${ACTIONS_FILE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")
-- elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KAUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
-+ elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT" OR KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1")
- set(_output ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.policy)
- get_filename_component(_input ${ACTIONS_FILE} ABSOLUTE)
-
-diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
-index 9e13546..ff0d486 100644
---- a/src/ConfigureChecks.cmake
-+++ b/src/ConfigureChecks.cmake
-@@ -1,7 +1,7 @@
- ####### checks for kdecore/kauth ###############
-
- set(KAUTH_BACKEND_NAME "" CACHE STRING "Specifies the KAuth backend to build. Current available options are
-- PolkitQt, PolkitQt-1, Fake, Apple. Not setting this variable will build the most
-+ PolkitQt, PolkitQt5-1, Fake, Apple. Not setting this variable will build the most
- appropriate backend for your system")
-
- set(KAUTH_BACKEND ${KAUTH_BACKEND_NAME})
-@@ -14,19 +14,19 @@ if(NOT KAUTH_BACKEND)
- if (APPLE)
- set (KAUTH_BACKEND "OSX")
- elseif (UNIX)
-- find_package(PolkitQt-1 0.99.0)
-+ find_package(PolkitQt5-1 0.99.0)
-
-- if (PolkitQt-1_FOUND)
-- set (KAUTH_BACKEND "PolkitQt-1")
-+ if (PolkitQt5-1_FOUND)
-+ set (KAUTH_BACKEND "PolkitQt5-1")
-
-- set_package_properties(PolkitQt-1 PROPERTIES
-+ set_package_properties(PolkitQt5-1 PROPERTIES
- URL "http://techbase.kde.org/Polkit-Qt-1"
- DESCRIPTION "PolicyKit API for Qt"
- TYPE RECOMMENDED
- PURPOSE "Support for executing priviledged actions in a controlled way (KAuth)"
- )
-
-- else (PolkitQt-1_FOUND)
-+ else (PolkitQt5-1_FOUND)
- find_package(PolkitQt)
-
- if (POLKITQT_FOUND)
-@@ -40,7 +40,7 @@ if(NOT KAUTH_BACKEND)
-
- else (POLKITQT_FOUND)
- # Nothing was found: notify and log the missing features
-- set_package_properties(PolkitQt-1 PROPERTIES
-+ set_package_properties(PolkitQt5-1 PROPERTIES
- URL "http://techbase.kde.org/Polkit-Qt-1"
- DESCRIPTION "PolicyKit API for Qt"
- TYPE RECOMMENDED
-@@ -50,11 +50,11 @@ if(NOT KAUTH_BACKEND)
- URL "http://api.kde.org/polkit-qt"
- DESCRIPTION "PolicyKit API for Qt"
- TYPE RECOMMENDED
-- PURPOSE "Support for executing priviledged actions in a controlled way (KAuth). Either this or PolkitQt-1 is required to make KAuth work, and hence enable certain workspace functionalities"
-+ PURPOSE "Support for executing priviledged actions in a controlled way (KAuth). Either this or PolkitQt5-1 is required to make KAuth work, and hence enable certain workspace functionalities"
- )
- set (KAUTH_BACKEND "Fake")
- endif (POLKITQT_FOUND)
-- endif (PolkitQt-1_FOUND)
-+ endif (PolkitQt5-1_FOUND)
- else(UNIX)
- set (KAUTH_BACKEND "Fake")
- endif(APPLE)
-@@ -68,10 +68,10 @@ else(NOT KAUTH_BACKEND)
- set (KAUTH_BACKEND ${KAUTH_BACKEND_UPPER})
-
- # Check if the specified backend is valid. If it is not, we fall back to the Fake one
-- if (NOT KAUTH_BACKEND STREQUAL "OSX" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT-1" AND NOT KAUTH_BACKEND STREQUAL "FAKE")
-+ if (NOT KAUTH_BACKEND STREQUAL "OSX" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT5-1" AND NOT KAUTH_BACKEND STREQUAL "FAKE")
- message ("WARNING: The KAuth Backend ${KAUTH_BACKEND} you specified does not exist. Falling back to Fake backend")
- set (KAUTH_BACKEND "FAKE")
-- endif (NOT KAUTH_BACKEND STREQUAL "OSX" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT-1" AND NOT KAUTH_BACKEND STREQUAL "FAKE")
-+ endif (NOT KAUTH_BACKEND STREQUAL "OSX" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT" AND NOT KAUTH_BACKEND STREQUAL "POLKITQT5-1" AND NOT KAUTH_BACKEND STREQUAL "FAKE")
-
- # Check requirements for each backend. If not, fall back to the fake one
- if (KAUTH_BACKEND STREQUAL "OSX" AND NOT APPLE)
-@@ -85,7 +85,7 @@ else(NOT KAUTH_BACKEND)
- URL "http://api.kde.org/polkit-qt"
- DESCRIPTION "PolicyKit API for Qt"
- TYPE RECOMMENDED
-- PURPOSE "Support for executing priviledged actions in a controlled way (KAuth). Either this or PolkitQt-1 is required to make KAuth work, and hence enable certain workspace functionalities"
-+ PURPOSE "Support for executing priviledged actions in a controlled way (KAuth). Either this or PolkitQt5-1 is required to make KAuth work, and hence enable certain workspace functionalities"
- )
- if (NOT POLKITQT_FOUND)
- message ("WARNING: You chose the PolkitQt KAuth backend but you don't have PolkitQt installed.
-@@ -93,24 +93,24 @@ else(NOT KAUTH_BACKEND)
- set (KAUTH_BACKEND "FAKE")
- endif (NOT POLKITQT_FOUND)
- endif (KAUTH_BACKEND STREQUAL "POLKITQT")
-- if (KAUTH_BACKEND STREQUAL "POLKITQT-1")
-- find_package(PolkitQt-1 0.99.0)
-- set_package_properties(PolkitQt-1 PROPERTIES
-+ if (KAUTH_BACKEND STREQUAL "POLKITQT5-1")
-+ find_package(PolkitQt5-1 0.99.0)
-+ set_package_properties(PolkitQt5-1 PROPERTIES
- URL "http://techbase.kde.org/Polkit-Qt-1"
- DESCRIPTION "PolicyKit API for Qt"
- TYPE RECOMMENDED
- PURPOSE "Support for executing priviledged actions in a controlled way (KAuth). Either this or PolkitQt is required to make KAuth work, and hence enable certain workspace functionalities"
- )
-- if (NOT POLKITQT-1_FOUND)
-- message ("WARNING: You chose the PolkitQt-1 KAuth backend but you don't have PolkitQt-1 installed.
-+ if (NOT POLKITQT5-1_FOUND)
-+ message ("WARNING: You chose the PolkitQt5-1 KAuth backend but you don't have PolkitQt5-1 installed.
- Falling back to Fake backend")
- set (KAUTH_BACKEND "FAKE")
-- endif (NOT POLKITQT-1_FOUND)
-- endif (KAUTH_BACKEND STREQUAL "POLKITQT-1")
-+ endif (NOT POLKITQT5-1_FOUND)
-+ endif (KAUTH_BACKEND STREQUAL "POLKITQT5-1")
- endif(NOT KAUTH_BACKEND)
-
- set(KAUTH_BACKEND_NAME ${KAUTH_BACKEND} CACHE STRING "Specifies the KAuth backend to build. Current available options are
-- PolkitQt, PolkitQt-1, Fake, Apple. Not setting this variable will build the most
-+ PolkitQt, PolkitQt5-1, Fake, Apple. Not setting this variable will build the most
- appropriate backend for your system" FORCE)
-
- # Add the correct libraries depending on the backend, and eventually set the policy files install location
-@@ -139,16 +139,14 @@ elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT")
-
- set(KAUTH_POLICY_FILES_INSTALL_DIR ${POLKITQT_POLICY_FILES_INSTALL_DIR} CACHE STRING
- "Where policy files generated by KAuth will be installed" FORCE)
--elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
-- message(STATUS "Building PolkitQt-1 KAuth backend")
--
-- include_directories(${POLKITQT-1_INCLUDE_DIR})
-+elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1")
-+ message(STATUS "Building PolkitQt5-1 KAuth backend")
-
- set(KAUTH_BACKEND_SRCS
- backends/polkit-1/Polkit1Backend.cpp
- )
-
-- set(KAUTH_BACKEND_LIBS ${POLKITQT-1_CORE_LIBRARY} Qt5::DBus Qt5::Widgets)
-+ set(KAUTH_BACKEND_LIBS PolkitQt5-1::Core Qt5::DBus Qt5::Widgets)
-
- # POLKITQT-1_POLICY_FILES_INSTALL_DIR has an absolute pathname, fix that.
- string(REPLACE ${POLKITQT-1_INSTALL_DIR}
-@@ -177,7 +175,7 @@ if(KAUTH_BACKEND_NAME STREQUAL "OSX")
- elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT")
- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
- backends/policykit/kauth-policy-gen-polkit.cpp )
--elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
-+elseif(KAUTH_BACKEND_NAME STREQUAL "POLKITQT5-1")
- set(KAUTH_POLICY_GEN_SRCS ${KAUTH_POLICY_GEN_SRCS}
- backends/polkit-1/kauth-policy-gen-polkit1.cpp )
- set(KAUTH_POLICY_GEN_LIBRARIES ${KAUTH_POLICY_GEN_LIBRARIES}
---
-2.0.1
-
diff --git a/debian/patches/v5.0.0/0003-Use-correct-var.patch b/debian/patches/v5.0.0/0003-Use-correct-var.patch
deleted file mode 100644
index b8605f7..0000000
--- a/debian/patches/v5.0.0/0003-Use-correct-var.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dca7a29e678ad0631351b0574a168cc632037f45 Mon Sep 17 00:00:00 2001
-From: Hrvoje Senjan <hrvoje.senjan at gmail.com>
-Date: Mon, 7 Jul 2014 22:11:39 +0200
-Subject: [PATCH 3/5] Use correct var
-
----
- src/ConfigureChecks.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/ConfigureChecks.cmake b/src/ConfigureChecks.cmake
-index ff0d486..70b9f7d 100644
---- a/src/ConfigureChecks.cmake
-+++ b/src/ConfigureChecks.cmake
-@@ -101,11 +101,11 @@ else(NOT KAUTH_BACKEND)
- TYPE RECOMMENDED
- PURPOSE "Support for executing priviledged actions in a controlled way (KAuth). Either this or PolkitQt is required to make KAuth work, and hence enable certain workspace functionalities"
- )
-- if (NOT POLKITQT5-1_FOUND)
-+ if (NOT PolkitQt5-1_FOUND)
- message ("WARNING: You chose the PolkitQt5-1 KAuth backend but you don't have PolkitQt5-1 installed.
- Falling back to Fake backend")
- set (KAUTH_BACKEND "FAKE")
-- endif (NOT POLKITQT5-1_FOUND)
-+ endif (NOT PolkitQt5-1_FOUND)
- endif (KAUTH_BACKEND STREQUAL "POLKITQT5-1")
- endif(NOT KAUTH_BACKEND)
-
---
-2.0.1
-
diff --git a/debian/patches/v5.0.0/0004-Use-dbus-system-bus-name-instead-of-PID-for-authenti.patch b/debian/patches/v5.0.0/0004-Use-dbus-system-bus-name-instead-of-PID-for-authenti.patch
deleted file mode 100644
index d09e0ab..0000000
--- a/debian/patches/v5.0.0/0004-Use-dbus-system-bus-name-instead-of-PID-for-authenti.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 341b7d84b6d9c03cf56905cb277b47e11c81482a Mon Sep 17 00:00:00 2001
-From: "Martin T. H. Sandsmark" <martin.sandsmark at kde.org>
-Date: Mon, 21 Jul 2014 22:45:55 +0200
-Subject: [PATCH 4/5] Use dbus system bus name instead of PID for
- authentication.
-
-Using the PID for authentication is prone to a PID reuse race condition,
-and a security issue.
-
-REVIEW: 119323
----
- src/backends/polkit-1/Polkit1Backend.cpp | 15 +++------------
- 1 file changed, 3 insertions(+), 12 deletions(-)
-
-diff --git a/src/backends/polkit-1/Polkit1Backend.cpp b/src/backends/polkit-1/Polkit1Backend.cpp
-index 165f7bb..5cac3fb 100644
---- a/src/backends/polkit-1/Polkit1Backend.cpp
-+++ b/src/backends/polkit-1/Polkit1Backend.cpp
-@@ -142,7 +142,7 @@ void Polkit1Backend::setupAction(const QString &action)
-
- 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 @@ Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
-
- 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;
---
-2.0.1
-
diff --git a/debian/patches/v5.0.0/0005-don-t-crash-poor-systemsettings-on-exit.patch b/debian/patches/v5.0.0/0005-don-t-crash-poor-systemsettings-on-exit.patch
deleted file mode 100644
index 76a1c11..0000000
--- a/debian/patches/v5.0.0/0005-don-t-crash-poor-systemsettings-on-exit.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 2a11586c464f923dea14a81d880390d7f61fa67b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= <lukas at kde.org>
-Date: Sun, 27 Jul 2014 11:25:32 +0200
-Subject: [PATCH 5/5] don't crash poor systemsettings on exit
-
----
- src/backends/dbus/DBusHelperProxy.cpp | 5 ++++-
- src/backends/dbus/DBusHelperProxy.h | 2 ++
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/backends/dbus/DBusHelperProxy.cpp b/src/backends/dbus/DBusHelperProxy.cpp
-index 3719e4b..13ac11e 100644
---- a/src/backends/dbus/DBusHelperProxy.cpp
-+++ b/src/backends/dbus/DBusHelperProxy.cpp
-@@ -50,6 +50,10 @@ DBusHelperProxy::DBusHelperProxy(const QDBusConnection &busConnection)
- {
- }
-
-+DBusHelperProxy::~DBusHelperProxy()
-+{
-+}
-+
- void DBusHelperProxy::stopAction(const QString &action, const QString &helperID)
- {
- QDBusMessage message;
-@@ -330,4 +334,3 @@ void debugMessageReceived(int t, const QString &message)
- }
-
- } // namespace Auth
--
-diff --git a/src/backends/dbus/DBusHelperProxy.h b/src/backends/dbus/DBusHelperProxy.h
-index 983c7e8..d7aae35 100644
---- a/src/backends/dbus/DBusHelperProxy.h
-+++ b/src/backends/dbus/DBusHelperProxy.h
-@@ -55,6 +55,8 @@ public:
- DBusHelperProxy();
- DBusHelperProxy(const QDBusConnection &busConnection);
-
-+ virtual ~DBusHelperProxy();
-+
- virtual void executeAction(const QString &action, const QString &helperID,
- const QVariantMap &arguments);
- virtual Action::AuthStatus authorizeAction(const QString &action, const QString &helperID);
---
-2.0.1
-
--
kauth packaging
More information about the pkg-kde-commits
mailing list