diff -Nru cluster-glue-1.0.7/debian/changelog cluster-glue-1.0.7/debian/changelog --- cluster-glue-1.0.7/debian/changelog 2010-12-19 19:29:17.000000000 -0500 +++ cluster-glue-1.0.7/debian/changelog 2011-01-07 18:45:51.000000000 -0500 @@ -1,3 +1,15 @@ +cluster-glue (1.0.7-3ubuntu1) natty; urgency=low + + * Merge from debian unstable (LP: #700161). Remaining changes: + - debian/control: Tighten Replaces/Conflicts to Ubuntu version. + - debian/rules: Add -V argument to dh_makeshlibs. + - Enable Upstart RA: + + debian/cluster-glue.install: Install upstart RA. + + debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev. + + debian/patches/raexecupstart.patch: Fix deadlock + + -- Andres Rodriguez Fri, 07 Jan 2011 18:45:39 -0500 + cluster-glue (1.0.7-3) unstable; urgency=low [ Andres Rodriguez ] @@ -17,6 +29,21 @@ -- Simon Horman Thu, 16 Dec 2010 21:34:47 +0900 +cluster-glue (1.0.6+hg2461-1ubuntu1) natty; urgency=low + + * Resync from debian experimental. + * debian/control: + - Remove ${shlibs:depends} from some library -dev packages. + - Add missing Section for library packages. + - Tighten Replaces/Conflicts to Ubuntu version. + * debian/rules: Add -V argument to dh_makeshlibs. + * Enable Upstart RA: + - debian/cluster-glue.install: Install upstart RA. + - debian/control: Build-depends on libdbus-glib-1-dev and libdbus-1-dev. + - debian/patches/raexecupstart.patch: Fix deadlock + + -- Andres Rodriguez Mon, 06 Dec 2010 17:38:41 -0500 + cluster-glue (1.0.6+hg2461-1) experimental; urgency=low * Upload to experimental diff -Nru cluster-glue-1.0.7/debian/cluster-glue.install cluster-glue-1.0.7/debian/cluster-glue.install --- cluster-glue-1.0.7/debian/cluster-glue.install 2010-12-16 08:32:04.000000000 -0500 +++ cluster-glue-1.0.7/debian/cluster-glue.install 2011-01-07 18:14:52.000000000 -0500 @@ -7,6 +7,7 @@ usr/lib/heartbeat/plugins/RAExec/lsb.so usr/lib/heartbeat/plugins/RAExec/ocf.so usr/lib/heartbeat/plugins/RAExec/heartbeat.so +usr/lib/heartbeat/plugins/RAExec/upstart.so usr/lib/heartbeat/plugins/test/test.so usr/lib/heartbeat/lrmd usr/lib/heartbeat/ha_logd diff -Nru cluster-glue-1.0.7/debian/control cluster-glue-1.0.7/debian/control --- cluster-glue-1.0.7/debian/control 2010-12-19 19:22:42.000000000 -0500 +++ cluster-glue-1.0.7/debian/control 2011-01-07 18:14:52.000000000 -0500 @@ -1,9 +1,10 @@ Source: cluster-glue Section: admin Priority: optional -Maintainer: Debian HA Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian HA Maintainers Uploaders: Martin Loschwitz , Anibal Monsalve Salazar , Simon Horman , Frederik Schüler -Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltproc, docbook-xsl, chrpath, docbook-xml +Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltproc, docbook-xsl, chrpath, docbook-xml, libdbus-glib-1-dev, libdbus-1-dev Standards-Version: 3.9.1 Homepage: http://hg.linux-ha.org/glue/ Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue @@ -22,8 +23,8 @@ Package: liblrm2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcluster-glue (<= 1.0.6-1) -Conflicts: libcluster-glue (<= 1.0.6-1) +Replaces: libcluster-glue (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster libraries -- liblrm2 This package contains the lrm helper library from cluster-glue, the reusable cluster components package. Install it if you want @@ -32,8 +33,8 @@ Package: libpils2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcluster-glue (<= 1.0.6-1) -Conflicts: libcluster-glue (<= 1.0.6-1) +Replaces: libcluster-glue (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster libraries -- libpils2 This package contains the pils library from cluster-glue, the reusable cluster components package. Install it if you want to @@ -42,8 +43,8 @@ Package: libplumb2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcluster-glue (<= 1.0.6-1) -Conflicts: libcluster-glue (<= 1.0.6-1) +Replaces: libcluster-glue (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster libraries -- libplumb2 This package contains the plumber ibrary from cluster-glue, the reusable cluster components package. Install it if you want to @@ -52,8 +53,8 @@ Package: libplumbgpl2 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcluster-glue (<= 1.0.6-1) -Conflicts: libcluster-glue (<= 1.0.6-1) +Replaces: libcluster-glue (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster libraries -- libplumbgpl2 This package contains the plumber library from cluster-glue, the reusable cluster components package, in the GPL version. @@ -62,8 +63,8 @@ Package: libstonith1 Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Replaces: libcluster-glue (<= 1.0.6-1) -Conflicts: libcluster-glue (<= 1.0.6-1) +Replaces: libcluster-glue (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster libraries -- libstonith1 This package contains the stonith library from cluster-glue, the reusable cluster components package. Install it if you want to @@ -73,8 +74,8 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, liblrm2 (= ${binary:Version}) -Replaces: libcluster-glue-dev (<= 1.0.6-1) -Conflicts: libcluster-glue-dev (<= 1.0.6-1) +Replaces: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster development files -- liblrm This package contains the development files of the lrm helper library from cluster-glue, the reusable cluster components @@ -84,8 +85,8 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, libpils2 (= ${binary:Version}) -Replaces: libcluster-glue-dev (<= 1.0.6-1) -Conflicts: libcluster-glue-dev (<= 1.0.6-1) +Replaces: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster development files -- libpils2 This package contains the development files of the pils library from cluster-glue, the reusable cluster components @@ -95,8 +96,8 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, libplumb2 (= ${binary:Version}) -Replaces: libcluster-glue-dev (<= 1.0.6-1) -Conflicts: libcluster-glue-dev (<= 1.0.6-1) +Replaces: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster development files -- libplumb2 This package contains the development files of the plumber library from cluster-glue, the reusable cluster components @@ -106,8 +107,8 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, libplumbgpl2 (= ${binary:Version}) -Replaces: libcluster-glue-dev (<= 1.0.6-1) -Conflicts: libcluster-glue-dev (<= 1.0.6-1) +Replaces: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster development files -- libplumbgpl2 This package contains the development files of the plumber library from cluster-glue, the reusable cluster components @@ -117,8 +118,8 @@ Section: libdevel Architecture: any Depends: ${misc:Depends}, libstonith1 (= ${binary:Version}) -Replaces: libcluster-glue-dev (<= 1.0.6-1) -Conflicts: libcluster-glue-dev (<= 1.0.6-1) +Replaces: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) +Conflicts: libcluster-glue-dev (<= 1.0.6-1ubuntu1.1) Description: Reusable cluster development files -- libstonith1 This package contains the development files of the stonith library from cluster-glue, the reusable cluster components diff -Nru cluster-glue-1.0.7/debian/patches/raexecupstart.patch cluster-glue-1.0.7/debian/patches/raexecupstart.patch --- cluster-glue-1.0.7/debian/patches/raexecupstart.patch 1969-12-31 19:00:00.000000000 -0500 +++ cluster-glue-1.0.7/debian/patches/raexecupstart.patch 2011-01-07 18:14:52.000000000 -0500 @@ -0,0 +1,42 @@ +Index: cluster-glue-1.0.7/lrm/lrmd/lrmd.c +=================================================================== +--- cluster-glue-1.0.7.orig/lrm/lrmd/lrmd.c 2011-01-07 18:11:02.144936280 -0500 ++++ cluster-glue-1.0.7/lrm/lrmd/lrmd.c 2011-01-07 18:11:07.504936281 -0500 +@@ -1522,6 +1522,28 @@ + lrmd_client_t* client = (lrmd_client_t*) user_data; + + CHECK_ALLOCATED(client, "client", ); ++ ++ /* If we've been called as a result of g_src and/or ++ * g_src_cbk being unreffed, don't try to unref it ++ * again, as that'll deadlock. OTOH, we might have ++ * introduced a leak here. */ ++#if 0 ++ if (client->g_src != NULL) { ++ G_main_del_IPC_Channel(client->g_src); ++ } ++ ++ if (client->g_src_cbk != NULL) { ++ G_main_del_IPC_Channel(client->g_src_cbk); ++ } ++#endif ++ lrmd_client_destroy(client); ++ ++} ++ ++static void ++remove_client (lrmd_client_t *client) ++{ ++ CHECK_ALLOCATED(client, "client", ); + if (client->g_src != NULL) { + G_main_del_IPC_Channel(client->g_src); + } +@@ -1606,7 +1628,7 @@ + exist = lookup_client(client->pid); + if (NULL != exist) { + g_hash_table_remove(clients, (gpointer)&client->pid); +- on_remove_client(exist); ++ remove_client(exist); + lrmd_log(LOG_NOTICE, + "on_msg_register: the client [pid:%d] already exists in " + "internal client list, let remove it at first." diff -Nru cluster-glue-1.0.7/debian/patches/series cluster-glue-1.0.7/debian/patches/series --- cluster-glue-1.0.7/debian/patches/series 1969-12-31 19:00:00.000000000 -0500 +++ cluster-glue-1.0.7/debian/patches/series 2011-01-07 18:14:52.000000000 -0500 @@ -0,0 +1 @@ +raexecupstart.patch diff -Nru cluster-glue-1.0.7/debian/rules cluster-glue-1.0.7/debian/rules --- cluster-glue-1.0.7/debian/rules 2010-12-16 09:11:40.000000000 -0500 +++ cluster-glue-1.0.7/debian/rules 2011-01-07 18:14:52.000000000 -0500 @@ -38,7 +38,7 @@ ./configure --with-ocf-root=/usr/lib/ocf --with-initdir=/etc/init.d \ --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --mandir=/usr/share/man --libdir=/usr/lib \ - --disable-fatal-warnings + --enable-upstart --disable-fatal-warnings touch configure-stamp build: build-arch build-indep @@ -82,7 +82,7 @@ dh_compress dh_fixperms dh_perl - dh_makeshlibs + dh_makeshlibs -V dh_installdeb dh_shlibdeps dh_gencontrol