summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch')
-rw-r--r--sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch67
1 files changed, 0 insertions, 67 deletions
diff --git a/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch b/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch
deleted file mode 100644
index c02411ebded5..000000000000
--- a/sys-auth/consolekit/files/consolekit-cleanup_console_tags.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-http://bugs.gentoo.org/257761
-http://patches.ubuntu.com/by-release/extracted/ubuntu/c/consolekit/
-
---- src/main.c
-+++ src/main.c
-@@ -148,6 +148,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];
-
-@@ -228,7 +265,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,
-@@ -317,6 +354,8 @@
- goto out;
- }
-
-+ delete_console_tags ();
-+
- create_pid_file ();
-
- loop = g_main_loop_new (NULL, FALSE);