summaryrefslogtreecommitdiffstats
path: root/source/l/ConsoleKit/patches
diff options
context:
space:
mode:
Diffstat (limited to 'source/l/ConsoleKit/patches')
-rw-r--r--source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch65
-rw-r--r--source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch175
-rw-r--r--source/l/ConsoleKit/patches/consolekit-skipvalidation.patch12
3 files changed, 252 insertions, 0 deletions
diff --git a/source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch b/source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch
new file mode 100644
index 000000000..d1699d900
--- /dev/null
+++ b/source/l/ConsoleKit/patches/consolekit-0.2.10-cleanup_console_tags.patch
@@ -0,0 +1,65 @@
+# http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/0.2.10-1ubuntu9/
+--- a/src/main.c 2008-07-25 03:19:34.000000000 +0200
++++ b/src/main.c 2008-07-26 00:25:13.000000000 +0200
+@@ -149,6 +149,43 @@
+ unlink (CONSOLE_KIT_PID_FILE);
+ }
+
++#define CONSOLE_TAGS_DIR "/var/run/console"
++
++static void
++delete_console_tags (void)
++{
++ GDir *dir;
++ GError *error = NULL;
++ const gchar *name;
++
++ g_debug ("Cleaning up %s", CONSOLE_TAGS_DIR);
++
++ dir = g_dir_open (CONSOLE_TAGS_DIR, 0, &error);
++ if (dir == NULL) {
++ g_debug ("Couldn't open directory %s: %s", CONSOLE_TAGS_DIR,
++ error->message);
++ g_error_free (error);
++ return;
++ }
++ while ((name = g_dir_read_name (dir)) != NULL) {
++ gchar *file;
++ file = g_build_filename (CONSOLE_TAGS_DIR, name, NULL);
++
++ g_debug ("Removing tag file: %s", file);
++ if (unlink (file) == -1) {
++ g_warning ("Couldn't delete tag file: %s", file);
++ }
++ g_free (file);
++ }
++}
++
++static void
++cleanup (void)
++{
++ delete_console_tags ();
++ delete_pid ();
++}
++
+ /* copied from nautilus */
+ static int debug_log_pipes[2];
+
+@@ -229,7 +266,7 @@
+ snprintf (pid, sizeof (pid), "%lu\n", (long unsigned) getpid ());
+ written = write (pf, pid, strlen (pid));
+ close (pf);
+- g_atexit (delete_pid);
++ g_atexit (cleanup);
+ } else {
+ g_warning ("Unable to write pid file %s: %s",
+ CONSOLE_KIT_PID_FILE,
+@@ -312,6 +349,8 @@
+
+ g_debug ("initializing console-kit-daemon %s", VERSION);
+
++ delete_console_tags ();
++
+ create_pid_file ();
+
+ manager = ck_manager_new ();
diff --git a/source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch b/source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch
new file mode 100644
index 000000000..0cab28583
--- /dev/null
+++ b/source/l/ConsoleKit/patches/consolekit-dbus-permissions.patch
@@ -0,0 +1,175 @@
+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>
+
diff --git a/source/l/ConsoleKit/patches/consolekit-skipvalidation.patch b/source/l/ConsoleKit/patches/consolekit-skipvalidation.patch
new file mode 100644
index 000000000..c4bf89d7a
--- /dev/null
+++ b/source/l/ConsoleKit/patches/consolekit-skipvalidation.patch
@@ -0,0 +1,12 @@
+diff -up ConsoleKit-0.3.0/doc/dbus/Makefile.in.skipvalidation ConsoleKit-0.3.0/doc/dbus/Makefile.in
+--- ConsoleKit-0.3.0/doc/dbus/Makefile.in.skipvalidation 2009-02-27 20:17:36.784329106 -0500
++++ ConsoleKit-0.3.0/doc/dbus/Makefile.in 2009-02-27 20:18:15.701316733 -0500
+@@ -427,7 +427,7 @@ uninstall-am: uninstall-htmldocDATA
+
+
+ @DOCBOOK_DOCS_ENABLED_TRUE@ConsoleKit.html : $(SPEC_XML_FILES)
+-@DOCBOOK_DOCS_ENABLED_TRUE@ $(XMLTO) xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
++@DOCBOOK_DOCS_ENABLED_TRUE@ $(XMLTO) --skip-validation xhtml-nochunks -m $(top_srcdir)/doc/dbus/config.xsl ConsoleKit.xml
+
+ org.freedesktop.ConsoleKit.Manager.ref.xml : $(top_srcdir)/src/org.freedesktop.ConsoleKit.Manager.xml spec-to-docbook.xsl
+ $(XSLTPROC) $(top_srcdir)/doc/dbus/spec-to-docbook.xsl $< | tail -n +2 > $@
generated by cgit v1.2.3 (git 2.26.2) at 2024-04-28 07:18:35 +0000