- obsolete

Changed files:
    ConsoleKit-dbus.patch -> 1.4
    ConsoleKit-fixes.patch -> 1.2
    ConsoleKit-skip_xmlto_validation.patch -> 1.2

diff --git a/ConsoleKit-dbus.patch b/ConsoleKit-dbus.patch
deleted file mode 100644 (file)
index b3407fb..0000000
--- a/ConsoleKit-dbus.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-diff -urN ConsoleKit-0.3.0/data/ConsoleKit.conf ConsoleKit-0.3.0.new/data/ConsoleKit.conf
---- ConsoleKit-0.3.0/data/ConsoleKit.conf      2008-04-19 07:39:49.000000000 +0200
-+++ ConsoleKit-0.3.0.new/data/ConsoleKit.conf  2009-05-18 13:41:52.525113368 +0200
-@@ -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>
- 

diff --git a/ConsoleKit-fixes.patch b/ConsoleKit-fixes.patch
deleted file mode 100644 (file)
index 2586ec9..0000000
--- a/ConsoleKit-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-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
- 

diff --git a/ConsoleKit-skip_xmlto_validation.patch b/ConsoleKit-skip_xmlto_validation.patch
deleted file mode 100644 (file)
index 1dfe366..0000000
--- a/ConsoleKit-skip_xmlto_validation.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Because xmlto-0.0.22 adds --noent to xmllint options, it's more strict,
-and doesn't validate anymore. This is a temp. solution until upstream
-gets their documentation fixed.
-
-http://bugs.gentoo.org/show_bug.cgi?id=271678
-
-diff -ur ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am ConsoleKit-0.3.0/doc/dbus/Makefile.am
---- ConsoleKit-0.3.0.orig/doc/dbus/Makefile.am 2008-07-31 00:35:51.000000000 +0300
-+++ ConsoleKit-0.3.0/doc/dbus/Makefile.am      2009-06-09 22:30:57.000000000 +0300
-@@ -16,7 +16,7 @@
- htmldoc_DATA = ConsoleKit.html
- 
- ConsoleKit.html : $(SPEC_XML_FILES)
--      $(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
-+      $(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
- 
- endif # DOCBOOK_DOCS_ENABLED
-