[Debian-ha-commits] [cluster-glue] 02/09: Imported Debian patch 1.0.12~rc1+hg2777-1.2

Richard Winters devrik-guest at moszumanska.debian.org
Thu Apr 16 09:56:50 UTC 2015


This is an automated email from the git hooks/post-receive script.

devrik-guest pushed a commit to branch master
in repository cluster-glue.

commit 479d35b15c9a5b4c744132a4a1d47b78e7f40223
Author: Matthias Klose <doko at debian.org>
Date:   Mon Oct 13 20:55:43 2014 +0200

    Imported Debian patch 1.0.12~rc1+hg2777-1.2
---
 debian/changelog                       | 289 +++++++++++++++++++++++++++++++++
 debian/clean                           |  43 +++++
 debian/cluster-glue-dev.install        |   9 +
 debian/cluster-glue.install            | 102 ++++++++++++
 debian/cluster-glue.logd.init          | 101 ++++++++++++
 debian/cluster-glue.manpages           |   5 +
 debian/compat                          |   1 +
 debian/control                         | 157 ++++++++++++++++++
 debian/copyright                       | 118 ++++++++++++++
 debian/liblrm2-dev.install             |   4 +
 debian/liblrm2.install                 |   2 +
 debian/libpils2-dev.install            |   4 +
 debian/libpils2.install                |   2 +
 debian/libplumb2-dev.install           |   4 +
 debian/libplumb2.install               |   2 +
 debian/libplumbgpl2-dev.install        |   3 +
 debian/libplumbgpl2.install            |   2 +
 debian/libstonith1-dev.install         |   4 +
 debian/libstonith1.install             |   2 +
 debian/patches/libtoolize_check.patch  |  56 +++++++
 debian/patches/logd_lsb_functions.diff |  12 ++
 debian/patches/raexecupstart.patch     |  41 +++++
 debian/patches/series                  |   1 +
 debian/rules                           |  95 +++++++++++
 debian/source/format                   |   1 +
 25 files changed, 1060 insertions(+)

diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..344f629
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,289 @@
+cluster-glue (1.0.12~rc1+hg2777-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Johannes Schauer ]
+  * Check for libtoolize rather than libtool. Closes: #761737
+
+  [ Andreas Metzler ]
+  * Drop unused build-dependency on libgnutls-dev. Closes: #764093
+
+  [ Matthias Klose ]
+  * Fix typo in package description. Closes: #712998.
+
+ -- Matthias Klose <doko at debian.org>  Mon, 13 Oct 2014 20:55:43 +0200
+
+cluster-glue (1.0.12~rc1+hg2777-1) unstable; urgency=medium
+
+  * New upstream release, upload to unstable
+  * debian/cluster-glue.logd.init: Add reference to lsb functions file
+  * debian/control: Bump Standards-Version
+
+ -- Martin Loschwitz <madkiss at debian.org>  Fri, 21 Feb 2014 11:48:44 +0000
+
+cluster-glue (1.0.11+hg2754-1.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Convert to dh_python2 (Closes: #616777).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Tue, 09 Jul 2013 22:29:56 +0200
+
+cluster-glue (1.0.11+hg2754-1) experimental; urgency=low
+
+  * New upstream version
+
+ -- Martin Loschwitz <madkiss at debian.org>  Wed, 20 Mar 2013 21:55:32 +0000
+
+cluster-glue (1.0.10+hg2722-1) unstable; urgency=low
+
+  * New upstream version
+  * debian/control: added libaio-dev to Build-Depends
+  * debian/rules: enable hardening
+ 
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 09 Oct 2012 10:31:49 +0000
+
+cluster-glue (1.0.9+hg2665-1) unstable; urgency=low
+
+  * Update to latest upstream mercurial tip; includes a fix for the IPMI
+    stonith plugin
+
+ -- Martin Loschwitz <madkiss at debian.org>  Wed, 29 Feb 2012 15:33:34 +0000
+
+cluster-glue (1.0.8-3) unstable; urgency=high
+
+  * debian/patches/series: Disable raexecupstart.patch as the bug causing
+    this was in glib and is fixed in Unstable by now. For further details,
+    please refer to the Ubuntu bug tracking system at
+    https://bugs.launchpad.net/ubuntu/+source/cluster-glue/+bug/821732
+    (urgency is set to high because this fixes a memory leak that might
+    otherwise crash lrmd and crmd along with it)
+
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 15 Nov 2011 17:00:18 +0000
+
+cluster-glue (1.0.8-2) unstable; urgency=low
+
+  * Added help2man to the Build-Depends: field in debian/control 
+
+ -- Martin Loschwitz <madkiss at debian.org>  Thu, 20 Oct 2011 17:16:24 +0000
+
+cluster-glue (1.0.8-1) unstable; urgency=low
+
+  * New upstream version 1.0.8.
+  * Added numerous new files to debian/cluster-glue.install
+
+ -- Martin Loschwitz <madkiss at debian.org>  Thu, 20 Oct 2011 09:05:29 +0000
+
+cluster-glue (1.0.7+hg2618-3) UNRELEASED; urgency=low
+
+  * Integrated numerous changes from the Ubuntu version of this package,
+  worth being mentioned is the upstart patch. 
+
+ -- Martin Loschwitz <madkiss at debian.org>  Thu, 20 Oct 2011 08:54:26 +0000
+
+cluster-glue (1.0.7+hg2618-2) unstable; urgency=low
+
+  * debian/control: Add proper Replaces: and Conflicts: for libstonithd0-dev 
+    for libstonithd1-dev to avoid conflicting files (Closes: #639272)
+  * debian/rules: Install the logd.cf configuration file for logd as it was
+    missing up to this point (thanks to Andreas Kurz for pointing this out)
+
+ -- Martin Loschwitz <madkiss at debian.org>  Fri, 26 Aug 2011 06:09:24 +0000
+
+cluster-glue (1.0.7+hg2618-1) unstable; urgency=low
+
+  * New upstream Mercurial Checkout
+  * Acknowledging previous NMUs; thank you very much!
+
+ -- Martin Loschwitz <madkiss at debian.org>  Wed, 24 Aug 2011 09:00:46 +0000
+
+cluster-glue (1.0.7-3.3) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Also empty dependency_libs for plugins.
+
+ -- Luk Claes <luk at debian.org>  Sun, 03 Jul 2011 09:39:39 +0200
+
+cluster-glue (1.0.7-3.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Remove references to other libraries from dependency_libs field
+    closes: #619551.
+
+ -- Luk Claes <luk at debian.org>  Sun, 29 May 2011 19:06:36 +0200
+
+cluster-glue (1.0.7-3.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * High urgency for RC bug fix.
+  * Add missing dependency on libltdl-dev to libpils2-dev, closes: #621078.
+
+ -- Julien Cristau <jcristau at debian.org>  Sun, 08 May 2011 17:29:13 +0200
+
+cluster-glue (1.0.7-3) unstable; urgency=low
+
+  [ Andres Rodriguez ]
+  * Remove ${shlibs:depends} from library -dev packages.
+
+ -- Simon Horman <horms at debian.org>  Mon, 20 Dec 2010 09:29:12 +0900
+
+cluster-glue (1.0.7-2) unstable; urgency=low
+
+  * New upstream for unstable
+
+ -- Simon Horman <horms at debian.org>  Thu, 16 Dec 2010 23:11:46 +0900
+
+cluster-glue (1.0.7-1) experimental; urgency=low
+
+  * New Upstream
+
+ -- Simon Horman <horms at debian.org>  Thu, 16 Dec 2010 21:34:47 +0900
+
+cluster-glue (1.0.6+hg2461-1) experimental; urgency=low
+
+  * Upload to experimental
+  * New upstream checkout (2010-10-19) 
+  * Major change: Library split into multiple packages to comply with
+    Debian policy better (as per c. 8.1)
+  * Removed the "spelling-fixes"-patch as it was applied by upstream
+  * Bumped Standards-Version to 3.9.1
+
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 19 Oct 2010 11:50:00 +0200
+
+cluster-glue (1.0.6-1) unstable; urgency=low
+
+  * New upstream (closes: #588938)
+    - Cleans CFLAGS in a dash-friendly way (closes: #582875)
+
+ -- Simon Horman <horms at debian.org>  Wed, 14 Jul 2010 09:53:50 +0900
+
+cluster-glue (1.0.5-2) unstable; urgency=low
+
+  * Add build dependency on docbook-xml.
+
+ -- Frederik Schüler <fs at debian.org>  Mon, 03 May 2010 20:05:32 +0200
+
+cluster-glue (1.0.5-1) unstable; urgency=low
+
+  * New upstream version 1.0.5 
+
+ -- Martin Loschwitz <madkiss at debian.org>  Fri, 16 Apr 2010 06:25:09 +0000
+
+cluster-glue (1.0.3+hg2366-4) unstable; urgency=low
+
+  * Disable fatal warnings to make cluster-glue compile on numerous 
+  architectures other than x86(_64) 
+
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 06 Apr 2010 13:08:01 +0000
+
+cluster-glue (1.0.3+hg2366-3) unstable; urgency=low
+
+  * Added files to cluster-glue.install that were added upstream 
+
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 11:03:34 +0000
+
+cluster-glue (1.0.3+hg2366-2) unstable; urgency=low
+
+  * Include patch by Simon Hormann to Replaces/Conflicts 
+
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 07:04:53 +0000
+
+cluster-glue (1.0.3+hg2366-1) unstable; urgency=low
+
+  * New upstream checkout.
+  * Updated debian/copyright to reflect the current situation
+  * Remove useless STYLESHEET_PREFIX patch from debian/patches
+
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 30 Mar 2010 06:28:50 +0000
+
+cluster-glue (1.0.3+hg2365-1) unstable; urgency=low
+
+  * New upstream checkout.
+  * Move lintian overides from cluster-glue to libcluster-glue.
+
+ -- Frederik Schüler <fs at debian.org>  Fri, 12 Mar 2010 12:36:56 +0100
+
+cluster-glue (1.0.3+hg2337-2) unstable; urgency=low
+
+  * Add libcluster-glue{-dev}.install files, and actually install libraries.
+
+ -- Frederik Schüler <fs at debian.org>  Tue, 09 Mar 2010 13:12:04 +0100
+
+cluster-glue (1.0.3+hg2337-1) unstable; urgency=low
+
+  [ Martin G. Loschwitz ] 
+  * Replaced the copyright-file with the one updated by Ante Karamatic
+  * Split cluster-glue into libcluster-glue{-dev} and cluster-glue{-dev}
+ 
+ -- Martin Loschwitz <madkiss at debian.org>  Wed, 02 Mar 2010 13:02:00 +0100
+
+cluster-glue (1.0.3-2) UNRELEASED; urgency=low
+
+  [ Simon Horman ]
+  * Do not do a binary-indep build as there is nothing to do.
+  * Build-Depend on libsensors4-dev | libsensors-dev.
+
+  [ Frederik Schüler ]
+  * Bump standards to version 3.8.4, no changes needed.
+  * Switch to source version 3.0 "quilt".
+  * Switch to debian compatibility level 7.
+  * Drop dpatch.
+  * Add misc-depends to cluster-glue-dev.
+  * Add linian overrides.
+  * Remove rpath from ipmilan.so.
+
+ -- Frederik Schüler <fs at debian.org>  Fri, 26 Feb 2010 19:39:13 +0100
+
+cluster-glue (1.0.3-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Martin Loschwitz <madkiss at debian.org>  Wed, 03 Feb 2010 08:05:00 +0100
+
+cluster-glue (1.0.2~rc2b+hg20100127-0test1) unstable; urgency=low
+
+  * New build of the Debian version of this package, incorporating many
+    changes done by Ante Karamatic (thank you very much!)
+  * New upstream checkout
+
+ -- Martin Loschwitz <madkiss at debian.org>  Wed, 26 Jan 2010 12:58:00 +0200
+
+cluster-glue (1.0.2~rc2a-0ubuntu0ppa2) lucid; urgency=low
+
+  * Addes docbook-xsl to build-depends
+  * debian/patches/01_stylesheet_path.dpatch:
+    - use local docbook
+
+ -- Ante Karamatic <ivoks at ubuntu.com>  Mon, 04 Jan 2010 15:18:40 +0000
+
+cluster-glue (1.0.2~rc2a-0ubuntu0ppa1) lucid; urgency=low
+
+  * New upstream checkout
+  * Added xsltproc to build-depends; needed for rebuilding of man pages
+  * Modified paths in cluster-glue.install and cluster-glue-dev.install
+
+ -- Ante Karamatic <ivoks at ubuntu.com>  Sun, 03 Jan 2010 09:38:25 +0000
+
+cluster-glue (1.0+hg20091102-1~bpo50+1) lenny-backports; urgency=low
+
+  * Rebuild for lenny-backports.
+
+ -- Martin Loschwitz <madkiss at debian.org>  Mon, 02 Nov 2009 15:02:29 +0000
+
+cluster-glue (1.0+hg20091102-1) unstable; urgency=low
+
+  * New upstream checkout
+
+ -- Martin Loschwitz <madkiss at debian.org>  Mon, 02 Nov 2009 00:00:00 +0100
+
+cluster-glue (1.0+hg20091012-1) unstable; urgency=low
+
+  * New upstream checkout
+  * Adopting numerous changes from HG
+
+ -- Martin Loschwitz <madkiss at debian.org>  Mon, 12 Oct 2009 16:14:00 +0200
+
+cluster-glue (1.0+hg20090915-1) unstable; urgency=low
+
+  * Initial release of packages for the cluster-glue-framework
+
+ -- Martin Loschwitz <madkiss at debian.org>  Tue, 15 Sep 2009 09:56:16 +0000
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..7f02294
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,43 @@
+aclocal.m4
+autoconf
+autoheader
+automake
+compile
+config.guess
+config.sub
+configure
+depcomp
+doc/Makefile.in
+doc/stonith/Makefile.in
+hb_report/Makefile.in
+include/clplumbing/Makefile.in
+include/config.h.in
+include/lrm/Makefile.in
+include/Makefile.in
+include/pils/Makefile.in
+include/stonith/Makefile.in
+INSTALL
+install-sh
+lib/clplumbing/Makefile.in
+lib/lrm/Makefile.in
+libltdl.tar
+lib/Makefile.in
+lib/pils/Makefile.in
+lib/plugins/InterfaceMgr/Makefile.in
+lib/plugins/lrm/Makefile.in
+lib/plugins/Makefile.in
+lib/plugins/stonith/external/Makefile.in
+lib/plugins/stonith/Makefile.in
+lib/stonith/Makefile.in
+libtool.m4
+logd/Makefile.in
+lrm/admin/Makefile.in
+lrm/lrmd/Makefile.in
+lrm/Makefile.in
+lrm/test/Makefile.in
+lrm/test/testcases/Makefile.in
+ltdl.m4
+ltmain.sh
+Makefile.in
+missing
+replace/Makefile.in
diff --git a/debian/cluster-glue-dev.install b/debian/cluster-glue-dev.install
new file mode 100644
index 0000000..0cd2626
--- /dev/null
+++ b/debian/cluster-glue-dev.install
@@ -0,0 +1,9 @@
+usr/lib/heartbeat/plugins/InterfaceMgr/*.la
+usr/lib/heartbeat/plugins/InterfaceMgr/*.a
+usr/lib/heartbeat/plugins/RAExec/*.la
+usr/lib/heartbeat/plugins/RAExec/*.a
+usr/lib/heartbeat/plugins/test/*.la
+usr/lib/heartbeat/plugins/test/*.a
+usr/lib/stonith/plugins/stonith2/*.la
+usr/lib/stonith/plugins/stonith2/*.a
+usr/include/heartbeat/*.h
diff --git a/debian/cluster-glue.install b/debian/cluster-glue.install
new file mode 100644
index 0000000..1eb34be
--- /dev/null
+++ b/debian/cluster-glue.install
@@ -0,0 +1,102 @@
+usr/lib/heartbeat/ipctest
+usr/lib/heartbeat/ipctransientclient
+usr/lib/heartbeat/ipctransientserver
+usr/lib/heartbeat/base64_md5_test
+usr/lib/heartbeat/transient-test.sh
+usr/lib/heartbeat/plugins/InterfaceMgr/generic.so
+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
+usr/lib/heartbeat/logtest
+usr/lib/stonith/plugins/external/*
+usr/lib/stonith/plugins/stonith2/apcmaster.so
+usr/lib/stonith/plugins/stonith2/apcmastersnmp.so
+usr/lib/stonith/plugins/stonith2/apcsmart.so
+usr/lib/stonith/plugins/stonith2/baytech.so
+usr/lib/stonith/plugins/stonith2/bladehpi.so
+usr/lib/stonith/plugins/stonith2/cyclades.so
+usr/lib/stonith/plugins/stonith2/drac3.so
+usr/lib/stonith/plugins/stonith2/external.so
+usr/lib/stonith/plugins/stonith2/ibmhmc.so
+usr/lib/stonith/plugins/stonith2/ipmilan.so
+usr/lib/stonith/plugins/stonith2/meatware.so
+usr/lib/stonith/plugins/stonith2/null.so
+usr/lib/stonith/plugins/stonith2/nw_rpc100s.so
+usr/lib/stonith/plugins/stonith2/rcd_serial.so
+usr/lib/stonith/plugins/stonith2/rps10.so
+usr/lib/stonith/plugins/stonith2/ssh.so
+usr/lib/stonith/plugins/stonith2/suicide.so
+usr/lib/stonith/plugins/stonith2/wti_nps.so
+usr/lib/stonith/plugins/stonith2/ribcl.py
+usr/lib/stonith/plugins/stonith2/rhcs.so
+usr/lib/stonith/plugins/stonith2/wti_mpc.so
+var/*
+usr/sbin/stonith
+usr/sbin/meatclient
+usr/sbin/lrmadmin
+usr/sbin/ha_logger
+usr/sbin/hb_report
+usr/share/doc/cluster-glue/stonith/README_kdumpcheck.txt
+usr/share/doc/cluster-glue/stonith/README.bladehpi
+usr/share/doc/cluster-glue/stonith/README.cyclades
+usr/share/doc/cluster-glue/stonith/README.drac3
+usr/share/doc/cluster-glue/stonith/README.external
+usr/share/doc/cluster-glue/stonith/README.ipmilan
+usr/share/doc/cluster-glue/stonith/README.meatware
+usr/share/doc/cluster-glue/stonith/README.rcd_serial
+usr/share/doc/cluster-glue/stonith/README.riloe
+usr/share/doc/cluster-glue/stonith/README.vacm
+usr/share/doc/cluster-glue/stonith/README.ibmrsa
+usr/share/doc/cluster-glue/stonith/README.dracmc
+usr/share/doc/cluster-glue/stonith/README.wti_mpc
+usr/share/doc/cluster-glue/stonith/README.ibmrsa-telnet
+usr/share/doc/cluster-glue/stonith/README.vcenter
+usr/share/doc/cluster-glue/stonith/README.rackpdu
+usr/share/cluster-glue/lrmtest/testcases/BSC
+usr/share/cluster-glue/lrmtest/testcases/metadata
+usr/share/cluster-glue/lrmtest/testcases/metadata.exp
+usr/share/cluster-glue/lrmtest/testcases/rscexec
+usr/share/cluster-glue/lrmtest/testcases/rscexec.exp
+usr/share/cluster-glue/lrmtest/testcases/rscmgmt
+usr/share/cluster-glue/lrmtest/testcases/rscmgmt.exp
+usr/share/cluster-glue/lrmtest/testcases/common.filter
+usr/share/cluster-glue/lrmtest/testcases/ra-list.sh
+usr/share/cluster-glue/lrmtest/testcases/rscmgmt.log_filter
+usr/share/cluster-glue/lrmtest/testcases/xmllint.sh
+usr/share/cluster-glue/lrmtest/testcases/basicset
+usr/share/cluster-glue/lrmtest/README.regression
+usr/share/cluster-glue/lrmtest/defaults
+usr/share/cluster-glue/lrmtest/descriptions
+usr/share/cluster-glue/lrmtest/lrmadmin-interface
+usr/share/cluster-glue/lrmtest/language
+usr/share/cluster-glue/lrmtest/LRMBasicSanityCheck
+usr/share/cluster-glue/lrmtest/regression.sh
+usr/share/cluster-glue/lrmtest/evaltest.sh
+usr/share/cluster-glue/lrmtest/lrmregtest
+usr/share/cluster-glue/lrmtest/lrmregtest-lsb
+usr/share/cluster-glue/utillib.sh
+usr/share/cluster-glue/ha_cf_support.sh
+usr/share/cluster-glue/openais_conf_support.sh
+usr/share/cluster-glue/combine-logs.pl
+usr/share/cluster-glue/ha_log.sh
+usr/lib/stonith/plugins/xen0-ha-dom0-stonith-helper
+etc/init.d/logd
+usr/share/man/man1/ha_logger.1 
+usr/share/man/man8/meatclient.8 
+usr/share/man/man8/hb_report.8
+usr/share/man/man8/ha_logd.8
+usr/share/man/man8/stonith.8
+usr/share/man/man8/lrmadmin.8
+usr/sbin/cibsecret
+usr/share/cluster-glue/lrmtest/testcases/stonith.exp
+usr/share/cluster-glue/lrmtest/testcases/stonith 
+usr/lib/heartbeat/plugins/compress/zlib.so
+usr/lib/heartbeat/plugins/compress/bz2.a 
+usr/lib/heartbeat/plugins/compress/bz2.la 
+usr/lib/heartbeat/plugins/compress/zlib.a 
+usr/lib/heartbeat/plugins/compress/zlib.la 
+usr/lib/heartbeat/plugins/compress/bz2.so 
diff --git a/debian/cluster-glue.logd.init b/debian/cluster-glue.logd.init
new file mode 100644
index 0000000..50f1512
--- /dev/null
+++ b/debian/cluster-glue.logd.init
@@ -0,0 +1,101 @@
+#!/bin/sh
+#
+#
+# logd     	    Start logd (non-blocking log service)
+#
+# Author:       Dejan Muhamedagic <dmuhamedagic at suse.de>
+#               (After the heartbeat init script)
+# License:      GNU General Public License (GPL)
+#
+#		This script works correctly under SuSE, Debian,
+#		Conectiva, Red Hat and a few others.  Please let me know if it
+#		doesn't work under your distribution, and we'll fix it.
+#		We don't hate anyone, and like for everyone to use
+#		our software, no matter what OS or distribution you're using.
+#
+# chkconfig: 2345 @LOGD_INITSTARTPRI@ @LOGD_INITSTOPPRI@
+# description: Startup script logd service.
+# processname: ha_logd
+# pidfile: /var/run/logd.pid
+# config: /etc/logd.cf
+#
+### BEGIN INIT INFO
+# Description: ha_logd is a non-blocking logging daemon.
+#	It can log messages either to a file or through syslog
+#	daemon.
+# Short-Description: ha_logd logging daemon
+# Provides: ha_logd
+# Required-Start: $network $syslog $remote_fs
+# Required-Stop: $network $syslog $remote_fs
+# X-Start-Before: heartbeat openais
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+LOGD_CFG=/etc/logd.cf
+LOGD_OPT=""
+[ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
+LOGD_BIN="/usr/lib/heartbeat/ha_logd"
+
+if [ ! -f $LOGD_BIN ]; then
+  echo -n "ha_logd not installed."
+  exit 5
+fi
+
+StartLogd() {
+    echo -n "Starting ha_logd: "
+    $LOGD_BIN -s >/dev/null 2>&1
+    if [ $? -eq 0 ]; then
+	echo "logd is already running" 
+	return 0
+    fi
+    
+    $LOGD_BIN -d $LOGD_OPT >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+	echo "starting logd failed"
+	exit 1
+    fi
+    echo "ok"
+    exit 0
+}
+
+StopLogd() {
+    echo -n "Stopping ha_logd: "
+
+    $LOGD_BIN -s >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+	   echo "logd is already stopped" 
+	   return 0
+    fi
+
+    $LOGD_BIN -k >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+	echo "stopping logd failed"
+	exit 1
+    fi
+    echo "stopped"
+    exit 0
+}
+
+StatusLogd() {
+  $LOGD_BIN -s
+  exit $?
+}
+
+case "$1" in
+  start) StartLogd ;;
+  status) StatusLogd ;;
+  stop) StopLogd ;;
+  restart|force-reload)
+        sleeptime=1
+	$0 stop && sleep $sleeptime && $0 start
+	echo
+	;;
+
+  *)
+	echo "Usage: $0 {start|stop|status|restart}"
+	exit 1
+esac
+
diff --git a/debian/cluster-glue.manpages b/debian/cluster-glue.manpages
new file mode 100644
index 0000000..f264b8f
--- /dev/null
+++ b/debian/cluster-glue.manpages
@@ -0,0 +1,5 @@
+doc/meatclient.8
+doc/stonith.8
+doc/ha_logd.8
+doc/hb_report.8
+doc/ha_logger.1
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..3c7a368
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,157 @@
+Source: cluster-glue
+Section: admin
+Priority: optional
+Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Anibal Monsalve Salazar <anibal at debian.org>, Simon Horman <horms at debian.org>, Frederik Schüler <fs at debian.org>
+Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python (>= 2.6.6-3~), 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, python-dev (>= 2.6.6-3~), libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltproc, docbook-xs [...]
+Standards-Version: 3.9.5
+Homepage: http://hg.linux-ha.org/glue/
+Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
+Vcs-Browser: http://hg.debian.org/hg/debian-ha/cluster-glue
+
+Package: libcluster-glue
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, liblrm2 (>= ${binary:Version}), libpils2 (>= ${binary:Version}), libplumb2 (>= ${binary:Version}), libplumbgpl2 (>= ${binary:Version}), libstonith1 (>= ${binary:Version})
+Description: Reusable cluster libraries (transitional package)
+ This package used to contain all the libraries from cluster-glue,
+ the reusable cluster components package. It's now a transitional
+ package without any content, depending on all the single library
+ packages that now exist.
+
+Package: liblrm2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-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 
+ to use the pacemaker cluster manager.
+
+Package: libpils2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-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 
+ use the pacemaker cluster manager.
+ 
+Package: libplumb2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
+Description: Reusable cluster libraries -- libplumb2
+ This package contains the plumber library from cluster-glue, the 
+ reusable cluster components package. Install it if you want to 
+ use the pacemaker cluster manager.
+
+Package: libplumbgpl2
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1)
+Conflicts: libcluster-glue (<= 1.0.6-1)
+Description: Reusable cluster libraries -- libplumbgpl2
+ This package contains the plumber library from cluster-glue,
+ the reusable cluster components package, in the GPL version. 
+ Install it if you want to use the pacemaker cluster manager.
+
+Package: libstonith1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: libcluster-glue (<= 1.0.6-1), libstonith0
+Conflicts: libcluster-glue (<= 1.0.6-1), libstonith0
+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 
+ use the pacemaker cluster manager.
+
+Package: liblrm2-dev
+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)
+Description: Reusable cluster development files -- liblrm
+ This package contains the development files of the lrm helper 
+ library from cluster-glue, the reusable cluster components 
+ package. 
+
+Package: libpils2-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libpils2 (= ${binary:Version}), libltdl-dev
+Replaces: libcluster-glue-dev (<= 1.0.6-1)
+Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Description: Reusable cluster development files -- libpils2
+ This package contains the development files of the pils 
+ library from cluster-glue, the reusable cluster components 
+ package. 
+
+Package: libplumb2-dev
+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)
+Description: Reusable cluster development files -- libplumb2
+ This package contains the development files of the plumber 
+ library from cluster-glue, the reusable cluster components 
+ package. 
+
+Package: libplumbgpl2-dev
+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)
+Description: Reusable cluster development files -- libplumbgpl2
+ This package contains the development files of the plumber 
+ library from cluster-glue, the reusable cluster components 
+ package, in the GPL version. 
+
+Package: libstonith1-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, libstonith1 (= ${binary:Version})
+Replaces: libcluster-glue-dev (<= 1.0.6-1), libstonith0-dev
+Conflicts: libcluster-glue-dev (<= 1.0.6-1), libstonith0-dev
+Description: Reusable cluster development files -- libstonith1
+ This package contains the development files of the stonith 
+ library from cluster-glue, the reusable cluster components 
+ package. 
+
+Package: libcluster-glue-dev
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, liblrm2-dev (>= ${binary:Version}), libpils2-dev (>= ${binary:Version}), libplumb2-dev (>= ${binary:Version}), libplumbgpl2-dev (>= ${binary:Version}), libstonith1-dev (>= ${binary:Version})
+Description: Reusable cluster components for Linux HA (transitional package)
+ This package used to contain all the development files for the 
+ libraries from cluster-glue, the reusable cluster components 
+ package. It's now a transitional package without any content, 
+ depending on all the single library development packages that 
+ now exist.
+
+Package: cluster-glue
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}, libtimedate-perl, liblrm2 (= ${binary:Version}), libpils2 (= ${binary:Version}), libplumb2 (= ${binary:Version}), libplumbgpl2 (= ${binary:Version}), libstonith1 (= ${binary:Version})
+Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
+Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
+Description: Reusable cluster components for Linux HA
+ This package contains node fencing plugins, an error reporting
+ utility, and other reusable cluster components from
+ the Linux HA project.
+
+Package: cluster-glue-dev
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, liblrm2-dev (= ${binary:Version}), libpils2-dev (= ${binary:Version}), libplumb2-dev (= ${binary:Version}), libplumbgpl2-dev (= ${binary:Version}), libstonith1-dev (= ${binary:Version})
+Replaces: libcluster-glue-dev (<= 1.0.6-1)
+Conflicts: libcluster-glue-dev (<= 1.0.6-1)
+Description: Development files for the cluster glue components
+ This package includes headers and static libraries for the glue
+ cluster components.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..4ff1868
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,118 @@
+This package was first debianized by Paolo Molaro <lupus at debian.org> on
+Wed, 17 Nov 1999 17:30:23 +0100.
+
+The original sources can be found at:
+	http://linux-ha.org/wiki/Download
+
+Upstream Authors (from AUTHORS) and copyright holders: (c) 1998-2010
+
+	Alan Robertson <alanr at unix.sh>
+	Andreas Mock <andreas.mock at web.de>
+	Andrew Beekhof <andrew at beekhof.net>
+	Dave Blaschke <debltc at us.ibm.com>
+	David Lee <t.d.lee at durham.ac.uk>
+	Dejan Muhamedagic <dejan at hello-penguin.com>
+	Hannes Eder <heder at google.com>
+	Huang Zhen <zhenhltc at cn.ibm.com>
+	Junko Ikeda <ikedaj at intellilink.co.jp>
+	Lars Marowsky-Bree <lmb at suse.de>
+	Martin Bene <martin.bene at icomedias.com>
+	Phil Carns <carns at mcs.anl.gov>
+	Satomi Taniguchi <taniguchis at intellilink.co.jp>
+	Sean Reifschneider <jafo at tummy.com>
+	Sebastian Reitenbach <itlistuser at rapideye.de>
+	Serge Dubrouski <sergeyfd at gmail.com>
+	Simon Horman <horms at verge.net.au>
+	Xinwei Hu <hxinwei at gmail.com>
+
+Code for the following pieces borrowed from code by:
+	Tom Vogt <tom at lemuria.org>	(udp code)
+	yuri volobuev <volobuev at t1.chem.umn.edu> (send_arp.c)
+	'Network UPS Tools' by Russell Kroll <rkroll at exploits.org>
+ 		homepage: http://www.exploits.org/nut/
+		(Andreas Piesk borrowed code for APCSmart support)
+	David C. Teigland <teigland at sistina.com>
+		wrote original meatware support for GFS stomith
+	salz at pebbles.bbn.com - replacement scandir function
+	Internet Software Consortium (bind) - replacement inet_pton()
+		function
+	Matt Soffen <matt at soffen.com>	(replace/alphasort.c,
+					 replace/daemon.c)
+	
+NOTE:	The work of everyone on this project is dearly appreciated. If you
+	are not listed here but should be, please notify us!
+
+Although upstream claims differently, the contents of this package do
+not fall under one common license. 
+
+=====================================================================
+
+The following components of this package are licensed under the GNU
+Lesser General Public License 2.1 (LGPL):
+
+include/clplumbing/Gmain_timeout.h, include/clplumbing/apphb_cs.h,
+include/clplumbing/coredumps.h, include/clplumbing/netstring.h,
+include/ha_msg.h, include/lha_internal.h, include/pils/generic.h,
+include/pils/interface.h, include/pils/plugin.h.in,
+lib/clplumbing/cl_malloc.c, lib/clplumbing/cl_msg.c,
+lib/clplumbing/cl_msg_types.c, lib/clplumbing/cl_poll.c,
+lib/clplumbing/coredumps.c, lib/clplumbing/cpulimits.c,
+lib/pils/main.c, lib/pils/pils.c, lib/pils/test.c,
+replace/NoSuchFunctionName.c, replace/setenv.c,
+replace/strerror.c, replace/strlcat.c, replace/strlcpy.c,
+replace/strndup.c, replace/strnlen.c, replace/unsetenv.c
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+=====================================================================
+
+The following component of this package are licensed under the terms
+of the BSD license:
+
+replace/daemon.c
+replace/alphasort.c
+
+The BSD license is as follows.
+
+Copyright (c) The Regents of the University of California.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+=====================================================================
+
+The following component of this package is public domain software and
+does not fall under any license's terms:
+
+replace/scandir.c
+
+=====================================================================
+
+All other components of this package are licensed under the GNU General 
+Public License in version 2.
+
+On Debian systems, the complete text of the GNU General Public License 
+v2 can be found in `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/liblrm2-dev.install b/debian/liblrm2-dev.install
new file mode 100644
index 0000000..5dfe7f6
--- /dev/null
+++ b/debian/liblrm2-dev.install
@@ -0,0 +1,4 @@
+usr/lib/liblrm.so
+usr/lib/liblrm.a
+usr/lib/liblrm.la
+usr/include/heartbeat/lrm/*.h
diff --git a/debian/liblrm2.install b/debian/liblrm2.install
new file mode 100644
index 0000000..ab3ceb1
--- /dev/null
+++ b/debian/liblrm2.install
@@ -0,0 +1,2 @@
+usr/lib/liblrm.so.2.0.0
+usr/lib/liblrm.so.2
diff --git a/debian/libpils2-dev.install b/debian/libpils2-dev.install
new file mode 100644
index 0000000..7401d2b
--- /dev/null
+++ b/debian/libpils2-dev.install
@@ -0,0 +1,4 @@
+usr/lib/libpils.so
+usr/lib/libpils.a
+usr/lib/libpils.la
+usr/include/pils/*.h
diff --git a/debian/libpils2.install b/debian/libpils2.install
new file mode 100644
index 0000000..f36befc
--- /dev/null
+++ b/debian/libpils2.install
@@ -0,0 +1,2 @@
+usr/lib/libpils.so.2.0.0
+usr/lib/libpils.so.2
diff --git a/debian/libplumb2-dev.install b/debian/libplumb2-dev.install
new file mode 100644
index 0000000..8a9ddad
--- /dev/null
+++ b/debian/libplumb2-dev.install
@@ -0,0 +1,4 @@
+usr/lib/libplumb.so
+usr/lib/libplumb.a
+usr/lib/libplumb.la
+usr/include/clplumbing/*.h
diff --git a/debian/libplumb2.install b/debian/libplumb2.install
new file mode 100644
index 0000000..574594c
--- /dev/null
+++ b/debian/libplumb2.install
@@ -0,0 +1,2 @@
+usr/lib/libplumb.so.2.1.0
+usr/lib/libplumb.so.2
diff --git a/debian/libplumbgpl2-dev.install b/debian/libplumbgpl2-dev.install
new file mode 100644
index 0000000..1d42930
--- /dev/null
+++ b/debian/libplumbgpl2-dev.install
@@ -0,0 +1,3 @@
+usr/lib/libplumbgpl.so
+usr/lib/libplumbgpl.a
+usr/lib/libplumbgpl.la
diff --git a/debian/libplumbgpl2.install b/debian/libplumbgpl2.install
new file mode 100644
index 0000000..fab8102
--- /dev/null
+++ b/debian/libplumbgpl2.install
@@ -0,0 +1,2 @@
+usr/lib/libplumbgpl.so.2.0.0
+usr/lib/libplumbgpl.so.2
diff --git a/debian/libstonith1-dev.install b/debian/libstonith1-dev.install
new file mode 100644
index 0000000..f38d809
--- /dev/null
+++ b/debian/libstonith1-dev.install
@@ -0,0 +1,4 @@
+usr/lib/libstonith.so
+usr/lib/libstonith.a
+usr/lib/libstonith.la
+usr/include/stonith/*.h
diff --git a/debian/libstonith1.install b/debian/libstonith1.install
new file mode 100644
index 0000000..6dda1c7
--- /dev/null
+++ b/debian/libstonith1.install
@@ -0,0 +1,2 @@
+usr/lib/libstonith.so.1.0.0
+usr/lib/libstonith.so.1
diff --git a/debian/patches/libtoolize_check.patch b/debian/patches/libtoolize_check.patch
new file mode 100644
index 0000000..b2eb71b
--- /dev/null
+++ b/debian/patches/libtoolize_check.patch
@@ -0,0 +1,56 @@
+Description: check for libtoolize rather than libtool
+Author: Johannes Schauer <j.schauer at email.de>
+Forwarded: no
+
+--- cluster-glue-1.0.12~rc1+hg2777.orig/autogen.sh
++++ cluster-glue-1.0.12~rc1+hg2777/autogen.sh
+@@ -91,16 +91,11 @@ do
+   fi
+ done
+ 
+-for command in libtool14 libtool15 libtool glibtool 
+-do
+-  URL=$gnu/$pkg/
+-  if
+-    testProgram $command
+-  then
+-    libtool=$command
+-    libtoolize=`echo  "$libtool" | sed -e 's/libtool/libtoolize/'`
+-  fi
+-done
++if
++  testProgram libtoolize
++then
++  libtoolize=libtoolize
++fi
+ 
+ if [ -z $autoconf ]; then 
+     echo You must have autoconf installed to compile the cluster-glue package.
+@@ -114,7 +109,7 @@ elif [ -z $automake ]; then
+     echo or get the source tarball at: $gnu/automake/
+     exit 1
+ 
+-elif [ -z $libtool ]; then 
++elif [ -z $libtoolize ]; then 
+     echo You must have libtool installed to compile the cluster-glue package.
+     echo Download the appropriate package for your system,
+     echo or get the source tarball at: $gnu/libtool/
+@@ -125,7 +120,7 @@ oneline() {
+   read x; echo "$x"
+ }
+ 
+-LT_version=`$libtool --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
++LT_version=`$libtoolize --version | oneline | sed -e 's%^[^0-9]*%%' -e s'% .*%%'`
+ LT_majvers=`echo "$LT_version" | sed -e 's%\..*%%'`
+ LT_minvers=`echo "$LT_version" | sed -e 's%^[^.]*\.%%' `
+ LT_minnum=`echo  "$LT_minvers" | sed -e 's%[^0-9].*%%'`
+@@ -138,8 +133,7 @@ then
+ fi
+ 
+ # Create local copies so that the incremental updates will work.
+-rm -f ./autoconf ./automake ./autoheader ./libtool
+-ln -s `which $libtool` ./libtool
++rm -f ./autoconf ./automake ./autoheader
+ ln -s `which $autoconf` ./autoconf
+ ln -s `which $automake` ./automake
+ ln -s `which $autoheader` ./autoheader
diff --git a/debian/patches/logd_lsb_functions.diff b/debian/patches/logd_lsb_functions.diff
new file mode 100644
index 0000000..f94ba9a
--- /dev/null
+++ b/debian/patches/logd_lsb_functions.diff
@@ -0,0 +1,12 @@
+diff -ruN Reusable-Cluster-Components-glue--b5f160509785.bak/logd/logd.in Reusable-Cluster-Components-glue--b5f160509785/logd/logd.in
+--- Reusable-Cluster-Components-glue--b5f160509785.bak/logd/logd.in	2013-10-31 12:09:50.000000000 +0000
++++ Reusable-Cluster-Components-glue--b5f160509785/logd/logd.in	2014-02-21 11:57:33.320264663 +0000
+@@ -32,6 +32,8 @@
+ # Default-Stop: 0 1 6
+ ### END INIT INFO
+ 
++. /lib/lsb/init-functions
++
+ LOGD_CFG=@sysconfdir@/logd.cf
+ LOGD_OPT=""
+ [ -f "$LOGD_CFG" ] && LOGD_OPT="-c $LOGD_CFG"
diff --git a/debian/patches/raexecupstart.patch b/debian/patches/raexecupstart.patch
new file mode 100644
index 0000000..f72c9de
--- /dev/null
+++ b/debian/patches/raexecupstart.patch
@@ -0,0 +1,41 @@
+diff -ruN Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c
+--- Reusable-Cluster-Components-glue--5ea7e344a633.old/lrm/lrmd/lrmd.c	2011-10-19 15:18:06.000000000 +0000
++++ Reusable-Cluster-Components-glue--5ea7e344a633/lrm/lrmd/lrmd.c	2011-10-20 09:26:43.385459974 +0000
+@@ -1533,6 +1533,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);
+ 	}
+@@ -1617,7 +1639,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 --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8173aea
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libtoolize_check.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..40c7258
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,95 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+# enable hardening 
+export DEB_BUILD_HARDENING=1
+
+DTMP:=$(CURDIR)/debian/tmp
+RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
+UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
+
+configure: configure-stamp
+configure-stamp: 
+	dh_testdir
+	test -x ./configure || ./autogen.sh
+	./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 \
+		    --enable-upstart --disable-fatal-warnings
+	touch configure-stamp
+
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp  
+	$(MAKE)
+	touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp  
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	[ ! -f Makefile ] || $(MAKE) clean
+	[ ! -f Makefile ] || $(MAKE) distclean
+	dh_clean 
+
+install: install-indep install-arch
+install-indep:
+
+install-arch:
+	dh_testdir
+	dh_testroot
+	dh_prep -s
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	for file in `find debian/tmp -name '*.la'`; do \
+		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
+	done
+	chrpath -r "" debian/tmp/usr/lib/stonith/plugins/stonith2/ipmilan.so || true
+	dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
+
+	# install logd.cf configuration file
+	mkdir -p $(CURDIR)/debian/cluster-glue/etc/
+	cp -ax $(CURDIR)/logd/logd.cf $(CURDIR)/debian/cluster-glue/etc/
+
+binary-common:
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installman
+	dh_lintian
+	dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'
+	dh_python2
+	dh_python2 /usr/lib/stonith/plugins/stonith2
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_perl
+	dh_makeshlibs -V
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+	$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+	$(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git



More information about the Debian-HA-Commits mailing list