diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-26 15:48:02 +0000 |
commit | 38b7258d086dd5e263c3bbe3880c8c956676bc71 (patch) | |
tree | 6fce284d5bfddaf597a490ac66069d16c6a485db /sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch | |
parent | 0ebf740b9c9bc7c10ac41bea315ecc6c01c79166 (diff) |
gentoo resync : 25.01.2018
Diffstat (limited to 'sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch')
-rw-r--r-- | sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch b/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch deleted file mode 100644 index 8233f98a17e8..000000000000 --- a/sys-cluster/pacemaker/files/pacemaker-1.1.12-glib.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 568e41db929a34106c8c2ff7c48716ab5c13ef49 Mon Sep 17 00:00:00 2001 -From: Andrew Beekhof <andrew@beekhof.net> -Date: Mon, 13 Oct 2014 13:30:58 +1100 -Subject: [PATCH] Fix: lrmd: Prevent glib assert triggered by timers being - removed from mainloop more than once - ---- - lib/services/services.c | 3 +++ - lib/services/services_linux.c | 1 + - 2 files changed, 4 insertions(+) - ---- a/lib/services/services.c -+++ b/lib/services/services.c -@@ -313,6 +313,7 @@ services_action_free(svc_action_t * op) - - if (op->opaque->repeat_timer) { - g_source_remove(op->opaque->repeat_timer); -+ op->opaque->repeat_timer = 0; - } - if (op->opaque->stderr_gsource) { - mainloop_del_fd(op->opaque->stderr_gsource); -@@ -425,6 +426,7 @@ services_action_kick(const char *name, c - } else { - if (op->opaque->repeat_timer) { - g_source_remove(op->opaque->repeat_timer); -+ op->opaque->repeat_timer = 0; - } - recurring_action_timer(op); - return TRUE; -@@ -459,6 +461,7 @@ handle_duplicate_recurring(svc_action_t - if (dup->pid != 0) { - if (op->opaque->repeat_timer) { - g_source_remove(op->opaque->repeat_timer); -+ op->opaque->repeat_timer = 0; - } - recurring_action_timer(dup); - } ---- a/lib/services/services_linux.c -+++ b/lib/services/services_linux.c -@@ -226,6 +226,7 @@ recurring_action_timer(gpointer data) - op->stdout_data = NULL; - free(op->stderr_data); - op->stderr_data = NULL; -+ op->opaque->repeat_timer = 0; - - services_action_async(op, NULL); - return FALSE; |