diff -Nru pacemaker-1.1.10+git20130802/debian/changelog pacemaker-1.1.10+git20130802/debian/changelog --- pacemaker-1.1.10+git20130802/debian/changelog 2014-09-04 11:58:36.000000000 -0300 +++ pacemaker-1.1.10+git20130802/debian/changelog 2014-11-11 16:18:24.000000000 -0200 @@ -1,3 +1,12 @@ +pacemaker (1.1.10+git20130802-4ubuntu4) utopic; urgency=medium + + * debian/control: dh_makeshlibs specific calls for proper dependency + versioning (LP: #1382842) + * Fix: lrmd: Prevent glib assert triggered by timers being + removed from mainloop more than once (LP: #1368737) + + -- Rafael David Tinoco Fri, 31 Oct 2014 01:06:17 -0200 + pacemaker (1.1.10+git20130802-4ubuntu3) utopic; urgency=medium * Fix: services: Do not allow duplicate recurring op entries - 1/3 (LP: #1353473) diff -Nru pacemaker-1.1.10+git20130802/debian/patches/Fix-lrmd-Prevent-glib-timers-removed-more-than-once.patch pacemaker-1.1.10+git20130802/debian/patches/Fix-lrmd-Prevent-glib-timers-removed-more-than-once.patch --- pacemaker-1.1.10+git20130802/debian/patches/Fix-lrmd-Prevent-glib-timers-removed-more-than-once.patch 1969-12-31 21:00:00.000000000 -0300 +++ pacemaker-1.1.10+git20130802/debian/patches/Fix-lrmd-Prevent-glib-timers-removed-more-than-once.patch 2014-11-10 20:09:11.000000000 -0200 @@ -0,0 +1,54 @@ +From 568e41db929a34106c8c2ff7c48716ab5c13ef49 Mon Sep 17 00:00:00 2001 +From: Andrew Beekhof +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(+) + +diff --git a/lib/services/services.c b/lib/services/services.c +index 8590b56..753e257 100644 +--- 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, const char *action, int interval /* ms */ + } 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 * op, void (*action_callback) (svc_actio + 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); + } +diff --git a/lib/services/services_linux.c b/lib/services/services_linux.c +index 961ff18..2279e4e 100644 +--- a/lib/services/services_linux.c ++++ b/lib/services/services_linux.c +@@ -227,6 +227,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; +-- +1.9.1 + diff -Nru pacemaker-1.1.10+git20130802/debian/patches/series pacemaker-1.1.10+git20130802/debian/patches/series --- pacemaker-1.1.10+git20130802/debian/patches/series 2014-09-04 11:58:33.000000000 -0300 +++ pacemaker-1.1.10+git20130802/debian/patches/series 2014-11-10 20:09:11.000000000 -0200 @@ -8,3 +8,4 @@ Fix-services-Do-not-allow-duplicate-recurring-op-ent.patch High-lrmd-Merge-duplicate-recurring-monitor-operatio.patch Fix-lrmd-Cancel-recurring-operations-before-stop-act.patch +Fix-lrmd-Prevent-glib-timers-removed-more-than-once.patch diff -Nru pacemaker-1.1.10+git20130802/debian/rules pacemaker-1.1.10+git20130802/debian/rules --- pacemaker-1.1.10+git20130802/debian/rules 2013-08-06 05:46:40.000000000 -0300 +++ pacemaker-1.1.10+git20130802/debian/rules 2014-11-11 16:19:26.000000000 -0200 @@ -166,6 +166,16 @@ chmod -x $(CURDIR)/debian/pacemaker/usr/share/pacemaker/*.rng dh_makeshlibs -a -V + dh_makeshlibs -plibcrmcommon3 -V "libcrmcommon3 (>= $(RELEASE))" + dh_makeshlibs -plibpengine4 -V "libpengine4 (>= $(RELEASE))" + dh_makeshlibs -plibpe-status4 -V "libpe-status4 (>= $(RELEASE))" + dh_makeshlibs -plibcrmservice1 -V "libcrmservice1 (>= $(RELEASE))" + dh_makeshlibs -plibtransitioner2 -V "libtransitioner2 (>= $(RELEASE))" + dh_makeshlibs -plibcib3 -V "libcib3 (>= $(RELEASE))" + dh_makeshlibs -plibpe-rules2 -V "libpe-rules2 (>= $(RELEASE))" + dh_makeshlibs -plibcrmcluster4 -V "libcrmcluster4 (>= $(RELEASE))" + dh_makeshlibs -plibstonithd2 -V "libstonithd2 (>= $(RELEASE))" + dh_makeshlibs -pliblrmd1 -V "liblrmd1 (>= $(RELEASE))" dh_perl -a dh_python2 -ppacemaker -ppacemaker-dev dh_installdeb -a