From 70f15f82608220f5351716d4fb29ff5d0c339010 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 08:40:13 +0200 Subject: Adding debian version 1.0.12-22. Signed-off-by: Daniel Baumann --- debian/changelog | 573 +++++++++++++++++++++ debian/clean | 44 ++ debian/cluster-glue-dev.install | 1 + debian/cluster-glue.install | 97 ++++ debian/cluster-glue.lintian-overrides | 4 + debian/cluster-glue.logd.init | 102 ++++ debian/cluster-glue.manpages | 5 + debian/cluster-glue.postinst | 14 + debian/control | 216 ++++++++ debian/copyright | 113 ++++ debian/liblrm2-dev.install | 2 + debian/liblrm2.install | 2 + debian/liblrm2.symbols | 24 + debian/libpils2-dev.install | 2 + debian/libpils2.install | 2 + debian/libpils2.symbols | 22 + debian/libplumb2-dev.install | 2 + debian/libplumb2.install | 2 + debian/libplumb2.symbols | 317 ++++++++++++ debian/libplumbgpl2-dev.install | 1 + debian/libplumbgpl2.install | 2 + debian/libplumbgpl2.symbols | 7 + debian/libstonith1-dev.install | 2 + debian/libstonith1.install | 2 + debian/libstonith1.symbols | 28 + debian/patches/0001-libtoolize_check.patch | 62 +++ ...ix-spelling-of-output-and-improve-grammar.patch | 32 ++ .../patches/0003-Remove-.hgtags-from-source.patch | 87 ++++ .../0004-Remove-.hgignore-from-source.patch | 111 ++++ .../patches/0005-Remove-.hgsigs-from-source.patch | 23 + ...19-Current-Pacemaker-does-not-use-ha_logd.patch | 21 + .../patches/0020-Fix-typo-bounary-boundary.patch | 21 + debian/patches/asciidoctor.patch | 45 ++ debian/patches/file_paths.patch | 26 + debian/patches/fix-configure-libxml2.patch | 37 ++ debian/patches/ha_logger_man.patch | 28 + debian/patches/hurd.diff | 43 ++ debian/patches/ipc_param_type | 48 ++ debian/patches/kfbsd.diff | 16 + debian/patches/openipmi-selector.patch | 59 +++ debian/patches/perl-interpreter.patch | 15 + debian/patches/python3.patch | 406 +++++++++++++++ debian/patches/series | 20 + debian/patches/spelling.patch | 80 +++ debian/patches/systemd-doc.patch | 14 + debian/patches/x32-cl_times | 48 ++ debian/rules | 53 ++ debian/salsa-ci.yml | 4 + debian/source/format | 1 + debian/tests/control | 14 + debian/tests/ipctest | 5 + debian/tests/logd | 47 ++ debian/tests/stonith-null | 16 + debian/tests/stonith-suicide | 22 + debian/tests/user | 5 + debian/watch | 4 + 56 files changed, 2999 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/clean create mode 100644 debian/cluster-glue-dev.install create mode 100644 debian/cluster-glue.install create mode 100644 debian/cluster-glue.lintian-overrides create mode 100644 debian/cluster-glue.logd.init create mode 100644 debian/cluster-glue.manpages create mode 100644 debian/cluster-glue.postinst create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/liblrm2-dev.install create mode 100644 debian/liblrm2.install create mode 100644 debian/liblrm2.symbols create mode 100644 debian/libpils2-dev.install create mode 100644 debian/libpils2.install create mode 100644 debian/libpils2.symbols create mode 100644 debian/libplumb2-dev.install create mode 100644 debian/libplumb2.install create mode 100644 debian/libplumb2.symbols create mode 100644 debian/libplumbgpl2-dev.install create mode 100644 debian/libplumbgpl2.install create mode 100644 debian/libplumbgpl2.symbols create mode 100644 debian/libstonith1-dev.install create mode 100644 debian/libstonith1.install create mode 100644 debian/libstonith1.symbols create mode 100644 debian/patches/0001-libtoolize_check.patch create mode 100644 debian/patches/0002-Fix-spelling-of-output-and-improve-grammar.patch create mode 100644 debian/patches/0003-Remove-.hgtags-from-source.patch create mode 100644 debian/patches/0004-Remove-.hgignore-from-source.patch create mode 100644 debian/patches/0005-Remove-.hgsigs-from-source.patch create mode 100644 debian/patches/0019-Current-Pacemaker-does-not-use-ha_logd.patch create mode 100644 debian/patches/0020-Fix-typo-bounary-boundary.patch create mode 100644 debian/patches/asciidoctor.patch create mode 100644 debian/patches/file_paths.patch create mode 100644 debian/patches/fix-configure-libxml2.patch create mode 100644 debian/patches/ha_logger_man.patch create mode 100644 debian/patches/hurd.diff create mode 100644 debian/patches/ipc_param_type create mode 100644 debian/patches/kfbsd.diff create mode 100644 debian/patches/openipmi-selector.patch create mode 100644 debian/patches/perl-interpreter.patch create mode 100644 debian/patches/python3.patch create mode 100644 debian/patches/series create mode 100644 debian/patches/spelling.patch create mode 100644 debian/patches/systemd-doc.patch create mode 100644 debian/patches/x32-cl_times create mode 100755 debian/rules create mode 100644 debian/salsa-ci.yml create mode 100644 debian/source/format create mode 100644 debian/tests/control create mode 100755 debian/tests/ipctest create mode 100755 debian/tests/logd create mode 100755 debian/tests/stonith-null create mode 100755 debian/tests/stonith-suicide create mode 100755 debian/tests/user create mode 100644 debian/watch diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..4e103f2 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,573 @@ +cluster-glue (1.0.12-22) unstable; urgency=medium + + [ Valentin Vidic ] + * Drop lsb-base dependency + * Update Standards-Version to 4.6.2 + * Update test to use /var/log/syslog + * Update lintian-overrides + + [ Helmut Grohne ] + * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #1052625) + + -- Valentin Vidic Tue, 24 Oct 2023 20:23:52 +0200 + +cluster-glue (1.0.12-21) unstable; urgency=medium + + [ Lucas Kanashiro ] + * d/t/logd: use journalctl to get logs if $LOG is not available + + [ Valentin Vidic ] + * Update watch file url + * Update build dependency on libltdl-dev (Closes: #1008889) + * Add retries to logd autopkgtest + * Update Standards-Version to 4.6.0 + * Update copyright file + + -- Valentin Vidic Sun, 10 Apr 2022 16:17:14 +0200 + +cluster-glue (1.0.12-20) unstable; urgency=medium + + [ Helmut Grohne ] + * Reduce Build-Depends (Closes: #979282) + + [ Ferenc Wágner ] + * Update Standards-Version to 4.5.1 (no changes required) + * Bump watch file format to 4 + * New patch: Current Pacemaker does not use ha_logd + * Add Lintian override for the man page of the unusually placed ha_logd + * New patch: Fix typo: bounary -> boundary + * Drop override for tag not emitted since Lintian 2.92 + + -- Ferenc Wágner Wed, 20 Jan 2021 12:45:21 +0100 + +cluster-glue (1.0.12-19) unstable; urgency=medium + + * Fix failing logd autopkgtest + * Disable logd startup by default + * Use debhelper v13 + + -- Valentin Vidic Sat, 27 Jun 2020 12:59:36 +0200 + +cluster-glue (1.0.12-18) unstable; urgency=medium + + * The cibsecret man page symlink isn't useful + * Add myself to Uploaders + * Update packaging list email address + * The dbgsym migration was completed in buster + * Don't ship static or Libtool archives + + -- Ferenc Wágner Sun, 21 Jun 2020 21:53:11 +0200 + +cluster-glue (1.0.12-17) unstable; urgency=medium + + * Drup upstart support to avoid using dbus-glib (Closes: #955882) + + -- Valentin Vidic Sun, 05 Apr 2020 16:38:36 +0200 + +cluster-glue (1.0.12-16) unstable; urgency=medium + + * Enable Debian CI + * Move /usr/sbin/cibsecret to /usr/lib/heartbeat/ + + -- Valentin Vidic Sun, 15 Mar 2020 20:51:29 +0100 + +cluster-glue (1.0.12-15) unstable; urgency=medium + + * Stop using xml2-config (Closes: #949087) + * Update Standards-Version to 4.5.0 + + -- Valentin Vidic Sat, 15 Feb 2020 18:12:37 +0100 + +cluster-glue (1.0.12-14) unstable; urgency=medium + + * Try to fix flaky autopkgtest (Closes: #942334) + * Use debhelper v12 + * Update Standards-Version to 4.4.1 + * Drop unused lintian override + * Fix spelling error reported by lintian + * Add Rules-Requires-Root: no + * Add Pre-Depends for systemd + * Add override for documentation outside of /usr/share/doc + * Add override for spelling of EVERYTIME + + -- Valentin Vidic Tue, 15 Oct 2019 19:22:27 +0200 + +cluster-glue (1.0.12-13) unstable; urgency=medium + + * Try to debug failing logd autopkgtest + * Fix python3 scripts (Closes: #931114) + * Update Standards-Version to 4.4.0 + * Move ha_logger manpage to section 8 + + -- Valentin Vidic Thu, 11 Jul 2019 20:59:50 +0200 + +cluster-glue (1.0.12-12) unstable; urgency=medium + + * Use libsensors-dev in Build-Depends (Closes: #917434) + * Add Build-Depends-Package to symbols files + * Try to fix FTBFS with usrmerge + * Update Standards-Version to 4.3.0 + * Use /run path for Debian + + -- Valentin Vidic Mon, 21 Jan 2019 12:37:05 +0100 + +cluster-glue (1.0.12-11) unstable; urgency=medium + + * Add patch to use perl interpreter in vcenter script + * Update my email address in Uploaders + * Update Standards-Version to 4.2.1 + * Use asciidoctor instead of asciidoc + + -- Valentin Vidic Fri, 12 Oct 2018 10:27:51 +0200 + +cluster-glue (1.0.12-10) unstable; urgency=medium + + [ Edward Betts ] + * Correct a spelling mistake. + + [ Valentin Vidic ] + * Add Breaks/Replaces after moving files (Closes: #901100) + + -- Valentin Vidic Sat, 09 Jun 2018 10:27:12 +0200 + +cluster-glue (1.0.12-9) unstable; urgency=medium + + * Add patch to fix FTBFS with openipmi 2.0.25 (Closes: #900332) + + -- Valentin Vidic Tue, 29 May 2018 11:21:57 +0200 + +cluster-glue (1.0.12-8) unstable; urgency=medium + + * Move compress static libs to dev package + * Strip static libraries in dev package + * Fix spelling errors reported by lintian + * Update Homepage to ClusterLabs github + * Update Vcs URLs to use salsa + * Drop unused source.lintian-overrides + * Add missing patch descriptions + * Use debhelper v11 + * Update Standards-Version to 4.1.4 + * Add manpage to systemd service documentation + * Add logd to init service Provides field + + -- Valentin Vidic Wed, 25 Apr 2018 14:28:09 +0200 + +cluster-glue (1.0.12-7) unstable; urgency=medium + + [ Christoph Berg ] + * Remove Richard and myself from Uploaders + + [ Valentin Vidic ] + * Switch to python3 (Closes: #883149) + * Update Standards-Version to 4.1.2 + * Remove strace from debian/tests Depends + * Remove trailing whitespace in debian files + + -- Valentin Vidic Fri, 01 Dec 2017 12:42:06 +0100 + +cluster-glue (1.0.12-6) unstable; urgency=medium + + * Move ipmitool to Suggests + * Add lsb-base to cluster-glue Depends + * Update Standards-Version to 4.0.0 with no changes + * Use dh_missing for --fail-missing + * Update debhelper to v10 + * Switch to automatic dbgsym packages + * Fix conflicting ipc declarations (Closes: #688514) + * Add myself to Uploaders + * Switch to github repo in debian/watch + * Use Section: libs for library packages + * Add autopkgtests + + -- Valentin Vidic Thu, 24 Aug 2017 20:43:40 +0200 + +cluster-glue (1.0.12-5) unstable; urgency=medium + + * Drop --link-doc=cluster-glue, it's a nice idea but causes too much + trouble. Closes: #821129, #821894. + + -- Christoph Berg Thu, 21 Apr 2016 19:24:54 +0200 + +cluster-glue (1.0.12-4) unstable; urgency=medium + + * libplumb2.symbols: Update hurd-specific symbols to match kfreebsd as well. + * Remove obsolete Conflicts/Replaces against heartbeat. Closes: #820221. + * Fix cl_times on x32: On x32, sizeof(long) is 4, and sizeof(clock_t) is 8. + cl_times as logic to reject that case. We fix this by setting the return + type of the function to long long instead on x32. + + -- Christoph Berg Thu, 07 Apr 2016 23:30:58 +0200 + +cluster-glue (1.0.12-3) unstable; urgency=medium + + * Fix B-D and dh_install for hurd and kfreebsd. + * Unreproducibility issues caused by not using dh have been verified as + fixed, closes: #800776. + + -- Christoph Berg Sat, 26 Mar 2016 12:04:15 +0100 + +cluster-glue (1.0.12-2) unstable; urgency=medium + + * Remove old transitional packages libcluster-glue and libcluster-glue-dev. + * Remove iproute from B-D. Closes: #753696. + * Add bzip2 to cluster-glue dependencies. Closes: #613562. + * Add ipmitool to cluster-glue recommendations. Closes: #630718. + * Create hacluster user in cluster-glue.postinst and chown the + /var/lib/heartbeat/cores/ directories to hacluster and nobody. + Closes: #759473. + * Add patch by Robert Millan and Gabriele Giacone to support kfreebsd and + hurd. Thanks! Closes: #650820. + * FTBFS due to openipmi problems resolved now. Closes: #818523. + * Update list of Uploaders. + + -- Christoph Berg Fri, 25 Mar 2016 19:35:29 +0100 + +cluster-glue (1.0.12-1) unstable; urgency=medium + + [ Richard B Winters ] + * New upstream release + * debian/compat: Bumped to level 9 + * debian/control: Removed hardening wrapper from Build-Depends in order to + remove obsolete depends as hardening implementation updated + * debian/control: Required Build-Depends version for debhelper bumped to 9 + * debian/control: Added and Updated Vcs-Git and Vcs-Browser, respectively, + to point to the newly created git packaging repositories on Alioth; + Mercurial still available at previous location; Vcs-HG field removed + * debian/control: Updated fields for folding where applicable + * debian/control: Bumped standards to 3.9.6 + - debian/copyright updated to DEP-5 copyright format + * debian/control: Changed Conflicts to Breaks, as recommended by lintian + information warnings, where applicable + * debian/control: Added a debug package to the package offering + * debian/control: Added myself to list of uploaders + * debian/copyright: Updated copyright for debian/* to also include original + packager, Christoph Berg, and myself. + * debian/copyright: Updated formatting for BSD license type so it can be + parsed correctly, and added BSD-3-clause License paragraph populated with + respective clauses and license terms as presented by upstream. + * debian/copyright: License paragraph for component which was not under any + license was added with the text previously explaining such as its body of + text; + * debian/patches: Removed all RC patches, save libtoolize_check, as they are + no longer necessary + * debian/patches: libtoolize_check run through gbp pq, and file renamed + accordingly after export; 0001-libtoolize_check.patch + * debian/patches: Added patch to remove .hgtags from source prior to build + * debian/patches: Added patch to remove .hgignore from source prior to build + * debian/patches: Added patch to remove .hgsigs from source prior to build + * debian/patches: Added patch to correct spelling in lrm/lrmd/lrmd.c; ouput, + output + * debian/patches: Series updated to specify all applicable patches + * debian/rules: Updated hardening to latest recommended implementation; see + https://wiki.debian.org/Hardening + * debian/rules: Updated to use dh7+ syntax, and streamlined + * debian/cluster-glue.install: Added reference to logd.service in + lib/systemd/system/logd/ + * debian/cluster-glue.install: Removed reference to component which is no + longer provided by upstream; usr/share/cluster-glue/combine-logs.pl + * debian/cluster-glue.links: Added to provide a manual for cibsecret; + Resolves lack of manual for each binary provided by package as + flagged by lintian informational warnings, by targeting the lrmadmin + manual which uses said binary + * debian/.lintian-overrides: Added overrides for the following lintian + informational warnings + - cluster-glue source; intra-source-package-circular-dependency + - libcluster-glue; package-relation-with-self + * debian/.symbols: Added accurate symbols from snapshot.debian.org + v1.0.3+ + * debian/watch: Added in order to watch for upstream releases + + [ Christoph Berg ] + * debian/control: Add dh-autoreconf and systemd B-D. + + -- Christoph Berg Tue, 22 Mar 2016 13:26:13 +0100 + +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 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 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 Tue, 09 Jul 2013 22:29:56 +0200 + +cluster-glue (1.0.11+hg2754-1) experimental; urgency=low + + * New upstream version + + -- Martin Loschwitz 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 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 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 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 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 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 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 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 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 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 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 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 Mon, 20 Dec 2010 09:29:12 +0900 + +cluster-glue (1.0.7-2) unstable; urgency=low + + * New upstream for unstable + + -- Simon Horman Thu, 16 Dec 2010 23:11:46 +0900 + +cluster-glue (1.0.7-1) experimental; urgency=low + + * New Upstream + + -- Simon Horman 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 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 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 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 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 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 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 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 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 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 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 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 Fri, 26 Feb 2010 19:39:13 +0100 + +cluster-glue (1.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Martin Loschwitz 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 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 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 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 Mon, 02 Nov 2009 15:02:29 +0000 + +cluster-glue (1.0+hg20091102-1) unstable; urgency=low + + * New upstream checkout + + -- Martin Loschwitz 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 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 Tue, 15 Sep 2009 09:56:16 +0000 diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..94eb470 --- /dev/null +++ b/debian/clean @@ -0,0 +1,44 @@ +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/admin/lrmadmin.8 +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..0623a37 --- /dev/null +++ b/debian/cluster-glue-dev.install @@ -0,0 +1 @@ +usr/include/heartbeat/*.h diff --git a/debian/cluster-glue.install b/debian/cluster-glue.install new file mode 100644 index 0000000..fa9b4de --- /dev/null +++ b/debian/cluster-glue.install @@ -0,0 +1,97 @@ +usr/lib/heartbeat/cibsecret +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/compress/zlib.so +usr/lib/heartbeat/plugins/compress/bz2.so +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/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/ha_log.sh +usr/lib/stonith/plugins/xen0-ha-dom0-stonith-helper +${env:systemdsystemunitdir}/logd.service +usr/share/man/man8/meatclient.8 +usr/share/man/man8/hb_report.8 +usr/share/man/man8/ha_logd.8 +usr/share/man/man8/ha_logger.8 +usr/share/man/man8/stonith.8 +usr/share/man/man8/lrmadmin.8 +usr/share/cluster-glue/lrmtest/testcases/stonith.exp +usr/share/cluster-glue/lrmtest/testcases/stonith +logd/logd.cf etc diff --git a/debian/cluster-glue.lintian-overrides b/debian/cluster-glue.lintian-overrides new file mode 100644 index 0000000..af49626 --- /dev/null +++ b/debian/cluster-glue.lintian-overrides @@ -0,0 +1,4 @@ +cluster-glue: spelling-error-in-binary EVERYTIME EVERY TIME [usr/lib/heartbeat/lrmd] +cluster-glue: spelling-error-in-binary EVERYTIME EVERY TIME [usr/sbin/lrmadmin] +# ha_logd is located in /usr/lib/heartbeat/ for historical reasons: +cluster-glue: spare-manual-page [usr/share/man/man8/ha_logd.8.gz] diff --git a/debian/cluster-glue.logd.init b/debian/cluster-glue.logd.init new file mode 100644 index 0000000..5ae7009 --- /dev/null +++ b/debian/cluster-glue.logd.init @@ -0,0 +1,102 @@ +#!/bin/sh +# +# +# logd Start logd (non-blocking log service) +# +# Author: Dejan Muhamedagic +# (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 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..479a24d --- /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.8 diff --git a/debian/cluster-glue.postinst b/debian/cluster-glue.postinst new file mode 100644 index 0000000..16b6f47 --- /dev/null +++ b/debian/cluster-glue.postinst @@ -0,0 +1,14 @@ +#!/bin/sh + +set -e + +if [ "$1" = configure ]; then + # keep group and user in sync with pacemaker-common.postinst + addgroup --system haclient + adduser --system hacluster --ingroup haclient --home /var/lib/pacemaker --no-create-home + + chown hacluster:haclient /var/lib/heartbeat/cores/hacluster + chown nobody:nogroup /var/lib/heartbeat/cores/nobody +fi + +#DEBHELPER# diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..081caa4 --- /dev/null +++ b/debian/control @@ -0,0 +1,216 @@ +Source: cluster-glue +Section: admin +Priority: optional +Maintainer: Debian HA Maintainers +Uploaders: + Valentin Vidic , + Ferenc Wágner , +Build-Depends: + debhelper-compat (= 13), + asciidoctor, + autoconf, + automake, + bison, + chrpath, + dh-python, + docbook-xsl, + docbook-xml, + flex, + help2man, + inetutils-ping | iputils-ping, + libaio-dev [linux-any], + libbz2-dev, + libcurl4-openssl-dev | libcurl3-openssl-dev, + libglib2.0-dev, + libltdl-dev, + libopenhpi-dev [!hurd-any], + libopenipmi-dev [!hurd-any], + libsensors-dev [!hurd-any], + libtool, + libsnmp-dev, + libxml2-dev, + libxml2-utils, + openssh-client , + perl, + pkgconf, + psmisc, + python3, + systemd [linux-any], + uuid-dev, + xsltproc, + zlib1g-dev +Rules-Requires-Root: no +Standards-Version: 4.6.2 +Homepage: https://github.com/ClusterLabs/cluster-glue +Vcs-Browser: https://salsa.debian.org/ha-team/cluster-glue +Vcs-Git: https://salsa.debian.org/ha-team/cluster-glue.git + +Package: cluster-glue +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends}, + ${perl:Depends}, + ${python3:Depends}, + adduser, + bzip2, + libtimedate-perl, + liblrm2 (>= ${binary:Version}), + libpils2 (>= ${binary:Version}), + libplumb2 (>= ${binary:Version}), + libplumbgpl2 (>= ${binary:Version}), + libstonith1 (>= ${binary:Version}), +Pre-Depends: ${misc:Pre-Depends} +Suggests: + ipmitool +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. + . + If you are using the pacemaker/corosync HA cluster stack, you + probably want to install this package. + +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}) +Breaks: cluster-glue (<< 1.0.12-8) +Replaces: cluster-glue (<< 1.0.12-8) +Description: Development files for the cluster glue components + This package includes headers and static libraries for the glue + cluster components. + . + If you are developing for cluster-glue, you probably want to + install this package. + +Package: liblrm2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Reusable cluster libraries -- liblrm2 + This package contains the lrm helper library from cluster-glue, + the reusable cluster components package. + . + If you want to use the pacemaker cluster manager, than you want + to install this package. + +Package: libpils2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Reusable cluster libraries -- libpils2 + This package contains the pils library from cluster-glue, the + reusable cluster components package. + . + If you want to use the pacemaker cluster manager, than you want + to install this package. + +Package: libplumb2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Reusable cluster libraries -- libplumb2 + This package contains the plumber library from cluster-glue, the + reusable cluster components package. + . + If you want to use the pacemaker cluster manager, than you want + to install this package. + +Package: libplumbgpl2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Reusable cluster libraries -- libplumbgpl2 + This package contains the plumber library from cluster-glue, + the reusable cluster components package, in the GPL version. + . + If you want to use the pacemaker cluster manager, than you want + to install this package. + +Package: libstonith1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Reusable cluster libraries -- libstonith1 + This package contains the stonith library from cluster-glue, the + reusable cluster components package. + . + If you want to use the pacemaker cluster manager, than you want + to install this package. + +Package: liblrm2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + liblrm2 (= ${binary:Version}) +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. + . + If you are developing with liblrm2, you probably want to + install this package. + +Package: libpils2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libpils2 (= ${binary:Version}), + libltdl-dev +Description: Reusable cluster development files -- libpils2 + This package contains the development files of the pils + library from cluster-glue, the reusable cluster components + package. + . + If you are developing with libpils2, you probably want to + install this package. + +Package: libplumb2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libplumb2 (= ${binary:Version}) +Description: Reusable cluster development files -- libplumb2 + This package contains the development files of the plumber + library from cluster-glue, the reusable cluster components + package. + . + If you are developing with libplumb2, you probably want to + install this package. + +Package: libplumbgpl2-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libplumbgpl2 (= ${binary:Version}) +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. + . + If you are developing with libplumbgpl2, you probably want to + install this package. + +Package: libstonith1-dev +Section: libdevel +Architecture: any +Depends: ${misc:Depends}, + libstonith1 (= ${binary:Version}) +Description: Reusable cluster development files -- libstonith1 + This package contains the development files of the stonith + library from cluster-glue, the reusable cluster components + package. + . + If you are developing with libstonith, you probably want to + install this package. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..2c1cbd1 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,113 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: cluster-glue +Source: http://github.com/clusterlabs/cluster-glue + +Files: * +Copyright: 1998-2015 Alan Robertson + Andreas Mock + Andrew Beekhof + Dave Blaschke + David Lee + Dejan Muhamedagic + Hannes Eder + Huang Zhen + Junko Ikeda + Lars Marowsky-Bree + Martin Bene + Phil Carns + Satomi Taniguchi + Sean Reifschneider + Sebastian Reitenbach + Serge Dubrouski + Simon Horman + Xinwei Hu +License: LGPL-2.0+ + +Files: replace/daemon.c + replace/alphasort.c +Copyright: 1998-2015 The Regents of the University of California +License: BSD-3-clause + +Files: replace/scandir.c +Copyright: 1999-2015 The Regents of the University of California +License: None + +Files: debian/* +Copyright: 1999-2015 Debian-HA Maintainers + 1999-2015 Paolo Molaro + 2009-2015 Martin Loschwitz + 2010-2015 Ante Karamatic + 2010-2015 Frederik Schüler + 2010-2015 Simon Horman + 2011-2015 Julien Cristau + 2011-2015 Luk Claes + 2013-2015 Luca Falavigna + 2014-2015 Matthias Klose + 2015 Richard B Winters + 2016 Christoph Berg + 2017-2022 Ferenc Wágner + Valentin Vidic +License: GPL-2+ + +License: LGPL-2.0+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see . + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in "/usr/share/common-licenses/LGPL-2". + +License: BSD-3-clause + 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. + +License: None + The following component of this package is public domain software and + does not fall under any license's terms + +License: GPL-2+ + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see + . + On Debian systems, the complete text of the GNU General + Public License version 2 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..c725fd0 --- /dev/null +++ b/debian/liblrm2-dev.install @@ -0,0 +1,2 @@ +usr/lib/liblrm.so +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/liblrm2.symbols b/debian/liblrm2.symbols new file mode 100644 index 0000000..98db2fc --- /dev/null +++ b/debian/liblrm2.symbols @@ -0,0 +1,24 @@ +liblrm.so.2 liblrm2 #MINVER# +* Build-Depends-Package: liblrm2-dev + closefiles@Base 0 + copy_str_table@Base 0 + create_lrm_addrsc_msg@Base 0 + create_lrm_msg@Base 0 + create_lrm_reg_msg@Base 0 + create_lrm_ret@Base 0 + create_lrm_rsc_msg@Base 0 + execra_code2string@Base 0 + filtered@Base 0 + free_str_table@Base 0 + get_failed_exec_rc@Base 0 + get_ra_pathname@Base 0 + get_runnable_list@Base 0 + ll_lrm_new@Base 0 + lrm_free_op@Base 0 + lrm_free_op_list@Base 0 + lrm_free_rsc@Base 0 + lrm_free_str_list@Base 0 + lrm_free_str_table@Base 0 + lrm_op_new@Base 0 + lrm_zero_op@Base 0 + merge_str_tables@Base 0 diff --git a/debian/libpils2-dev.install b/debian/libpils2-dev.install new file mode 100644 index 0000000..91a3e25 --- /dev/null +++ b/debian/libpils2-dev.install @@ -0,0 +1,2 @@ +usr/lib/libpils.so +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/libpils2.symbols b/debian/libpils2.symbols new file mode 100644 index 0000000..5557ca4 --- /dev/null +++ b/debian/libpils2.symbols @@ -0,0 +1,22 @@ +libpils.so.2 libpils2 #MINVER# +* Build-Depends-Package: libpils2-dev + DelPILPluginUniv@Base 0 + NewPILPluginUniv@Base 0 + PILCallLog@Base 0 + PILFreePluginList@Base 0 + PILGetDebugLevel@Base 0 + PILGetIFRefCount@Base 0 + PILIncrIFRefCount@Base 0 + PILListPlugins@Base 0 + PILLoadPlugin@Base 0 + PILLogMemStats@Base 0 + PILPluginExists@Base 0 + PILSetDebugLevel@Base 0 + PIL_strerror@Base 0 + PILpisysGetDebugLevel@Base 0 + PILpisysSetDebugLevel@Base 0 + PilPluginUnivSetLog@Base 0 + PilPluginUnivSetMemalloc@Base 0 + nosuchfunctionname@Base 0 + strlcat@Base 0 + strlcpy@Base 0 diff --git a/debian/libplumb2-dev.install b/debian/libplumb2-dev.install new file mode 100644 index 0000000..9334997 --- /dev/null +++ b/debian/libplumb2-dev.install @@ -0,0 +1,2 @@ +usr/lib/libplumb.so +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/libplumb2.symbols b/debian/libplumb2.symbols new file mode 100644 index 0000000..c821b44 --- /dev/null +++ b/debian/libplumb2.symbols @@ -0,0 +1,317 @@ +libplumb.so.2 libplumb2 #MINVER# +* Build-Depends-Package: libplumb2-dev + CompressFuncs@Base 0 + DisableProcLogging@Base 0 + EnableProcLogging@Base 0 + FT_strings@Base 0 + ForEachProc@Base 0 + G_CH_check_int@Base 0 + G_CH_destroy_int@Base 0 + G_CH_dispatch_int@Base 0 + G_CH_prepare_int@Base 0 + G_main_IPC_Channel_constructor@Base 0 + G_main_IPC_Channel_pause@Base 0 + G_main_IPC_Channel_resume@Base 0 + G_main_add_IPC_Channel@Base 0 + G_main_add_IPC_WaitConnection@Base 0 + G_main_add_SignalHandler@Base 0 + G_main_add_TriggerHandler@Base 0 + G_main_add_fd@Base 0 + G_main_add_input@Base 0 + G_main_add_tempproc_trigger@Base 0 + G_main_del_IPC_Channel@Base 0 + G_main_del_IPC_WaitConnection@Base 0 + G_main_del_SignalHandler@Base 0 + G_main_del_TriggerHandler@Base 0 + G_main_del_fd@Base 0 + G_main_set_trigger@Base 0 + G_main_setall_id@Base 0 + G_main_setdescription@Base 0 + G_main_setdescription_id@Base 0 + G_main_setmaxdispatchdelay@Base 0 + G_main_setmaxdispatchdelay_id@Base 0 + G_main_setmaxdispatchtime@Base 0 + G_main_setmaxdispatchtime_id@Base 0 + GetProcInfo@Base 0 + Gmain_timeout_add@Base 0 + Gmain_timeout_add_full@Base 0 + Gmain_timeout_remove@Base 0 + HMAC@Base 0 + LogToDaemon@Base 0 + MD5@Base 0 + MD5Final@Base 0 + MD5Init@Base 0 + MD5Transform@Base 0 + MD5Update@Base 0 + NewTrackedProc@Base 0 + RemoveTrackedProcTimeouts@Base 0 + ReportProcHasDied@Base 0 + SetTrackedProcTimeouts@Base 0 + (arch=!linux-any)add_longclock@Base 1.0.12 + base64_to_binary@Base 0 + binary_to_base64@Base 0 + bytes_for_int@Base 0 + cancelmstimer@Base 0 + cl_binary_to_int@Base 0 + cl_cdtocoredir@Base 0 + cl_compress_field@Base 0 + cl_compress_load_plugin@Base 0 + cl_compress_remove_plugin@Base 0 + cl_compressmsg@Base 0 + cl_cpu_limit_disable@Base 0 + cl_cpu_limit_ms_interval@Base 0 + cl_cpu_limit_setpercent@Base 0 + cl_cpu_limit_update@Base 0 + cl_decompress_field@Base 0 + cl_decompressmsg@Base 0 + cl_direct_log@Base 0 + cl_disable_realtime@Base 0 + cl_dump_msgstats@Base 0 + cl_enable_coredump_before_reboot@Base 0 + cl_enable_coredumps@Base 0 + cl_enable_realtime@Base 0 + cl_file_exists@Base 0 + cl_flush_logs@Base 0 + cl_get_binary@Base 0 + cl_get_compress_fns@Base 0 + cl_get_env@Base 0 + cl_get_msec@Base 0 + cl_get_string@Base 0 + cl_get_struct@Base 0 + cl_get_type@Base 0 + cl_get_uuid@Base 0 + cl_glib_msg_handler@Base 0 + cl_glibpoll@Base 0 + cl_have_full_privs@Base 0 + cl_inherit_logging_environment@Base 0 + cl_ipc_wait_timeout@Base 0 + cl_limit_log@Base 1.0.8 + cl_limit_log_destroy@Base 1.0.8 + cl_limit_log_new@Base 1.0.8 + cl_limit_log_reset@Base 1.0.8 + cl_load_plugin@Base 0 + cl_lock_pidfile@Base 0 + cl_log@Base 0 + cl_log_args@Base 0 + cl_log_close_log_files@Base 1.0.7 + cl_log_do_fflush@Base 1.0.7 + cl_log_enable_stderr@Base 0 + cl_log_enable_stdout@Base 0 + cl_log_enable_syslog_filefmt@Base 0 + cl_log_get_logdtime@Base 0 + cl_log_get_uselogd@Base 0 + cl_log_is_logd_fd@Base 0 + cl_log_message@Base 0 + cl_log_set_debugfile@Base 0 + cl_log_set_entity@Base 0 + cl_log_set_facility@Base 0 + cl_log_set_logd_channel_source@Base 0 + cl_log_set_logdtime@Base 0 + cl_log_set_logfile@Base 0 + cl_log_set_syslogprefix@Base 1.0.7 + cl_log_set_uselogd@Base 0 + cl_log_test_logd@Base 0 + cl_log_use_buffered_io@Base 1.0.7 + cl_make_normaltime@Base 0 + cl_make_realtime@Base 0 + cl_msg_add_list@Base 0 + cl_msg_add_list_int@Base 0 + cl_msg_add_list_str@Base 0 + cl_msg_get_list@Base 0 + cl_msg_get_list_int@Base 0 + cl_msg_list_add_string@Base 0 + cl_msg_list_length@Base 0 + cl_msg_list_nth_data@Base 0 + cl_msg_modbin@Base 0 + cl_msg_modstring@Base 0 + cl_msg_modstruct@Base 0 + cl_msg_moduuid@Base 0 + cl_msg_quiet_fmterr@Base 0 + cl_msg_remove@Base 0 + cl_msg_remove_offset@Base 0 + cl_msg_remove_value@Base 0 + cl_msg_replace@Base 0 + cl_msg_replace_value@Base 0 + cl_msg_setstats@Base 0 + cl_msg_stats_add@Base 0 + cl_nonrealtime_malloc_count@Base 0 + cl_nonrealtime_malloc_size@Base 0 + cl_parse_int@Base 0 + cl_perror@Base 0 + cl_poll@Base 0 + cl_poll_ignore@Base 0 + (arch=linux-any)cl_poll_setsig@Base 0 + cl_randseed@Base 0 + cl_read_pidfile@Base 0 + cl_read_pidfile_no_checking@Base 0 + cl_realtime_malloc_check@Base 0 + cl_reboot@Base 0 + cl_remove_plugin@Base 0 + cl_set_all_coredump_signal_handlers@Base 0 + cl_set_authentication_computation_method@Base 0 + cl_set_compress_fns@Base 0 + cl_set_compression_threshold@Base 0 + cl_set_coredump_signal_handler@Base 0 + cl_set_corerootdir@Base 0 + cl_set_msg_format@Base 0 + cl_set_oldmsgauthfunc@Base 0 + cl_set_traditional_compression@Base 0 + cl_shortsleep@Base 0 + cl_signal_block@Base 0 + cl_signal_block_set@Base 0 + cl_signal_set_action@Base 0 + cl_signal_set_handler@Base 0 + cl_signal_set_handler_mode@Base 0 + cl_signal_set_interrupt@Base 0 + cl_signal_set_simple_action@Base 0 + cl_signal_set_simple_handler@Base 0 + cl_str_to_boolean@Base 0 + cl_syslogfac_int2str@Base 0 + cl_syslogfac_str2int@Base 0 + cl_times@Base 0 + cl_unlock_pidfile@Base 0 + cl_untaint_coredumps@Base 0 + cl_uuid_clear@Base 0 + cl_uuid_compare@Base 0 + cl_uuid_copy@Base 0 + cl_uuid_g_equal@Base 0 + cl_uuid_g_hash@Base 0 + cl_uuid_generate@Base 0 + cl_uuid_is_null@Base 0 + cl_uuid_parse@Base 0 + cl_uuid_unparse@Base 0 + (arch=!linux-any)cmp_longclock@Base 1.0.12 + compose_netstring@Base 0 + convert_nl_sym@Base 0 + debug_level@Base 0 + debugproctrack@Base 0 + drop_privs@Base 0 + dsecsto_longclock@Base 0 + dump_clmsg_ipcmsg_stats@Base 0 + dump_ipc_info@Base 0 + facilitynames@Base 0 + fieldtypefuncs@Base 0 + g_main_output_is_blocked@Base 0 + get_log_chan@Base 0 + get_netstringlen@Base 0 + get_netstringlen_auth@Base 0 + get_next_random@Base 0 + get_stringlen@Base 0 + ha_msg_add@Base 0 + ha_msg_add_int@Base 0 + ha_msg_add_nv@Base 0 + ha_msg_add_str_table@Base 0 + ha_msg_add_ul@Base 0 + ha_msg_addbin@Base 0 + ha_msg_addstruct@Base 0 + ha_msg_addstruct_compress@Base 0 + ha_msg_adduuid@Base 0 + ha_msg_audit@Base 0 + ha_msg_copy@Base 0 + ha_msg_del@Base 0 + ha_msg_expand@Base 0 + ha_msg_mod_int@Base 0 + ha_msg_mod_str_table@Base 0 + ha_msg_mod_ul@Base 0 + ha_msg_nadd@Base 0 + ha_msg_nadd_type@Base 0 + ha_msg_new@Base 0 + ha_msg_value_int@Base 0 + ha_msg_value_str_list@Base 0 + ha_msg_value_str_table@Base 0 + ha_msg_value_ul@Base 0 + ha_timestamp@Base 0 + hamsg2ipcmsg@Base 0 + hz_longclock@Base 0 + ipc_bufpool_del@Base 0 + ipc_bufpool_dump_stats@Base 0 + ipc_bufpool_full@Base 0 + ipc_bufpool_new@Base 0 + ipc_bufpool_partial_copy@Base 0 + ipc_bufpool_ref@Base 0 + ipc_bufpool_spaceleft@Base 0 + ipc_bufpool_unref@Base 0 + ipc_bufpool_update@Base 0 + ipc_channel_constructor@Base 0 + ipc_channel_pair@Base 0 + ipc_destroy_auth@Base 0 + ipc_pollfunc_ptr@Base 0 + ipc_set_auth@Base 0 + ipc_set_pollfunc@Base 0 + ipc_str_to_auth@Base 0 + ipc_wait_conn_constructor@Base 0 + ipcmsg2hamsg@Base 0 + ipcmsgfromIPC@Base 0 + is_auth_netstring@Base 0 + is_compressed_msg@Base 0 + list_cleanup@Base 0 + (arch=!linux-any)longclockto_long@Base 1.0.12 + longclockto_ms@Base 0 + mkstemp_mode@Base 0 + msg2ipcchan@Base 0 + msg2netstring@Base 0 + msg2netstring_buf@Base 0 + msg2netstring_noauth@Base 0 + msg2stream@Base 0 + msg2string@Base 0 + msg2string_buf@Base 0 + msg2wirefmt@Base 0 + msg2wirefmt_noac@Base 0 + msgfromIPC@Base 0 + msgfromIPC_noauth@Base 0 + msgfromIPC_timeout@Base 0 + msgfromstream@Base 0 + msgfromstream_netstring@Base 0 + msgfromstream_string@Base 0 + mssleep@Base 0 + msto_longclock@Base 0 + must_use_netstring@Base 0 + netstring2msg@Base 0 + netstring_extra@Base 0 + nodetrack_del@Base 0 + nodetrack_intersection_del@Base 0 + nodetrack_intersection_new@Base 0 + nodetrack_intersection_table@Base 0 + nodetrack_ismember@Base 0 + nodetrack_iterate@Base 0 + nodetrack_new@Base 0 + nodetrack_nodedown@Base 0 + nodetrack_nodeup@Base 0 + nosuchfunctionname@Base 0 + prio2str@Base 0 + prioritynames@Base 0 + process_netstring_nvpair@Base 0 + replytrack_del@Base 0 + replytrack_gotreply@Base 0 + replytrack_new@Base 0 + replytrack_outstanding_count@Base 0 + replytrack_outstanding_iterate@Base 0 + return_to_dropped_privs@Base 0 + return_to_orig_privs@Base 0 + secsto_longclock@Base 0 + set_IPC_Channel_dnotify@Base 0 + set_SignalHandler_dnotify@Base 0 + set_TriggerHandler_dnotify@Base 0 + set_ipc_time_debug_flag@Base 0 + set_sigchld_proctrack@Base 0 + setmsalarm@Base 0 + setmsrepeattimer@Base 0 + socket_client_channel_new@Base 0 + socket_ipcmsg_dump_stats@Base 0 + socket_wait_conn_new@Base 0 + string2msg@Base 0 + string2msg_ll@Base 0 + string_list_pack@Base 0 + string_list_pack_length@Base 0 + string_list_unpack@Base 0 + strlcat@Base 0 + strlcpy@Base 0 + struct_display_as_xml@Base 0 + struct_display_print_spaces@Base 0 + struct_netstringlen@Base 0 + struct_stringlen@Base 0 + (arch=!linux-any)sub_longclock@Base 1.0.12 + time_longclock@Base 0 + wirefmt2ipcmsg@Base 0 + wirefmt2msg@Base 0 + zero_longclock@Base 0 diff --git a/debian/libplumbgpl2-dev.install b/debian/libplumbgpl2-dev.install new file mode 100644 index 0000000..78e02f6 --- /dev/null +++ b/debian/libplumbgpl2-dev.install @@ -0,0 +1 @@ +usr/lib/libplumbgpl.so 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/libplumbgpl2.symbols b/debian/libplumbgpl2.symbols new file mode 100644 index 0000000..c68f399 --- /dev/null +++ b/debian/libplumbgpl2.symbols @@ -0,0 +1,7 @@ +libplumbgpl.so.2 libplumbgpl2 #MINVER# +* Build-Depends-Package: libplumbgpl2-dev + init_set_proc_title@Base 0 + nosuchfunctionname@Base 0 + set_proc_title@Base 0 + strlcat@Base 0 + strlcpy@Base 0 diff --git a/debian/libstonith1-dev.install b/debian/libstonith1-dev.install new file mode 100644 index 0000000..8eea2ce --- /dev/null +++ b/debian/libstonith1-dev.install @@ -0,0 +1,2 @@ +usr/lib/libstonith.so +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/libstonith1.symbols b/debian/libstonith1.symbols new file mode 100644 index 0000000..bb89df0 --- /dev/null +++ b/debian/libstonith1.symbols @@ -0,0 +1,28 @@ +libstonith.so.1 libstonith1 #MINVER# +* Build-Depends-Package: libstonith1-dev + StonithPIsys@Base 0 + free_NVpair@Base 0 + nosuchfunctionname@Base 0 + st_ttylock@Base 0 + st_ttyunlock@Base 0 + stonith1_compat_string_to_NVpair@Base 0 + stonith_delete@Base 0 + stonith_env_to_NVpair@Base 1.0.6 + stonith_free_hostlist@Base 0 + stonith_get_confignames@Base 0 + stonith_get_hostlist@Base 0 + stonith_get_info@Base 0 + stonith_get_status@Base 0 + stonith_ghash_to_NVpair@Base 0 + stonith_new@Base 0 + stonith_req_reset@Base 0 + stonith_set_config@Base 0 + stonith_set_config_file@Base 0 + stonith_set_config_info@Base 0 + stonith_set_debug@Base 0 + stonith_set_log@Base 0 + stonith_types@Base 0 + stonithimports@Base 0 + strdown@Base 1.0.12 + strlcat@Base 0 + strlcpy@Base 0 diff --git a/debian/patches/0001-libtoolize_check.patch b/debian/patches/0001-libtoolize_check.patch new file mode 100644 index 0000000..b016959 --- /dev/null +++ b/debian/patches/0001-libtoolize_check.patch @@ -0,0 +1,62 @@ +From: Author: Johannes Schauer +Date: Tue, 21 Apr 2015 20:35:22 -0400 +Subject: libtoolize_check + +--- + autogen.sh | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 7464c9d..3e79704 100755 +--- a/autogen.sh ++++ b/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/0002-Fix-spelling-of-output-and-improve-grammar.patch b/debian/patches/0002-Fix-spelling-of-output-and-improve-grammar.patch new file mode 100644 index 0000000..4204570 --- /dev/null +++ b/debian/patches/0002-Fix-spelling-of-output-and-improve-grammar.patch @@ -0,0 +1,32 @@ +From: Richard B Winters +Date: Fri, 17 Apr 2015 08:46:31 -0400 +Subject: Fix spelling of output and improve grammar + +The spelling of output as ouput within the source throws a lintian +warning. This patch resolves that. + +The grammar was also a tad off, so it was improved. + +Change-Id: I5ad23a1fb89c5fdb39ba1f9bb13905ff36de82ad +Signed-off-by: Richard B Winters +--- + lrm/lrmd/lrmd.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/lrm/lrmd/lrmd.c b/lrm/lrmd/lrmd.c +index 385096b..188a4c0 100644 +--- a/lrm/lrmd/lrmd.c ++++ b/lrm/lrmd/lrmd.c +@@ -3362,9 +3362,9 @@ on_ra_proc_finished(ProcTrack* p, int status, int signo, int exitcode + , op->rapop); + } else { + lrmd_log(LOG_WARNING, "There is something wrong: the " +- "first line isn't read in. Maybe the heartbeat " +- "does not ouput string correctly for status " +- "operation. Or the code (myself) is wrong."); ++ "first line isn't read in. Maybe heartbeat does " ++ "not ouptut the string correctly for the status " ++ "operation, or perhaps the code is wrong."); + } + } + diff --git a/debian/patches/0003-Remove-.hgtags-from-source.patch b/debian/patches/0003-Remove-.hgtags-from-source.patch new file mode 100644 index 0000000..ee3901d --- /dev/null +++ b/debian/patches/0003-Remove-.hgtags-from-source.patch @@ -0,0 +1,87 @@ +From: Richard B Winters +Date: Tue, 21 Apr 2015 20:40:30 -0400 +Subject: Remove .hgtags from source + +The .hgtags file should not be packed with the release tarball. + +Change-Id: I4845454ef1caf05fe311e284b8b27f048d77baae +Signed-off-by: Richard B Winters +--- + .hgtags | 68 ----------------------------------------------------------------- + 1 file changed, 68 deletions(-) + delete mode 100644 .hgtags + +diff --git a/.hgtags b/.hgtags +deleted file mode 100644 +index 6e84e98..0000000 +--- a/.hgtags ++++ /dev/null +@@ -1,68 +0,0 @@ +-01ecac8670a6c2e47202a9ce2f5e27e9dcdbeff6 STABLE-1.1.3 +-19d11d8d62c270c48a3feab5ed66b18897c9cc8d sle11-rc9 +-2185d55c12e37c48abc239dd1f8b3b9ef012fd6b obs-2.1.2-1 +-235a71009062702c906cc68f23904ddcbe17535f STABLE-2.0.6 +-29540582671a9e33ae2122d319c68258346f1a3f STABLE-2.1.1 +-2cb36a1c01c76ef3e3a449f16b13730c761efff2 STABLE-2.1.3 +-2ece20ad31a4271076e5c43dd3f2ea25caa55635 Series-Root-1.0 +-3b8dc33a402daaf7e3754acadd1898c0fe69072f STABLE-2.0.3 +-45c377d7a35dba92d46321d2f824bc0d9b17f54e obs-2.1.2-24 +-67a443d135f128ca28f15e4e8999d3e0caabed61 sle11-rc3 +-68de68ef5f0a7b97a4ff0d9806c598527c8659b8 STABLE-2.0.4 +-705b21e4b623f7d2fc5c83d99beffb709905c996 STABLE-0.4.9c +-7190f69e29a08350bcec753509eb37f53593334a beta-2.99.0 +-7f90244e5c25372e70178f77f44c76a8564e1665 SLE10-SP1 +-7f90244e5c25372e70178f77f44c76a8564e1665 STABLE-2.1.0 +-823208439a98179d7c01d6eed1db50dd96802663 sle11-rc7 +-86fa06f08a123868eb272a20bf850cec1805a12f STABLE-2.0.8 +-97d025dd33648a1e50a3a1bf40573669440dd1b6 obs-2.1.2-4 +-9b34f480b8e8966e9ed4276507cc562564763720 beta-2.99.2 +-9eb2a4db4ff595d18302426029b03153fad77ef7 beta-2.99.1 +-a230062a445096b89cf75bef85e285ee55626a78 obs-2.1.2-2 +-af867b71bcc645f3d3c56fe8fdd883b17a851e46 STABLE-2.0.0 +-b4a0a0ffd15eb2dd1285bdbd86ea9716a9d0bf36 STABLE-2.0.5 +-b906db882c37647abfd21fa1473950445ad7813c STABLE-2.1.2 +-ba476a3948ea0cf52098fa050a27a8856a214825 sle11-rc2 +-be0d49da51a810e870356b7f2a52013e5c775c0d Beta-0.4.9a +-c77ad4549888539e7fc9a6b56cccdb1403749198 STABLE-0.4.9e +-c7d672b9f3ece79ad26fb8a7df20265bcb596515 sle11-beta6 +-cf0265eed1b5b3b3f25f7e56eb807d21ca261d68 SLES10-GA-2.0.7-1.5 +-cf0265eed1b5b3b3f25f7e56eb807d21ca261d68 STABLE-2.0.7 +-d1899e1eecc09b7a6e66a02609408272bb856c6a STABLE-1.1.5 +-dae6b0b3e109afc5df29a7127ab6dd9e1bd0a20a sle11-rc5 +-e3691501a2d0631c3796b6a728fadf7d90691203 obs-2.1.2-15 +-e3855af19554339204b5b2b2a199a7bc31e22843 STABLE-2.0.1 +-e3855af19554339204b5b2b2a199a7bc31e22843 STABLE-2.0.2 +-e6637f62c87ada212a83942ec5b2a4bf30b98c3f Series-Root-1.2 +-f6c2cd2593f365f984ce051db61466738ac05dcd Beta-0.4.9f +-940fa13f6a0a929d15a01af9a0b62c16e4d2706a glue-1.0 +-130b1d7af88912d077d32a7c386c3c94d0b2da16 glue-1.0.2-rc1 +-78894a112c0a134dc709d2a8772085180444c40c glue-1.0.2-rc2 +-7700902a4de3ee84fa2007a4b4602693c5ac26a8 glue-1.0.2-rc2a +-97fcdf789e174b0a0b23e28dcabe2f7d579d426f glue-1.0.2 +-0a64e6f77894da1364b17dc3c73b65561717f4aa glue-1.0.3 +-0a64e6f77894da1364b17dc3c73b65561717f4aa glue-1.0.3 +-0000000000000000000000000000000000000000 glue-1.0.3 +-0000000000000000000000000000000000000000 glue-1.0.3 +-979c4ffae287976631a30d10258903aea6fb28fa glue-1.0.3 +-979c4ffae287976631a30d10258903aea6fb28fa glue-1.0.3 +-0000000000000000000000000000000000000000 glue-1.0.3 +-0000000000000000000000000000000000000000 glue-1.0.3 +-9bcd134f1ebff7baf80f4b21c3b5f620b0ee976e glue-1.0.3 +-9bcd134f1ebff7baf80f4b21c3b5f620b0ee976e glue-1.0.3 +-0000000000000000000000000000000000000000 glue-1.0.3 +-0000000000000000000000000000000000000000 glue-1.0.3 +-2e33ecd820b2673755d1280a259489a026921f63 glue-1.0.3 +-761edff8c35ea2cdf3e1bd37d600b06233e61d4f glue-1.0.4-rc1 +-3229873980e1028bf05de81f5bafccb3a92b9aa4 glue-1.0.4 +-3af80b93d9e5d5e441f3f4c3aad16775ea27d2d9 glue-1.0.5 +-1c87a0c58c59fc384b93ec11476cefdbb6ddc1e1 glue-1.0.6 +-61200fbe18358e420cdc2037d87e803e150c1eac glue-1.0.7-rc1 +-5e06b2ddd24b37ad6c1c25d958d7a9dda7d02f93 glue-1.0.7 +-5740338816e1ff07d0e37f36214f442e183984d7 glue-1.0.8-rc1 +-c69dc6ace936f501776df92dab3d611c2405f69e glue-1.0.8 +-0a08a469fdc8a0db1875369497bc83c0523ceb21 glue-1.0.9 +-12055ca2b025ab250a544701edaa1f5aaf63aef1 glue-1.0.10 +-02bdcf58f9a098b717784746308e199e12eeb005 glue-1.0.11 +-c64d6e96f20ad5ba245f7fb9e1295b14fa179e29 glue-1.0.12-rc1 +-d05229decc34d66c4752536dc7c9d812d1e6d5ca glue-1.0.12 diff --git a/debian/patches/0004-Remove-.hgignore-from-source.patch b/debian/patches/0004-Remove-.hgignore-from-source.patch new file mode 100644 index 0000000..86bb299 --- /dev/null +++ b/debian/patches/0004-Remove-.hgignore-from-source.patch @@ -0,0 +1,111 @@ +From: Richard B Winters +Date: Tue, 21 Apr 2015 20:41:22 -0400 +Subject: Remove .hgignore from source + +The .hgignore file should not be packed with the release tarball + +Change-Id: If417384794d46c97d0bbc46231c76f19d2debb1b +Signed-off-by: Richard B Winters +--- + .hgignore | 92 --------------------------------------------------------------- + 1 file changed, 92 deletions(-) + delete mode 100644 .hgignore + +diff --git a/.hgignore b/.hgignore +deleted file mode 100644 +index 8ce7ca5..0000000 +--- a/.hgignore ++++ /dev/null +@@ -1,92 +0,0 @@ +-syntax: glob +- +-# Autofoo entries +-*.o +-*.la +-*.lo +-*.loT +-*.pyc +-.libs +-.deps +-*.cache +-.cvsignore +-compile +-configure +-configure.status +-configure.lineno +-depcomp +-aclocal.m4 +-libtool +-ltmain.sh +-ltconfig +-libltdl +-mkinstalldirs +-install-sh +-missing +-py-compile +-autom4te* +-libtool.m4 +-ltdl.m4 +-libltdl.tar +-autoconf +-autoheader +-automake +-include/glue_config.h +-include/stamp-h1 +-include/pils/plugin.h +-include/stamp-h2 +-ylwrap +- +-# BEAM Entries +-*.beam +-parser-messages +-MISC_ERRORS +-cscope.files +-cscope.out +-patches +-updates +-logs +- +-# OS and Editor Artifacts +-.DS_Store +-*.diff +-*.patch +-*~ +- +-# Project build targets +-lib/clplumbing/base64_md5_test +-lib/clplumbing/ipctest +-lib/clplumbing/ipctransientclient +-lib/clplumbing/ipctransientserver +-logd/ha_logd +-logd/ha_logger +-logd/logtest +-lrm/admin/lrmadmin +-lrm/lrmd/lrmd +-lrm/test/apitest +-lrm/test/callbacktest +-lrm/test/plugintest +-lrm/test/lrmregtest +-lrm/test/lrmregtest-heartbeat +-lrm/test/lrmregtest-lsb +-lrm/test/regression.sh +-lrm/test/LRMBasicSanityCheck +-lrm/test/simple_ops +- +-# Misc +-GPATH +-GRTAGS +-GSYMS +-GTAGS +-HTML +-TAGS +-.gres.* +-*.orig +-.gdb_history +- +-# Entries better done as regexp's to avoid matching too broadly +-syntax: regexp +-^config\.* +-README$ +-Makefile$ +-Makefile.in$ diff --git a/debian/patches/0005-Remove-.hgsigs-from-source.patch b/debian/patches/0005-Remove-.hgsigs-from-source.patch new file mode 100644 index 0000000..fc9c646 --- /dev/null +++ b/debian/patches/0005-Remove-.hgsigs-from-source.patch @@ -0,0 +1,23 @@ +From: Richard B Winters +Date: Tue, 21 Apr 2015 20:42:12 -0400 +Subject: Remove .hgsigs from source + +The .hgsigs file should not be packed with the release tarball. + +Change-Id: I72da4087cdb3bb321f5a5a80a5b3758cc488b79a +Signed-off-by: Richard B Winters +--- + .hgsigs | 4 ---- + 1 file changed, 4 deletions(-) + delete mode 100644 .hgsigs + +diff --git a/.hgsigs b/.hgsigs +deleted file mode 100644 +index ddb9f3d..0000000 +--- a/.hgsigs ++++ /dev/null +@@ -1,4 +0,0 @@ +-b6dca003bb176978af803eeb33019b6aef3c58b0 0 iEYEABECAAYFAktnGJAACgkQWnQN9wr0w1ywBACghXYwYkv/70Xg5AQMzVjRWKZecIoAnjRUytRoYl+dhhqbhfdXSD+/Bfvw +-6007185b487e3f2dc3b24674a9105761b2cde6ea 0 iEYEABECAAYFAktoWfsACgkQWnQN9wr0w1ySZwCfQILyC2VJrCnVEU2zvTIyI7ustDAAn37hhb9JM8JQVKLfPEbqIloz1m3m +-979c4ffae287976631a30d10258903aea6fb28fa 0 iEYEABECAAYFAktoY38ACgkQWnQN9wr0w1wHxgCeMZyOt8ccxmIsvIHg4/y6KmqtTVAAn2jn7dOmFMjA8m4ju59YaQ1Bznhb +-798645ead29e20b361af883fce695b85caf3392b 0 iEYEABECAAYFAlPJCM4ACgkQWnQN9wr0w1wv+QCeJQOjaYNXNJZA61n7Fu8f63CeVBEAnja4WqiYC+TS4HvmRJz6oNi6p48u diff --git a/debian/patches/0019-Current-Pacemaker-does-not-use-ha_logd.patch b/debian/patches/0019-Current-Pacemaker-does-not-use-ha_logd.patch new file mode 100644 index 0000000..ff4a845 --- /dev/null +++ b/debian/patches/0019-Current-Pacemaker-does-not-use-ha_logd.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= +Date: Wed, 20 Jan 2021 12:06:03 +0100 +Subject: Current Pacemaker does not use ha_logd + +--- + logd/logd.service.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/logd/logd.service.in b/logd/logd.service.in +index c321d22..506da3d 100644 +--- a/logd/logd.service.in ++++ b/logd/logd.service.in +@@ -1,8 +1,6 @@ + [Unit] + Description=ha_logd logging daemon + Documentation=man:ha_logd(8) +-Before=pacemaker.service +-PartOf=pacemaker.service + + [Service] + ExecStart=@libdir@/@HB_PKG@/ha_logd -c @sysconfdir@/logd.cf diff --git a/debian/patches/0020-Fix-typo-bounary-boundary.patch b/debian/patches/0020-Fix-typo-bounary-boundary.patch new file mode 100644 index 0000000..ae72df0 --- /dev/null +++ b/debian/patches/0020-Fix-typo-bounary-boundary.patch @@ -0,0 +1,21 @@ +From: =?utf-8?q?Ferenc_W=C3=A1gner?= +Date: Wed, 20 Jan 2021 12:24:02 +0100 +Subject: Fix typo: bounary -> boundary + +--- + lib/clplumbing/cl_msg_types.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/clplumbing/cl_msg_types.c b/lib/clplumbing/cl_msg_types.c +index f13c61d..3786f1e 100644 +--- a/lib/clplumbing/cl_msg_types.c ++++ b/lib/clplumbing/cl_msg_types.c +@@ -1128,7 +1128,7 @@ binary2string(char* buf, char* maxp, void* value, size_t len, int depth) + baselen = B64_stringlen(len) + 1; + + if ( buf + baselen > maxp){ +- cl_log(LOG_ERR, "binary2string: out of bounary"); ++ cl_log(LOG_ERR, "binary2string: out of boundary"); + return -1; + } + diff --git a/debian/patches/asciidoctor.patch b/debian/patches/asciidoctor.patch new file mode 100644 index 0000000..122f850 --- /dev/null +++ b/debian/patches/asciidoctor.patch @@ -0,0 +1,45 @@ +Description: Replace deprecated asciidoc with asciidoctor +Author: Valentin Vidic +Last-Update: 2018-10-12 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -42,12 +42,18 @@ + XSLTPROC_HTML_OPTIONS ?= $(XSLTPROC_OPTIONS) + XSLTPROC_FO_OPTIONS ?= $(XSLTPROC_OPTIONS) + ++if IS_A2X ++MANPAGE_GENERATOR = $(A2X) -f manpage ++else ++MANPAGE_GENERATOR = $(ASCIIDOCTOR) -b manpage ++endif ++ + %.5 %.8 %.1: %.xml + $(XSLTPROC) \ + $(XSLTPROC_MANPAGES_OPTIONS) \ + $(MANPAGES_STYLESHEET) $< + + hb_report.8: hb_report.8.txt +- a2x -f manpage $< ++ $(MANPAGE_GENERATOR) $< + + endif +--- a/configure.ac ++++ b/configure.ac +@@ -526,9 +526,12 @@ + if test "x$XSLTPROC" = "x"; then + AC_MSG_WARN([xsltproc not installed, unable to (re-)build manual pages]) + fi +- AC_PATH_PROGS(ASCIIDOC, asciidoc) +- if test "x$ASCIIDOC" = "x"; then +- AC_MSG_WARN([asciidoc not installed, unable to (re-)build manual pages]) ++ ++ AC_PATH_PROGS(A2X, a2x) ++ AC_PATH_PROGS(ASCIIDOCTOR, asciidoctor) ++ AM_CONDITIONAL(IS_A2X, test x"${A2X}" != x"") ++ if test "x$A2X" = "x" && test "x$ASCIIDOCTOR" = "x"; then ++ AC_MSG_WARN([asciidoc(tor) not installed, unable to (re-)build manual pages]) + fi + fi + AM_CONDITIONAL(BUILD_DOC, test "x$XSLTPROC" != "x" ) diff --git a/debian/patches/file_paths.patch b/debian/patches/file_paths.patch new file mode 100644 index 0000000..beb9dcf --- /dev/null +++ b/debian/patches/file_paths.patch @@ -0,0 +1,26 @@ +Description: Adjust file paths for Debian + Fix --with-rundir option for configure +Author: Valentin Vidic +Last-Update: 2019-01-21 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/configure.ac ++++ b/configure.ac +@@ -382,7 +382,6 @@ + AC_DEFINE_UNQUOTED(GLUE_DAEMON_DIR,"$GLUE_DAEMON_DIR", Location for daemons) + AC_SUBST(GLUE_DAEMON_DIR) + +-GLUE_STATE_DIR=${localstatedir}/run + AC_DEFINE_UNQUOTED(GLUE_STATE_DIR,"$GLUE_STATE_DIR", Where to keep state files and sockets) + AC_SUBST(GLUE_STATE_DIR) + +@@ -390,7 +389,8 @@ + AC_DEFINE_UNQUOTED(GLUE_SHARED_DIR,"$GLUE_SHARED_DIR", Location for scripts) + AC_SUBST(GLUE_SHARED_DIR) + +-AC_DEFINE_UNQUOTED(HA_VARRUNDIR,"$GLUE_STATE_DIR", Where Heartbeat keeps state files and sockets - old name) ++HA_VARRUNDIR="$GLUE_STATE_DIR" ++AC_DEFINE_UNQUOTED(HA_VARRUNDIR,"$HA_VARRUNDIR", Where Heartbeat keeps state files and sockets - old name) + AC_SUBST(HA_VARRUNDIR) + + HA_VARLIBHBDIR=${localstatedir}/lib/heartbeat diff --git a/debian/patches/fix-configure-libxml2.patch b/debian/patches/fix-configure-libxml2.patch new file mode 100644 index 0000000..1d52c75 --- /dev/null +++ b/debian/patches/fix-configure-libxml2.patch @@ -0,0 +1,37 @@ +Description: Use pkgconfig to configure libxml-2.0 + xml2-config to be removed from Debian packaging +Author: Valentin Vidic +Last-Update: 2020-02-15 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/configure.ac ++++ b/configure.ac +@@ -516,7 +516,6 @@ + AC_PATH_PROGS(MAILCMD, mailx mail) + AC_PATH_PROGS(EGREP, egrep) + AC_PATH_PROGS(PKGCONFIG, pkg-config) +-AC_PATH_PROGS(XML2CONFIG, xml2-config) + + AC_ARG_ENABLE([doc], + AS_HELP_STRING([--enable-doc], [build documentation (default is yes)]), +@@ -726,16 +725,11 @@ + dnl AC_CHECK_HEADERS(netinet/ip_icmp.h) + + AC_MSG_CHECKING(for special libxml2 includes) +-if test "x$XML2CONFIG" = "x"; then +- AC_MSG_ERROR(libxml2 config not found) +-else +- XML2HEAD="`$XML2CONFIG --cflags`" +- AC_MSG_RESULT($XML2HEAD) +- AC_CHECK_LIB(xml2, xmlReadMemory) +-fi +- +-CPPFLAGS="$CPPFLAGS $XML2HEAD" ++PKG_CHECK_MODULES(XML, [libxml-2.0]) ++CPPFLAGS="$CPPFLAGS $XML_CFLAGS" ++LIBS="$LIBS $XML_LIBS" + ++AC_CHECK_LIB(xml2, xmlReadMemory) + AC_CHECK_HEADERS(libxml/xpath.h) + if test "$ac_cv_header_libxml_xpath_h" != "yes"; then + AC_MSG_ERROR(The libxml developement headers were not found) diff --git a/debian/patches/ha_logger_man.patch b/debian/patches/ha_logger_man.patch new file mode 100644 index 0000000..71f4f0d --- /dev/null +++ b/debian/patches/ha_logger_man.patch @@ -0,0 +1,28 @@ +Description: Move ha_logger manpage to section 8 + Fixes lintian warning for /usr/sbin binaries. +Author: Valentin Vidic +Last-Update: 2019-07-11 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -28,7 +28,7 @@ + man_MANS = + + if BUILD_DOC +-man_MANS += hb_report.8 ha_logd.8 ha_logger.1 stonith.8 meatclient.8 ++man_MANS += hb_report.8 ha_logd.8 ha_logger.8 stonith.8 meatclient.8 + + EXTRA_DIST = $(man_MANS) + +--- a/doc/ha_logger.xml.in ++++ b/doc/ha_logger.xml.in +@@ -34,7 +34,7 @@ + + + ha_logger +- 1 ++ 8 + User commands + + diff --git a/debian/patches/hurd.diff b/debian/patches/hurd.diff new file mode 100644 index 0000000..46207b9 --- /dev/null +++ b/debian/patches/hurd.diff @@ -0,0 +1,43 @@ +Description: Fix build on hurd #650820 +Author: Gabriele Giacone <1o5g4r8o@gmail.com> +Last-Update: 2012-07-24 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/clplumbing/cl_pidfile.c ++++ b/lib/clplumbing/cl_pidfile.c +@@ -79,7 +79,11 @@ static int IsRunning(long pid) + int rc = 0; + long mypid; + int running = 0; ++#ifdef __GNU__ ++ char proc_path[4096], exe_path[4096], myexe_path[4096]; ++#else + char proc_path[PATH_MAX], exe_path[PATH_MAX], myexe_path[PATH_MAX]; ++#endif + + /* check if pid is running */ + if (CL_KILL(pid, 0) < 0 && errno == ESRCH) { +@@ -93,7 +97,11 @@ static int IsRunning(long pid) + /* check to make sure pid hasn't been reused by another process */ + snprintf(proc_path, sizeof(proc_path), "/proc/%lu/exe", pid); + ++#ifdef __GNU__ ++ rc = readlink(proc_path, exe_path, sizeof(exe_path)-1); ++#else + rc = readlink(proc_path, exe_path, PATH_MAX-1); ++#endif + if(rc < 0) { + cl_perror("Could not read from %s", proc_path); + goto bail; +@@ -103,7 +111,11 @@ static int IsRunning(long pid) + mypid = (unsigned long) getpid(); + + snprintf(proc_path, sizeof(proc_path), "/proc/%lu/exe", mypid); ++#ifdef __GNU__ ++ rc = readlink(proc_path, myexe_path, sizeof(myexe_path)-1); ++#else + rc = readlink(proc_path, myexe_path, PATH_MAX-1); ++#endif + if(rc < 0) { + cl_perror("Could not read from %s", proc_path); + goto bail; diff --git a/debian/patches/ipc_param_type b/debian/patches/ipc_param_type new file mode 100644 index 0000000..8030599 --- /dev/null +++ b/debian/patches/ipc_param_type @@ -0,0 +1,48 @@ +commit eeacbaac57b033682fb6249435b3db22c3445eb1 +Author: Dejan Muhamedagic +Date: Mon Jan 2 12:53:18 2017 +0100 + + Low: ipc: fix poll function parameter type + +--- a/include/clplumbing/ipc.h ++++ b/include/clplumbing/ipc.h +@@ -700,7 +700,7 @@ + /* Destroys an object constructed by ipc_set_auth or ipc_str_to_auth() */ + extern void ipc_destroy_auth(IPC_Auth * auth); + +-extern void ipc_set_pollfunc(int (*)(struct pollfd*, unsigned int, int)); ++extern void ipc_set_pollfunc(int (*)(struct pollfd*, nfds_t, int)); + extern void ipc_bufpool_dump_stats(void); + + #ifdef IPC_TIME_DEBUG +--- a/lib/clplumbing/ipctest.c ++++ b/lib/clplumbing/ipctest.c +@@ -53,8 +53,8 @@ + static int checksock(IPC_Channel* channel); + static void checkifblocked(IPC_Channel* channel); + +-static int (*PollFunc)(struct pollfd * fds, unsigned int, int) +-= (int (*)(struct pollfd * fds, unsigned int, int)) poll; ++static int (*PollFunc)(struct pollfd * fds, nfds_t, int) ++= (int (*)(struct pollfd * fds, nfds_t, int)) poll; + static gboolean checkmsg(IPC_Message* rmsg, const char * who, int rcount); + + static const char *procname; +--- a/lib/clplumbing/ocf_ipc.c ++++ b/lib/clplumbing/ocf_ipc.c +@@ -47,12 +47,12 @@ + struct IPC_WAIT_CONNECTION * socket_wait_conn_new(GHashTable* ch_attrs); + struct IPC_CHANNEL * socket_client_channel_new(GHashTable* ch_attrs); + +-int (*ipc_pollfunc_ptr)(struct pollfd*, unsigned int, int) +-= (int (*)(struct pollfd*, unsigned int, int)) poll; ++int (*ipc_pollfunc_ptr)(struct pollfd*, nfds_t, int) ++= (int (*)(struct pollfd*, nfds_t, int)) poll; + + /* Set the IPC poll function to the given function */ + void +-ipc_set_pollfunc(int (*pf)(struct pollfd*, unsigned int, int)) ++ipc_set_pollfunc(int (*pf)(struct pollfd*, nfds_t, int)) + { + ipc_pollfunc_ptr = pf; + } diff --git a/debian/patches/kfbsd.diff b/debian/patches/kfbsd.diff new file mode 100644 index 0000000..fbb78b9 --- /dev/null +++ b/debian/patches/kfbsd.diff @@ -0,0 +1,16 @@ +Description: Fix build on FreeBSD #650820 +Author: Gabriele Giacone <1o5g4r8o@gmail.com> +Last-Update: 2012-07-24 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/clplumbing/ipcsocket.c ++++ b/lib/clplumbing/ipcsocket.c +@@ -2406,7 +2406,7 @@ socket_verify_auth(struct IPC_CHANNEL* c + + #define EXTRASPACE 0 + +-#ifdef HAVE_STRUCT_CMSGCRED ++#if defined(HAVE_STRUCT_CMSGCRED) || defined( __FreeBSD_kernel__) || defined(__GNU__) + /* FreeBSD */ + typedef struct cmsgcred Cred; + # define crRuid cmcred_uid diff --git a/debian/patches/openipmi-selector.patch b/debian/patches/openipmi-selector.patch new file mode 100644 index 0000000..d9ad24d --- /dev/null +++ b/debian/patches/openipmi-selector.patch @@ -0,0 +1,59 @@ +Description: Fix FTBFS with openipmi 2.0.25 + selector_t deprecated in new openipmi version +Author: Valentin Vidic +Last-Update: 2018-05-29 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/plugins/stonith/ipmi_os_handler.c ++++ b/lib/plugins/stonith/ipmi_os_handler.c +@@ -34,7 +34,7 @@ + + #include + +-extern selector_t *os_sel; ++extern struct selector_s *os_sel; + + #if 0 + static void check_no_locks(os_handler_t *handler); +@@ -107,7 +107,7 @@ + }; + + static void +-timer_handler(selector_t *sel, ++timer_handler(struct selector_s *sel, + sel_timer_t *timer, + void *data) + { +--- a/lib/plugins/stonith/ipmilan_command.c ++++ b/lib/plugins/stonith/ipmilan_command.c +@@ -49,7 +49,7 @@ + #define OPERATION_TIME_OUT 10 + + os_handler_t *os_hnd=NULL; +-selector_t *os_sel; ++struct selector_s *os_sel; + static ipmi_con_t *con; + extern os_handler_t ipmi_os_cb_handlers; + static int reset_method; +@@ -84,10 +84,10 @@ + + void send_ipmi_cmd(ipmi_con_t *con, int request); + +-void timed_out(selector_t *sel, sel_timer_t *timer, void *data); ++void timed_out(struct selector_s *sel, sel_timer_t *timer, void *data); + + void +-timed_out(selector_t *sel, sel_timer_t *timer, void *data) ++timed_out(struct selector_s *sel, sel_timer_t *timer, void *data) + { + PILCallLog(PluginImports->log,PIL_CRIT, "IPMI operation timed out... :(\n"); + gstatus = S_TIMEOUT; +@@ -280,7 +280,7 @@ + return 1; + } + +- rv = sel_alloc_selector(os_hnd, &os_sel); ++ rv = sel_alloc_selector_nothread(&os_sel); + if (rv) { + PILCallLog(PluginImports->log,PIL_CRIT, "Could not allocate selector\n"); + return rv; diff --git a/debian/patches/perl-interpreter.patch b/debian/patches/perl-interpreter.patch new file mode 100644 index 0000000..676a48e --- /dev/null +++ b/debian/patches/perl-interpreter.patch @@ -0,0 +1,15 @@ +Description: Fix interpreter for perl scripts + Policy 10.4 states that Perl scripts must use + /usr/bin/perl directly and not via /usr/bin/env +Author: Valentin Vidic +Last-Update: 2018-08-17 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/plugins/stonith/external/vcenter ++++ b/lib/plugins/stonith/external/vcenter +@@ -1,4 +1,4 @@ +-#!/usr/bin/env perl ++#!/usr/bin/perl + # + # External STONITH module for VMWare vCenter/ESX + # diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch new file mode 100644 index 0000000..73410d5 --- /dev/null +++ b/debian/patches/python3.patch @@ -0,0 +1,406 @@ +Description: Convert scripts to python3 +Author: Valentin Vidic +Last-Update: 2019-06-26 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/plugins/stonith/external/dracmc-telnet ++++ b/lib/plugins/stonith/external/dracmc-telnet +@@ -75,7 +75,7 @@ + + def _get_timestamp(self): + ct = time.time() +- msecs = (ct - long(ct)) * 1000 ++ msecs = (ct - int(ct)) * 1000 + return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime(ct)), msecs) + +@@ -93,48 +93,48 @@ + def login(self, user, passwd): + time.sleep(0.3) + try: +- line = self.read_until('Login: ', self._timeout) +- self.write(user) +- self.write('\r') +- line = self.read_until('Password: ', self._timeout) +- self.write(passwd) +- self.write('\r') ++ line = self.read_until(b'Login: ', self._timeout) ++ self.write(user.encode("utf-8")) ++ self.write(b'\r') ++ line = self.read_until(b'Password: ', self._timeout) ++ self.write(passwd.encode("utf-8")) ++ self.write(b'\r') + except: +- self.write("\r") +- line = self.read_until('Login: ', self._timeout) +- self.write(user) +- self.write('\r') +- line = self.read_until('Password: ', self._timeout) +- self.write(passwd) +- self.write('\r') ++ self.write(b"\r") ++ line = self.read_until(b'Login: ', self._timeout) ++ self.write(user.encode("utf-8")) ++ self.write(b'\r') ++ line = self.read_until(b'Password: ', self._timeout) ++ self.write(passwd.encode("utf-8")) ++ self.write('b\r') + try: +- line = self.read_until('DRAC/MC:', self._timeout) ++ line = self.read_until(b'DRAC/MC:', self._timeout) + except: +- self.write("\r") +- line = self.read_until('DRAC/MC:', self._timeout) ++ self.write(b"\r") ++ line = self.read_until(b'DRAC/MC:', self._timeout) + + def hardreset(self): +- self.write('serveraction -s %s hardreset\r' % self._server) +- line = self.read_until('OK', 10) +- line = self.read_until('DRAC/MC:', self._timeout) ++ self.write(b'serveraction -s %b hardreset\r' % self._server.encode("utf-8")) ++ line = self.read_until(b'OK', 10) ++ line = self.read_until(b'DRAC/MC:', self._timeout) + + def powercycle(self): +- self.write('serveraction -s %s powercycle\r' % self._server) +- line = self.read_until('OK', 10) +- line = self.read_until('DRAC/MC:', self._timeout) ++ self.write(b'serveraction -s %b powercycle\r' % self._server.encode("utf-8")) ++ line = self.read_until(b'OK', 10) ++ line = self.read_until(b'DRAC/MC:', self._timeout) + + def on(self): +- self.write('serveraction -s %s powerup\r' % self._server) +- line = self.read_until('OK', 10) +- line = self.read_until('DRAC/MC:', self._timeout) ++ self.write(b'serveraction -s %b powerup\r' % self._server.encode("utf-8")) ++ line = self.read_until(b'OK', 10) ++ line = self.read_until(b'DRAC/MC:', self._timeout) + + def off(self): +- self.write('serveraction -s %s powerdown\r' % self._server) +- line = self.read_until('OK', 10) +- line = self.read_until('DRAC/MC:', self._timeout) ++ self.write(b'serveraction -s %b powerdown\r' % self._server.encode("utf-8")) ++ line = self.read_until(b'OK', 10) ++ line = self.read_until(b'DRAC/MC:', self._timeout) + + def exit(self): +- self.write('exit\r') ++ self.write(b'exit\r') + + def get_history(self): + return "\n".join(self._history) +@@ -171,7 +171,7 @@ + + def _get_timestamp(self): + ct = time.time() +- msecs = (ct - long(ct)) * 1000 ++ msecs = (ct - int(ct)) * 1000 + return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime(ct)), msecs) + +@@ -201,7 +201,7 @@ + self._parameters['cyclades_port']) + c.login(self._parameters['username'], + self._parameters['password']) +- except Exception, args: ++ except Exception as args: + if "Connection reset by peer" in str(args): + self._echo_debug("Someone is already logged in... retry=%s" % tries) + c.close() +@@ -363,7 +363,7 @@ + func = getattr(self, cmd, self.not_implemented) + rc = func() + return(rc) +- except Exception, args: ++ except Exception as args: + self.echo_log("err", 'Exception raised:', str(args)) + if self._connection: + self.echo_log("err", self._connection.get_history()) +--- a/lib/plugins/stonith/external/ibmrsa-telnet ++++ b/lib/plugins/stonith/external/ibmrsa-telnet +@@ -72,7 +72,7 @@ + + def _get_timestamp(self): + ct = time.time() +- msecs = (ct - long(ct)) * 1000 ++ msecs = (ct - int(ct)) * 1000 + return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime(ct)), msecs) + +@@ -90,31 +90,31 @@ + + def login(self, user, passwd): + time.sleep(1) +- line = self.expect(['\nlogin : ', '\nusername: '], self._timeout) +- self.write(user) +- self.write('\r') +- line = self.expect(['\nPassword: ', '\npassword: '], self._timeout) +- self.write(passwd, nolog = True) +- self.write('\r') +- line = self.expect(['\nsystem>', '> '], self._timeout) ++ line = self.expect([b'\nlogin : ', b'\nusername: '], self._timeout) ++ self.write(user.encode("utf-8")) ++ self.write(b'\r') ++ line = self.expect([b'\nPassword: ', b'\npassword: '], self._timeout) ++ self.write(passwd.encode("utf-8"), nolog = True) ++ self.write(b'\r') ++ line = self.expect([b'\nsystem>', b'> '], self._timeout) + + def reset(self): +- self.write('power cycle\r') +- line = self.expect(['\nok'], self._timeout) +- line = self.expect(['\nsystem>', '> '], self._timeout) ++ self.write(b'power cycle\r') ++ line = self.expect([b'\nok'], self._timeout) ++ line = self.expect([b'\nsystem>', b'> '], self._timeout) + + def on(self): +- self.write('power on\r') +- line = self.expect(['\nok'], self._timeout) +- line = self.expect(['\nsystem>', '> '], self._timeout) ++ self.write(b'power on\r') ++ line = self.expect([b'\nok'], self._timeout) ++ line = self.expect([b'\nsystem>', b'> '], self._timeout) + + def off(self): +- self.write('power off\r') +- line = self.expect(['\nok'], self._timeout) +- line = self.expect(['\nsystem>', '> '], self._timeout) ++ self.write(b'power off\r') ++ line = self.expect([b'\nok'], self._timeout) ++ line = self.expect([b'\nsystem>', b'> '], self._timeout) + + def exit(self): +- self.write('exit\r') ++ self.write(b'exit\r') + + def get_history(self): + return "\n".join(self._history) +@@ -150,7 +150,7 @@ + + def _get_timestamp(self): + ct = time.time() +- msecs = (ct - long(ct)) * 1000 ++ msecs = (ct - int(ct)) * 1000 + return "%s,%03d" % (time.strftime("%Y-%m-%d %H:%M:%S", + time.localtime(ct)), msecs) + +@@ -306,7 +306,7 @@ + func = getattr(self, cmd, self.not_implemented) + rc = func() + return(rc) +- except Exception, args: ++ except Exception as args: + self.echo_log("err", 'Exception raised:', str(args)) + if self._connection: + self.echo_log("err", self._connection.get_history()) +--- a/lib/plugins/stonith/ribcl.py.in ++++ b/lib/plugins/stonith/ribcl.py.in +@@ -19,7 +19,7 @@ + + import sys + import socket +-from httplib import * ++from http.client import * + from time import sleep + + +@@ -30,30 +30,30 @@ + host = argv[1].split('.')[0]+'-rm' + cmd = argv[2] + except IndexError: +- print "Not enough arguments" ++ print("Not enough arguments") + sys.exit(1) + + +-login = [ '', +- '' ] ++login = [ b'', ++ b'' ] + + +-logout = [ '', '' ] ++logout = [ b'', b'' ] + + +-status = [ '', '', +- '' ] ++status = [ b'', b'', ++ b'' ] + + +-reset = [ '', '', '' ] ++reset = [ b'', b'', b'' ] + + +-off = [ '', '', +- '' ] ++off = [ b'', b'', ++ b'' ] + + +-on = [ '', '', +- '' ] ++on = [ b'', b'', ++ b'' ] + + + todo = { 'reset':reset, 'on':on, 'off':off, 'status':status } +@@ -67,7 +67,7 @@ + else: + acmds.append(login + todo[cmd] + logout) + except KeyError: +- print "Invalid command: "+ cmd ++ print("Invalid command: "+ cmd) + sys.exit(1) + + +@@ -76,12 +76,12 @@ + + + c=HTTPSConnection(host) +- c.send('\r\n') ++ c.send(b'\r\n') + c.sock.recv(1024) + + + for line in cmds: +- c.send(line+'\r\n') ++ c.send(line+b'\r\n') + c.sock.recv(1024) + + +@@ -89,13 +89,9 @@ + sleep(1) + + +-except socket.gaierror, msg: +- print msg ++except socket.gaierror as msg: ++ print(msg) + sys.exit(1) +-except socket.sslerror, msg: +- print msg ++except socket.error as msg: ++ print(msg) + sys.exit(1) +-except socket.error, msg: +- print msg +- sys.exit(1) +- +--- a/lib/plugins/stonith/external/riloe ++++ b/lib/plugins/stonith/external/riloe +@@ -36,7 +36,7 @@ + import socket + import subprocess + import xml.dom.minidom +-import httplib ++import http.client + import time + import re + +@@ -164,12 +164,12 @@ + } + + if cmd in info: +- print info[cmd] ++ print(info[cmd]) + sys.exit(0) + + if cmd == 'getconfignames': + for arg in [ "hostlist", "ilo_hostname", "ilo_user", "ilo_password", "ilo_can_reset", "ilo_protocol", "ilo_powerdown_method", "ilo_proxyhost", "ilo_proxyport"]: +- print arg ++ print(arg) + sys.exit(0) + + if not rihost: +@@ -258,7 +258,7 @@ + ''' + msg = "" + str_status = "" +- for attr in node.attributes.keys(): ++ for attr in list(node.attributes.keys()): + if attr == A_STATUS: + str_status = node.getAttribute(attr) + elif attr == A_MSG: +@@ -286,7 +286,7 @@ + variable correspondingly. + ''' + global power +- for attr in node.attributes.keys(): ++ for attr in list(node.attributes.keys()): + if attr == A_POWER_STATE: + power_state = node.getAttribute(attr).upper() + else: +@@ -333,25 +333,23 @@ + proxy_connect='CONNECT %s:%s HTTP/1.1\r\n'%(host,443) + user_agent='User-Agent: python\r\n' + proxy_pieces=proxy_connect+user_agent+'\r\n' +- proxy.sendall(proxy_pieces) +- response=proxy.recv(8192) ++ proxy.sendall(proxy_pieces.encode("utf-8")) ++ response=proxy.recv(8192).decode("utf-8") + status=response.split()[1] + if status!=str(200): + fatal("Error status=: %s" %(response)) + import ssl + sock = ssl.wrap_socket(proxy) +- h=httplib.HTTPConnection('localhost') ++ h=http.client.HTTPConnection('localhost') + h.sock=sock + return h + else: +- return httplib.HTTPSConnection(host) +- except socket.gaierror, msg: ++ return http.client.HTTPSConnection(host) ++ except socket.gaierror as msg: + fatal("%s: %s" %(msg,host)) +- except socket.sslerror, msg: +- fatal("%s for %s" %(msg,host)) +- except socket.error, msg: ++ except socket.error as msg: + fatal("%s while talking to %s" %(msg,host)) +- except ImportError, msg: ++ except ImportError as msg: + fatal("ssl support missing (%s)" %msg) + + def send_request(req,proc_f): +@@ -364,8 +362,8 @@ + t_begin = time.time() + c = open_ilo(rihost) + try: +- c.send(req+'\r\n') +- except socket.error, msg: ++ c.send(req.encode("utf-8") + b'\r\n') ++ except socket.error as msg: + fatal("%s, while talking to %s" %(msg,rihost)) + t_end = time.time() + my_debug("request sent in %0.2f s" % ((t_end-t_begin))) +@@ -378,7 +376,7 @@ + if not reply: + break + result.append(reply) +- except socket.error, msg: ++ except socket.error as msg: + if msg[0] == 6: # connection closed + break + my_err("%s, while talking to %s" %(msg,rihost)) +@@ -389,12 +387,13 @@ + if not result: + fatal("no response from %s within %0.2f s"%(rihost,(t_end-t_begin))) + for reply in result: ++ reply = reply.decode("utf-8") + # work around the iLO bug, i.e. element RIBCL closed twice + if re.search("", reply): + reply = re.sub("<(RIBCL.*)/>", r"<\1>", reply) + try: + doc = xml.dom.minidom.parseString(reply) +- except xml.parsers.expat.ExpatError,msg: ++ except xml.parsers.expat.ExpatError as msg: + fatal("malformed response: %s\n%s"%(msg,reply)) + rc = proc_f(doc) + doc.unlink() diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..c8cb124 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,20 @@ +0001-libtoolize_check.patch +0002-Fix-spelling-of-output-and-improve-grammar.patch +0003-Remove-.hgtags-from-source.patch +0004-Remove-.hgignore-from-source.patch +0005-Remove-.hgsigs-from-source.patch +kfbsd.diff +hurd.diff +x32-cl_times +ipc_param_type +python3.patch +spelling.patch +systemd-doc.patch +openipmi-selector.patch +perl-interpreter.patch +asciidoctor.patch +file_paths.patch +ha_logger_man.patch +fix-configure-libxml2.patch +0019-Current-Pacemaker-does-not-use-ha_logd.patch +0020-Fix-typo-bounary-boundary.patch diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch new file mode 100644 index 0000000..f5f060f --- /dev/null +++ b/debian/patches/spelling.patch @@ -0,0 +1,80 @@ +Description: Fix spelling errors reported by lintian + Some errors like 'EVERYTIME' and 'some system' do not + need fixing. +Author: Valentin Vidic +Last-Update: 2018-04-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/lib/lrm/clientlib.c ++++ b/lib/lrm/clientlib.c +@@ -197,7 +197,7 @@ + /* if already signed on, sign off first*/ + if (is_signed_on) { + cl_log(LOG_WARNING, +- "lrm_signon: the client is alreay signed on, re-sign"); ++ "lrm_signon: the client is already signed on, re-sign"); + lrm_signoff(lrm); + } + +--- a/logd/logtest.c ++++ b/logd/logtest.c +@@ -78,7 +78,7 @@ + snprintf(msgstring, sizeof(msgstring),"Message %d", count++); + fprintf(stderr, "sending %s\n", msgstring); + if (LogToDaemon(priority, msgstring,MAXMSGSIZE, FALSE) != HA_OK){ +- printf("sending out messge %d failed\n", count); ++ printf("sending out message %d failed\n", count); + dropmsg++; + } + +--- a/lrm/lrmd/lrmd.c ++++ b/lrm/lrmd/lrmd.c +@@ -1394,7 +1394,7 @@ + /*get the client in the client list*/ + client = lookup_client(pid); + if (NULL == client) { +- lrmd_log(LOG_ERR, "on_connect_cbk: donnot find the client " ++ lrmd_log(LOG_ERR, "on_connect_cbk: do not find the client " + "[pid:%d] in internal client list. ", pid); + send_ret_msg(ch, HA_FAIL); + return TRUE; +@@ -1680,7 +1680,7 @@ + cl_msg_add_list(ret,F_LRM_RCLASS,ra_class_list); + if (HA_OK != msg2ipcchan(ret, client->ch_cmd)) { + lrmd_log(LOG_ERR, +- "on_msg_get_rsc_classes: cannot send the ret mesage"); ++ "on_msg_get_rsc_classes: cannot send the ret message"); + } + ha_msg_del(ret); + +@@ -3363,7 +3363,7 @@ + } else { + lrmd_log(LOG_WARNING, "There is something wrong: the " + "first line isn't read in. Maybe heartbeat does " +- "not ouptut the string correctly for the status " ++ "not output the string correctly for the status " + "operation, or perhaps the code is wrong."); + } + } +--- a/lrm/admin/lrmadmin.c ++++ b/lrm/admin/lrmadmin.c +@@ -129,7 +129,7 @@ + "daemon dead1", + "daemon dead2", + "daemon stopped", +- "status unknow" ++ "status unknown" + }; + + +--- a/lib/clplumbing/cl_msg_types.c ++++ b/lib/clplumbing/cl_msg_types.c +@@ -1015,7 +1015,7 @@ + + } else { + cl_log(LOG_ERR, "field already exists " +- "with differnt type=%d", msg->types[j]); ++ "with different type=%d", msg->types[j]); + return (HA_FAIL); + } + diff --git a/debian/patches/systemd-doc.patch b/debian/patches/systemd-doc.patch new file mode 100644 index 0000000..f8908fa --- /dev/null +++ b/debian/patches/systemd-doc.patch @@ -0,0 +1,14 @@ +Description: Add manpage to systemd service documentation +Author: Valentin Vidic +Last-Update: 2018-04-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/logd/logd.service.in ++++ b/logd/logd.service.in +@@ -1,5 +1,6 @@ + [Unit] + Description=ha_logd logging daemon ++Documentation=man:ha_logd(8) + Before=pacemaker.service + PartOf=pacemaker.service + diff --git a/debian/patches/x32-cl_times b/debian/patches/x32-cl_times new file mode 100644 index 0000000..798a1e8 --- /dev/null +++ b/debian/patches/x32-cl_times @@ -0,0 +1,48 @@ +Fix cl_times on x32 + +On x32, sizeof(long) is 4, and sizeof(clock_t) is 8. cl_times as logic to +reject that case. We fix this by setting the return type of the function to +long long instead on x32. + +--- a/include/clplumbing/longclock.h ++++ b/include/clplumbing/longclock.h +@@ -79,7 +79,11 @@ + * + * extern const longclock_t zero_longclock; + */ ++#if __ILP32__ && __x86_64__ ++extern unsigned long long cl_times(void); ++#else + extern unsigned long cl_times(void); ++#endif + + #ifdef CLOCK_T_IS_LONG_ENOUGH + # ifndef HAVE_LONGCLOCK_ARITHMETIC +--- a/lib/clplumbing/longclock.c ++++ b/lib/clplumbing/longclock.c +@@ -68,7 +68,11 @@ hz_longclock(void) + # define TIMES_PARAM &dummy_longclock_tms_struct + #endif + ++#if __ILP32__ && __x86_64__ ++unsigned long long ++#else + unsigned long ++#endif + cl_times(void) /* Make times(2) behave rationally on Linux */ + { + clock_t ret; +@@ -114,9 +118,13 @@ cl_times(void) /* Make times(2) behave r + * because of sign extension. + * We do expect sizeof(clock_t) <= sizeof(long), however. + */ ++#if __ILP32__ && __x86_64__ ++ return ret; ++#else + BUILD_BUG_ON(sizeof(clock_t) > sizeof(unsigned long)); + #define CLOCK_T_MAX (~0UL >> (8*(sizeof(unsigned long) - sizeof(clock_t)))) + return (unsigned long)ret & CLOCK_T_MAX; ++#endif + } + + #ifdef CLOCK_T_IS_LONG_ENOUGH diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3cb5334 --- /dev/null +++ b/debian/rules @@ -0,0 +1,53 @@ +#!/usr/bin/make -f + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +# We don't need - or can't, rather, enforce (cf. Policy 10.2) +# because libtool does some chrpath's and re-linking throughout +# the build process, and these options fail the build before +# lib tool gets it's chance to do anything. +# export DEB_LDFLAGS_MAINT_APPEND=-Wl,-z,defs + +export systemdsystemunitdir = $(shell pkgconf --variable=systemdsystemunitdir systemd | sed s,^/,,) + +# main packaging script based on dh7 syntax +%: + dh $@ --with python3 + +override_dh_autoreconf: + dh_autoreconf ./autogen.sh + +override_dh_auto_configure: + ./configure --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib --with-rundir=/run \ + --enable-dependency-tracking --disable-fatal-warnings + +override_dh_auto_install: + dh_auto_install + find \( -name "*.a" -o -name "*.la" \) -delete + mv $(CURDIR)/debian/tmp/usr/sbin/cibsecret $(CURDIR)/debian/tmp/usr/lib/heartbeat/ + +DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifeq (linux,$(DEB_HOST_ARCH_OS)) +override_dh_missing: + dh_missing --fail-missing +endif + +override_dh_install: +# we should probably use dh_install -X here, but it doesn't work +ifeq (hurd,$(DEB_HOST_ARCH_OS)) + sed -i -e'/bladehpi/d' -e '/ipmilan/d' -e '/systemd/d' debian/*.install +endif +ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) + sed -i -e '/systemd/d' debian/*.install +endif + dh_install + +override_dh_installinit: + dh_installinit --name=logd -pcluster-glue --no-start --no-enable + +override_dh_installchangelogs: + dh_installchangelogs ChangeLog + +override_dh_python3: + dh_python3 --no-ext-rename --shebang=/usr/bin/python3 /usr/lib/stonith/plugins diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..33c3a64 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml 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) diff --git a/debian/tests/control b/debian/tests/control new file mode 100644 index 0000000..8ee5a30 --- /dev/null +++ b/debian/tests/control @@ -0,0 +1,14 @@ +Depends: cluster-glue +Tests: user, ipctest + +Depends: cluster-glue, rsyslog +Restrictions: needs-root +Tests: logd + +Depends: cluster-glue +Restrictions: needs-root +Tests: stonith-null + +Depends: cluster-glue +Restrictions: needs-root, isolation-machine +Tests: stonith-suicide diff --git a/debian/tests/ipctest b/debian/tests/ipctest new file mode 100755 index 0000000..df48cf6 --- /dev/null +++ b/debian/tests/ipctest @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +/usr/lib/heartbeat/ipctest 2>&1 diff --git a/debian/tests/logd b/debian/tests/logd new file mode 100755 index 0000000..6ef5f05 --- /dev/null +++ b/debian/tests/logd @@ -0,0 +1,47 @@ +#!/bin/sh + +set -e + +LOG=/var/log/syslog + +log_checker() { + if [ -f $LOG ]; then + grep "$1" $LOG && return 0 + else + journalctl -u logd.service --grep "$1" && return 0 + fi + return 1 +} + +check_log() { + for i in 1 2 3 4 5; do + log_checker "$1" && return 0 + sleep 1 + done + return 1 +} + +echo "=== service ===" +service logd restart # connect to rsyslog after it is installed +service logd status || ERR="$ERR service" + +echo "=== ha_logger ===" +for i in 1 2 3 4 5; do # logd might not be available right away + ha_logger autopkgtest-message 2>&1 && break + sleep 1 +done +check_log 'autopkgtest-message' || ERR="$ERR ha_logger" + +echo "=== logtest ===" +/usr/lib/heartbeat/logtest 10 2>&1 || true +check_log 'total message dropped: 0' || ERR="$ERR logtest" + +if [ "$ERR" ]; then + if [ -f $LOG ]; then + tail -n 20 $LOG + else + journalctl -u logd.service -n 20 + fi + echo "Failed checks:$ERR" + exit 1 +fi diff --git a/debian/tests/stonith-null b/debian/tests/stonith-null new file mode 100755 index 0000000..cecf8e9 --- /dev/null +++ b/debian/tests/stonith-null @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e +HOSTNAME=$(hostname) + +echo "=== list ===" +stonith -L + +printf "\n=== metadata ===\n" +stonith -t null -m + +printf "\n=== status ===\n" +stonith -d -t null hostlist=$HOSTNAME -S -l 2>&1 + +printf "\n=== reset ===\n" +stonith -d -t null hostlist=$HOSTNAME -T reset $HOSTNAME 2>&1 diff --git a/debian/tests/stonith-suicide b/debian/tests/stonith-suicide new file mode 100755 index 0000000..616d362 --- /dev/null +++ b/debian/tests/stonith-suicide @@ -0,0 +1,22 @@ +#!/bin/sh + +set -e + +if [ "$AUTOPKGTEST_REBOOT_MARK" = fenced ]; then + echo "fence was successfull" + exit 0 +fi + +echo "=== list ===" +stonith -L + +printf "\n=== metadata ===\n" +stonith -t suicide -m + +printf "\n=== status ===\n" +stonith -d -t suicide -S -l 2>&1 + +printf "\n=== reset ===\n" +/tmp/autopkgtest-reboot-prepare fenced +sync +stonith -d -t suicide -T reset $(hostname) diff --git a/debian/tests/user b/debian/tests/user new file mode 100755 index 0000000..ca723ff --- /dev/null +++ b/debian/tests/user @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +id hacluster | grep haclient diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..c777899 --- /dev/null +++ b/debian/watch @@ -0,0 +1,4 @@ +version=4 + +opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \ + https://github.com/ClusterLabs/cluster-glue/tags .*/glue-?(\d\S*)\.tar\.gz -- cgit v1.2.3