[Debian-ha-commits] [cluster-glue] 37/73: Imported Debian patch 1.0.10+hg2722-1
Richard Winters
devrik-guest at moszumanska.debian.org
Mon Apr 20 01:41:54 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 da5c1883d20ec002b51d7f174d425ae5965d49b5
Merge: 25d1688 5b54a7e
Author: Martin Loschwitz <madkiss at debian.org>
Date: Tue Oct 9 10:31:49 2012 +0000
Imported Debian patch 1.0.10+hg2722-1
.hg_archival.txt | 2 +-
.hgtags | 1 +
ChangeLog | 33 ++
cluster-glue-fedora.spec | 12 +-
cluster-glue-suse.spec | 4 +-
configure.ac | 34 +-
debian/changelog | 8 +
debian/cluster-glue.install | 9 +-
debian/control | 13 +-
debian/rules | 17 +-
hb_report/hb_report.in | 95 ++++--
hb_report/utillib.sh | 132 ++++----
include/clplumbing/cl_uuid.h | 2 +-
include/clplumbing/ipc.h | 2 +-
include/compress.h | 4 +-
lib/clplumbing/GSource.c | 5 +-
lib/clplumbing/Gmain_timeout.c | 198 -----------
lib/clplumbing/Makefile.am | 1 -
lib/clplumbing/cl_compress.c | 17 +-
lib/clplumbing/cl_msg.c | 105 ++----
lib/clplumbing/cl_plugin.c | 2 +-
lib/clplumbing/ipcsocket.c | 613 ++++++++++++++---------------------
lib/clplumbing/ipctest.c | 18 +-
lib/clplumbing/ocf_ipc.c | 287 +++++++---------
lib/plugins/Makefile.am | 2 +-
lib/plugins/compress/Makefile.am | 52 +++
lib/plugins/compress/bz2.c | 142 ++++++++
lib/plugins/compress/zlib.c | 135 ++++++++
lib/plugins/stonith/external/libvirt | 8 +-
lib/plugins/stonith/external/vcenter | 30 +-
lib/plugins/stonith/rhcs.c | 43 ++-
lib/stonith/Makefile.am | 2 +-
lib/stonith/ha_log.sh | 16 +-
lib/stonith/sbd-common.c | 253 +++++++++------
lib/stonith/sbd-md.c | 318 +++++++++---------
lib/stonith/sbd.h | 79 +++--
logd/logd.in | 8 +-
lrm/lrmd/lrmd.c | 32 +-
lrm/lrmd/lrmd_fdecl.h | 1 +
lrm/test/Makefile.am | 2 +-
lrm/test/lrmregtest-heartbeat.in | 17 -
lrm/test/lrmregtest-lsb | 54 +++
lrm/test/lrmregtest-lsb.in | 12 -
lrm/test/regression.sh.in | 20 +-
lrm/test/testcases/rscexec | 15 -
lrm/test/testcases/rscexec.exp | 58 ----
lrm/test/testcases/rscmgmt | 7 +-
lrm/test/testcases/rscmgmt.exp | 15 +-
lrm/test/testcases/xmllint.sh | 2 +-
49 files changed, 1548 insertions(+), 1389 deletions(-)
diff --cc debian/changelog
index 6ea296f,0000000..002b1ad
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,245 -1,0 +1,253 @@@
++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 --cc debian/cluster-glue.install
index 62160ed,0000000..6880233
mode 100644,000000..100644
--- a/debian/cluster-glue.install
+++ b/debian/cluster-glue.install
@@@ -1,96 -1,0 +1,103 @@@
+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/sbd
+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-heartbeat
+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 --cc debian/control
index d267bf4,0000000..86372e1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,155 -1,0 +1,158 @@@
+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, 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, xsltpro [...]
- Standards-Version: 3.9.1
++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, xsltpro [...]
++Standards-Version: 3.9.3
+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
+XS-Python-Version: current
+
+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 ibrary 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: libdevel
++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: The reusable cluster components for Linux HA (transitional package)
++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, 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: The reusable cluster components for Linux HA
++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 --cc debian/rules
index e9cb990,0000000..54704b5
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,108 -1,0 +1,103 @@@
+#!/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)
+
-
- CFLAGS = -Wall -g
- ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
- else
- CFLAGS += -O2
- endif
- ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
- endif
++# enable hardening
++export DEB_BUILD_HARDENING=1
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
++CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+
+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_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
--
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