[arch-commits] Commit in consolekit/repos (4 files)
Jan de Groot
jgc at archlinux.org
Sun Oct 11 18:47:10 UTC 2009
Date: Sunday, October 11, 2009 @ 14:47:10
Author: jgc
Revision: 54722
Merged revisions 46471,54721 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/consolekit/trunk
........
r46471 | jgc | 2009-07-18 15:44:43 +0200 (Sat, 18 Jul 2009) | 1 line
Fix FS#15502
........
r54721 | jgc | 2009-10-11 20:46:35 +0200 (Sun, 11 Oct 2009) | 1 line
Merge gnome-unstable
........
Added:
consolekit/repos/extra-i686/small-fixes.patch
(from rev 54721, consolekit/trunk/small-fixes.patch)
Modified:
consolekit/repos/extra-i686/ (properties)
consolekit/repos/extra-i686/PKGBUILD
Deleted:
consolekit/repos/extra-i686/consolekit-dbus-permissions.patch
-----------------------------------+
PKGBUILD | 23 ++--
consolekit-dbus-permissions.patch | 175 ------------------------------------
small-fixes.patch | 47 +++++++++
3 files changed, 59 insertions(+), 186 deletions(-)
Property changes on: consolekit/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /consolekit/trunk:1-38834
+ /consolekit/trunk:1-54721
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-10-11 18:46:35 UTC (rev 54721)
+++ extra-i686/PKGBUILD 2009-10-11 18:47:10 UTC (rev 54722)
@@ -3,30 +3,31 @@
# Contributor: onestep_ua <onestep at ukr.net>
pkgname=consolekit
-pkgver=0.3.0
-pkgrel=5
+pkgver=0.3.1
+pkgrel=1
pkgdesc="A framework for defining and tracking users, login sessions, and seats"
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/ConsoleKit"
license=('GPL')
-depends=('dbus-glib>=0.76' 'glib2>=2.18.2' 'policykit>=0.9' 'zlib')
-makedepends=('pkgconfig')
+depends=('polkit>=0.93' 'zlib' 'libx11>=1.2.2')
+makedepends=('pkgconfig' 'xmlto' 'docbook-xsl')
options=(!libtool)
-source=(http://people.freedesktop.org/~mccann/dist/ConsoleKit-${pkgver}.tar.bz2
- pam-foreground-compat.ck
- consolekit-dbus-permissions.patch)
-md5sums=('43b02a52212330b54cfb34c4044d9ce0'
+source=(http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-${pkgver}.tar.bz2
+ pam-foreground-compat.ck
+ small-fixes.patch)
+md5sums=('3ee89345f610c462806aaaae9a997683'
'a8a4de71d9b0549b8143e5f6c2a36fc7'
- '02cd8d4d0ea279a70a435c7c28b04e39')
+ '2ebf16e49fa4c954e89561147219dfdb')
build() {
cd "${srcdir}/ConsoleKit-${pkgver}"
- patch -Np1 -i "${srcdir}/consolekit-dbus-permissions.patch" || return 1
+ patch -Np1 -i "${srcdir}/small-fixes.patch" || return 1
./configure --prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
--libexecdir=/usr/lib/ConsoleKit \
- --enable-pam-module || return 1
+ --enable-pam-module \
+ --enable-docbook-docs || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
install -m755 "${srcdir}/pam-foreground-compat.ck" "${pkgdir}/usr/lib/ConsoleKit/run-session.d/" || return 1
Deleted: extra-i686/consolekit-dbus-permissions.patch
===================================================================
--- extra-i686/consolekit-dbus-permissions.patch 2009-10-11 18:46:35 UTC (rev 54721)
+++ extra-i686/consolekit-dbus-permissions.patch 2009-10-11 18:47:10 UTC (rev 54722)
@@ -1,175 +0,0 @@
-diff -up ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit ConsoleKit-0.3.0/data/ConsoleKit.conf
---- ConsoleKit-0.3.0/data/ConsoleKit.conf.consolekit 2008-04-19 01:39:49.000000000 -0400
-+++ ConsoleKit-0.3.0/data/ConsoleKit.conf 2009-04-08 11:40:33.347814036 -0400
-@@ -8,88 +8,131 @@
- <allow own="org.freedesktop.ConsoleKit"/>
-
- <!-- Allow all methods on interfaces -->
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Seat"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"/>
-+ <allow send_destination="org.freedesktop.ConsoleKit"/>
- </policy>
-
- <!-- Deny all and then allow some methods on interfaces -->
- <policy context="default">
-- <deny send_interface="org.freedesktop.ConsoleKit.Manager"/>
-- <deny send_interface="org.freedesktop.ConsoleKit.Seat"/>
-- <deny send_interface="org.freedesktop.ConsoleKit.Session"/>
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.DBus.Introspectable"/>
-+ <deny send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"/>
-+ <deny send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Seat"/>
-+ <deny send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"/>
- <deny send_destination="org.freedesktop.ConsoleKit"
- send_interface="org.freedesktop.DBus.Properties" />
-
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="Restart"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="Stop"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="OpenSession"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="CloseSession"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSeats"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
-+ send_member="GetSessions"/>
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSessionForCookie"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSessionForUnixProcess"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetCurrentSession"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSessionsForUnixUser"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSessionsForUser"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSystemIdleHint"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Manager"
- send_member="GetSystemIdleSinceHint"/>
-
-- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Seat"
- send_member="GetId"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Seat"
- send_member="GetSessions"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Seat"
- send_member="GetDevices"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Seat"
- send_member="GetActiveSession"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Seat"
- send_member="CanActivateSessions"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Seat"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Seat"
- send_member="ActivateSession"/>
-
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetId"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetSeatId"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetLoginSessionId"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetSessionType"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetUser"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetUnixUser"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetX11Display"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetX11DisplayDevice"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetDisplayDevice"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetRemoteHostName"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="IsActive"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="IsLocal"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetCreationTime"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="Activate"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetIdleHint"/>
-- <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
-+ send_member="SetIdleHint"/>
-+ <allow send_destination="org.freedesktop.ConsoleKit"
-+ send_interface="org.freedesktop.ConsoleKit.Session"
- send_member="GetIdleSinceHint"/>
- </policy>
-
Copied: consolekit/repos/extra-i686/small-fixes.patch (from rev 54721, consolekit/trunk/small-fixes.patch)
===================================================================
--- extra-i686/small-fixes.patch (rev 0)
+++ extra-i686/small-fixes.patch 2009-10-11 18:47:10 UTC (rev 54722)
@@ -0,0 +1,47 @@
+diff -up ConsoleKit-0.3.1/src/ck-manager.c.small-fixes ConsoleKit-0.3.1/src/ck-manager.c
+--- ConsoleKit-0.3.1/src/ck-manager.c.small-fixes 2009-07-31 22:32:32.382848777 -0400
++++ ConsoleKit-0.3.1/src/ck-manager.c 2009-07-31 22:34:55.159597733 -0400
+@@ -810,12 +810,9 @@ check_polkit_permissions (CkManager
+ AuthorizedCallback callback)
+ {
+ const char *sender;
+- GError *error;
+ PolkitSubject *subject;
+ AuthorizedCallbackData *data;
+
+- error = NULL;
+-
+ g_debug ("constructing polkit data");
+
+ /* Check that caller is privileged */
+@@ -837,6 +834,7 @@ check_polkit_permissions (CkManager
+ NULL,
+ (GAsyncReadyCallback)auth_ready_callback,
+ data);
++ g_object_unref (subject);
+ }
+
+ static void
+@@ -873,14 +871,12 @@ get_polkit_permissions (CkManager *man
+ {
+ const char *sender;
+ PolkitSubject *subject;
+- GError *error;
+
+ g_debug ("get permissions for action %s", action);
+
+ sender = dbus_g_method_get_sender (context);
+ subject = polkit_system_bus_name_new (sender);
+
+- error = NULL;
+ polkit_authority_check_authorization (manager->priv->pol_ctx,
+ subject,
+ action,
+@@ -890,7 +886,6 @@ get_polkit_permissions (CkManager *man
+ (GAsyncReadyCallback) ready_cb,
+ context);
+ g_object_unref (subject);
+-
+ }
+ #endif
+
More information about the arch-commits
mailing list