[Debian-ha-commits] [cluster-glue] 11/73: Imported Debian patch 1.0.6-1~bpo50+1
Richard Winters
devrik-guest at moszumanska.debian.org
Sat Apr 18 20:24:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
devrik-guest pushed a commit to branch master
in repository cluster-glue.
commit 328834acdef8332d43a246f77081711e65d2e44e
Merge: 1130095 d53fb56
Author: Martin Loschwitz <madkiss at debian.org>
Date: Wed Aug 4 13:12:47 2010 +0000
Imported Debian patch 1.0.6-1~bpo50+1
.hg_archival.txt | 2 +-
.hgtags | 1 +
ChangeLog | 19 ++++
cluster-glue-fedora.spec | 3 +-
cluster-glue-suse.spec | 3 +-
configure.ac | 23 ++---
debian/changelog | 21 +++++
debian/control | 13 +--
debian/copyright | 30 ++++++-
debian/patches/01_stylesheet_path.dpatch | 19 ----
debian/patches/spelling-fixes.patch | 100 +++++++++++----------
debian/rules | 6 +-
debian/source/format | 1 -
doc/stonith/Makefile.am | 1 +
doc/stonith/README.rackpdu | 21 +++++
hb_report/hb_report.in | 36 ++++++--
hb_report/utillib.sh | 3 +-
include/clplumbing/ipc.h | 51 ++++++++---
include/glue_config.h.in | 6 +-
include/lrm/lrm_api.h | 4 +
include/lrm/lrm_msg.h | 2 +-
include/stonith/stonith.h | 1 +
lib/clplumbing/Makefile.am | 2 +-
lib/clplumbing/ipcsocket.c | 75 ++++++++++++----
lib/clplumbing/ocf_ipc.c | 2 +
lib/lrm/clientlib.c | 10 ++-
lib/plugins/stonith/external/ibmrsa | 4 +-
lib/plugins/stonith/external/rackpdu | 44 +++++----
lib/plugins/stonith/external/sbd | 24 +----
lib/plugins/stonith/external/xen0 | 8 +-
lib/stonith/ha_log.sh | 7 +-
lib/stonith/main.c | 52 +++++++++--
lib/stonith/sbd.c | 32 ++++++-
lib/stonith/stonith.c | 41 +++++++++
logd/ha_logger.c | 50 +++--------
lrm/admin/Makefile.am | 8 ++
lrm/admin/lrmadmin.c | 41 +++++----
lrm/lrmd/lrmd.c | 147 ++++++++++++++++++-------------
lrm/lrmd/lrmd.h | 7 +-
lrm/lrmd/lrmd_fdecl.h | 4 +-
40 files changed, 616 insertions(+), 308 deletions(-)
diff --cc debian/changelog
index 8164b25,0000000..f27b98f
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,131 -1,0 +1,152 @@@
++cluster-glue (1.0.6-1~bpo50+1) lenny-backports; urgency=low
++
++ * Rebuild for lenny-backports.
++ * Converted package back from 3.0 to 1.0 format
++
++ -- Martin Loschwitz <madkiss at debian.org> Wed, 04 Aug 2010 13:12:47 +0000
++
++cluster-glue (1.0.6-1) unstable; urgency=low
++
++ * New upstream (closes: #588938)
++ - Cleans CFLAGS in a dash-friendly way (closes: #582875)
++
++ -- Simon Horman <horms at debian.org> Wed, 14 Jul 2010 09:53:50 +0900
++
++cluster-glue (1.0.5-2~bpo50+1) lenny-backports; urgency=low
++
++ * Rebuild for lenny-backports.
++ * Converted package back from 3.0 to 1.0 format
++
++ -- Martin Loschwitz <madkiss at debian.org> Thu, 08 Jul 2010 10:22:19 +0000
++
+cluster-glue (1.0.5-2) unstable; urgency=low
+
+ * Add build dependency on docbook-xml.
+
+ -- Frederik Schüler <fs at debian.org> Mon, 03 May 2010 20:05:32 +0200
+
+cluster-glue (1.0.5-1) unstable; urgency=low
+
+ * New upstream version 1.0.5
+
+ -- Martin Loschwitz <madkiss at debian.org> Fri, 16 Apr 2010 06:25:09 +0000
+
+cluster-glue (1.0.3+hg2366-4) unstable; urgency=low
+
+ * Disable fatal warnings to make cluster-glue compile on numerous
+ architectures other than x86(_64)
+
+ -- Martin Loschwitz <madkiss at debian.org> Tue, 06 Apr 2010 13:08:01 +0000
+
+cluster-glue (1.0.3+hg2366-3) unstable; urgency=low
+
+ * Added files to cluster-glue.install that were added upstream
+
+ -- Martin Loschwitz <madkiss at debian.org> Tue, 30 Mar 2010 11:03:34 +0000
+
+cluster-glue (1.0.3+hg2366-2) unstable; urgency=low
+
+ * Include patch by Simon Hormann to Replaces/Conflicts
+
+ -- Martin Loschwitz <madkiss at debian.org> Tue, 30 Mar 2010 07:04:53 +0000
+
+cluster-glue (1.0.3+hg2366-1) unstable; urgency=low
+
+ * New upstream checkout.
+ * Updated debian/copyright to reflect the current situation
+ * Remove useless STYLESHEET_PREFIX patch from debian/patches
+
+ -- Martin Loschwitz <madkiss at debian.org> Tue, 30 Mar 2010 06:28:50 +0000
+
+cluster-glue (1.0.3+hg2365-1) unstable; urgency=low
+
+ * New upstream checkout.
+ * Move lintian overides from cluster-glue to libcluster-glue.
+
+ -- Frederik Schüler <fs at debian.org> Fri, 12 Mar 2010 12:36:56 +0100
+
+cluster-glue (1.0.3+hg2337-2) unstable; urgency=low
+
+ * Add libcluster-glue{-dev}.install files, and actually install libraries.
+
+ -- Frederik Schüler <fs at debian.org> Tue, 09 Mar 2010 13:12:04 +0100
+
+cluster-glue (1.0.3+hg2337-1) unstable; urgency=low
+
+ [ Martin G. Loschwitz ]
+ * Replaced the copyright-file with the one updated by Ante Karamatic
+ * Split cluster-glue into libcluster-glue{-dev} and cluster-glue{-dev}
+
+ -- Martin Loschwitz <madkiss at debian.org> Wed, 02 Mar 2010 13:02:00 +0100
+
+cluster-glue (1.0.3-2) UNRELEASED; urgency=low
+
+ [ Simon Horman ]
+ * Do not do a binary-indep build as there is nothing to do.
+ * Build-Depend on libsensors4-dev | libsensors-dev.
+
+ [ Frederik Schüler ]
+ * Bump standards to version 3.8.4, no changes needed.
+ * Switch to source version 3.0 "quilt".
+ * Switch to debian compatibility level 7.
+ * Drop dpatch.
+ * Add misc-depends to cluster-glue-dev.
+ * Add linian overrides.
+ * Remove rpath from ipmilan.so.
+
+ -- Frederik Schüler <fs at debian.org> Fri, 26 Feb 2010 19:39:13 +0100
+
+cluster-glue (1.0.3-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Martin Loschwitz <madkiss at debian.org> Wed, 03 Feb 2010 08:05:00 +0100
+
+cluster-glue (1.0.2~rc2b+hg20100127-0test1) unstable; urgency=low
+
+ * New build of the Debian version of this package, incorporating many
+ changes done by Ante Karamatic (thank you very much!)
+ * New upstream checkout
+
+ -- Martin Loschwitz <madkiss at debian.org> Wed, 26 Jan 2010 12:58:00 +0200
+
+cluster-glue (1.0.2~rc2a-0ubuntu0ppa2) lucid; urgency=low
+
+ * Addes docbook-xsl to build-depends
+ * debian/patches/01_stylesheet_path.dpatch:
+ - use local docbook
+
+ -- Ante Karamatic <ivoks at ubuntu.com> Mon, 04 Jan 2010 15:18:40 +0000
+
+cluster-glue (1.0.2~rc2a-0ubuntu0ppa1) lucid; urgency=low
+
+ * New upstream checkout
+ * Added xsltproc to build-depends; needed for rebuilding of man pages
+ * Modified paths in cluster-glue.install and cluster-glue-dev.install
+
+ -- Ante Karamatic <ivoks at ubuntu.com> Sun, 03 Jan 2010 09:38:25 +0000
+
+cluster-glue (1.0+hg20091102-1~bpo50+1) lenny-backports; urgency=low
+
+ * Rebuild for lenny-backports.
+
+ -- Martin Loschwitz <madkiss at debian.org> Mon, 02 Nov 2009 15:02:29 +0000
+
+cluster-glue (1.0+hg20091102-1) unstable; urgency=low
+
+ * New upstream checkout
+
+ -- Martin Loschwitz <madkiss at debian.org> Mon, 02 Nov 2009 00:00:00 +0100
+
+cluster-glue (1.0+hg20091012-1) unstable; urgency=low
+
+ * New upstream checkout
+ * Adopting numerous changes from HG
+
+ -- Martin Loschwitz <madkiss at debian.org> Mon, 12 Oct 2009 16:14:00 +0200
+
+cluster-glue (1.0+hg20090915-1) unstable; urgency=low
+
+ * Initial release of packages for the cluster-glue-framework
+
+ -- Martin Loschwitz <madkiss at debian.org> Tue, 15 Sep 2009 09:56:16 +0000
diff --cc debian/control
index e9a7963,0000000..6e60a13
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,52 -1,0 +1,53 @@@
+Source: cluster-glue
+Section: admin
+Priority: optional
+Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
+Uploaders: Martin Loschwitz <madkiss at debian.org>, Anibal Monsalve Salazar <anibal at debian.org>, Simon Horman <horms at debian.org>, Frederik Schüler <fs at debian.org>
- Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltpro [...]
- Standards-Version: 3.8.4
++Build-Depends: debhelper (>= 7), libsnmp-dev, libglib2.0-dev, perl, net-tools, iputils-ping, python, psmisc, libnet1-dev, iproute, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libsensors4-dev | libsensors-dev, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev, libopenipmi-dev, autoconf, automake, libtool, xsltpro [...]
++Standards-Version: 3.9.0
+Homepage: http://hg.linux-ha.org/glue/
++Vcs-Hg: http://hg.debian.org/hg/debian-ha/cluster-glue
++Vcs-Browser: http://hg.debian.org/hg/debian-ha/cluster-glue
+XS-Python-Version: current
+
+Package: libcluster-glue
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: cluster-glue (<= 1.0.3-2), heartbeat (<= 2.99.2+sles11r9-5)
+Conflicts: cluster-glue (<= 1.0.3-2), heartbeat (<= 2.99.2+sles11r9-5)
+Description: The reusable cluster components for Linux HA (libraries)
+ This package contains the libraries provided by the cluster
+ glue component by the Linux-HA project; it offers various
+ re-usable cluster stack libraries. If you plan to run the
+ Linux-HA cluster stack, you will need this package.
+
+Package: libcluster-glue-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcluster-glue (= ${binary:Version})
+Replaces: cluster-glue-dev (<= 1.0.3-2)
+Conflicts: cluster-glue-dev (<= 1.0.3-2)
+Description: The reusable cluster components for Linux HA (library dev files)
+ This package contains the headers for the libraries provided
+ by the cluster glue component by the Linux-HA project; it
+ offers various re-usable cluster stack libraries. If you plan
+ to run the Linux-HA cluster stack, you will need this package.
+
+Package: cluster-glue
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, python, libtimedate-perl
+Replaces: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
+Conflicts: heartbeat (<= 2.99.2+sles11r9-5), heartbeat-common (<= 2.99.2+sles11r9-5), libheartbeat2 (<= 2.99.2+sles11r9-5)
+Description: The reusable cluster components for Linux HA
- This package contains various reusable cluster components from
- the Linux HA project. Originally belonging to Heartbeat, they
- can and sometimes must be used with OpenAIS driven clusters as
- well.
++ This package contains node fencing plugins, an error reporting
++ utility, and other reusable cluster components from
++ the Linux HA project.
+
+Package: cluster-glue-dev
+Architecture: any
+Depends: cluster-glue (= ${binary:Version}), ${misc:Depends}
+Replaces: libheartbeat2-dev (<= 2.99.2+sles11r9-5), heartbeat-dev (<= 2.99.2+sles11r9-5)
+Conflicts: libheartbeat2-dev (<= 2.99.2+sles11r9-5), heartbeat-dev (<= 2.99.2+sles11r9-5)
+Description: Development files for the cluster glue components
+ This package includes headers and static libraries for the glue
+ cluster components.
diff --cc debian/copyright
index d469906,0000000..4ff1868
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,92 -1,0 +1,118 @@@
+This package was first debianized by Paolo Molaro <lupus at debian.org> on
+Wed, 17 Nov 1999 17:30:23 +0100.
+
+The original sources can be found at:
+ http://linux-ha.org/wiki/Download
+
+Upstream Authors (from AUTHORS) and copyright holders: (c) 1998-2010
+
+ Alan Robertson <alanr at unix.sh>
+ Andreas Mock <andreas.mock at web.de>
+ Andrew Beekhof <andrew at beekhof.net>
+ Dave Blaschke <debltc at us.ibm.com>
+ David Lee <t.d.lee at durham.ac.uk>
+ Dejan Muhamedagic <dejan at hello-penguin.com>
+ Hannes Eder <heder at google.com>
+ Huang Zhen <zhenhltc at cn.ibm.com>
+ Junko Ikeda <ikedaj at intellilink.co.jp>
+ Lars Marowsky-Bree <lmb at suse.de>
+ Martin Bene <martin.bene at icomedias.com>
+ Phil Carns <carns at mcs.anl.gov>
+ Satomi Taniguchi <taniguchis at intellilink.co.jp>
+ Sean Reifschneider <jafo at tummy.com>
+ Sebastian Reitenbach <itlistuser at rapideye.de>
+ Serge Dubrouski <sergeyfd at gmail.com>
+ Simon Horman <horms at verge.net.au>
+ Xinwei Hu <hxinwei at gmail.com>
+
+Code for the following pieces borrowed from code by:
+ Tom Vogt <tom at lemuria.org> (udp code)
+ yuri volobuev <volobuev at t1.chem.umn.edu> (send_arp.c)
+ 'Network UPS Tools' by Russell Kroll <rkroll at exploits.org>
+ homepage: http://www.exploits.org/nut/
+ (Andreas Piesk borrowed code for APCSmart support)
+ David C. Teigland <teigland at sistina.com>
+ wrote original meatware support for GFS stomith
+ salz at pebbles.bbn.com - replacement scandir function
+ Internet Software Consortium (bind) - replacement inet_pton()
+ function
+ Matt Soffen <matt at soffen.com> (replace/alphasort.c,
+ replace/daemon.c)
+
+NOTE: The work of everyone on this project is dearly appreciated. If you
+ are not listed here but should be, please notify us!
+
+Although upstream claims differently, the contents of this package do
+not fall under one common license.
+
+=====================================================================
+
+The following components of this package are licensed under the GNU
+Lesser General Public License 2.1 (LGPL):
+
+include/clplumbing/Gmain_timeout.h, include/clplumbing/apphb_cs.h,
+include/clplumbing/coredumps.h, include/clplumbing/netstring.h,
+include/ha_msg.h, include/lha_internal.h, include/pils/generic.h,
+include/pils/interface.h, include/pils/plugin.h.in,
+lib/clplumbing/cl_malloc.c, lib/clplumbing/cl_msg.c,
+lib/clplumbing/cl_msg_types.c, lib/clplumbing/cl_poll.c,
+lib/clplumbing/coredumps.c, lib/clplumbing/cpulimits.c,
+lib/pils/main.c, lib/pils/pils.c, lib/pils/test.c,
+replace/NoSuchFunctionName.c, replace/setenv.c,
+replace/strerror.c, replace/strlcat.c, replace/strlcpy.c,
+replace/strndup.c, replace/strnlen.c, replace/unsetenv.c
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+=====================================================================
+
+The following component of this package are licensed under the terms
+of the BSD license:
+
+replace/daemon.c
+replace/alphasort.c
+
- On Debian systems, the complete text of the BSD license can be
- found in `/usr/share/common-licenses/BSD'.
++The BSD license is as follows.
++
++Copyright (c) The Regents of the University of California.
++All rights reserved.
++
++Redistribution and use in source and binary forms, with or without
++modification, are permitted provided that the following conditions
++are met:
++1. Redistributions of source code must retain the above copyright
++ notice, this list of conditions and the following disclaimer.
++2. Redistributions in binary form must reproduce the above copyright
++ notice, this list of conditions and the following disclaimer in the
++ documentation and/or other materials provided with the distribution.
++3. Neither the name of the University nor the names of its contributors
++ may be used to endorse or promote products derived from this software
++ without specific prior written permission.
++
++THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
++ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
++ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
++FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
++DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
++OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
++HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
++LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
++OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
++SUCH DAMAGE.
+
+=====================================================================
+
+The following component of this package is public domain software and
+does not fall under any license's terms:
+
+replace/scandir.c
+
+=====================================================================
+
+All other components of this package are licensed under the GNU General
+Public License in version 2.
+
+On Debian systems, the complete text of the GNU General Public License
+v2 can be found in `/usr/share/common-licenses/GPL-2'.
diff --cc debian/patches/spelling-fixes.patch
index 45ffc2a,0000000..0656fc7
mode 100644,000000..100644
--- a/debian/patches/spelling-fixes.patch
+++ b/debian/patches/spelling-fixes.patch
@@@ -1,81 -1,0 +1,91 @@@
- Description: Fix various spelling issues, as found by lintian.
- Author: Frederik Schüler <fs at debian.org>
- Last-Update: 2010-02-11
++# HG changeset patch
++# User Frederik Schüler <fs at debian.org>
++# Date 1279069917 -32400
++# Node ID a8657472ea8e352d96750d5a4a34d092ea8732e4
++# Parent 1c54d28956470b6c84a13e2daf4ba5b2cfc3b812
++low: Fix various spelling issues, as found by lintian
+
- --- cluster-glue-1.0.3.orig/lib/lrm/clientlib.c
- +++ cluster-glue-1.0.3/lib/lrm/clientlib.c
- @@ -1593,11 +1593,11 @@ execra_code2string(uniform_ret_execra_t
++Signed-off-by: Simon Horman <horms at verge.net.au>
++
++diff -r 1c54d2895647 -r a8657472ea8e lib/clplumbing/ipctransientclient.c
++--- a/lib/clplumbing/ipctransientclient.c Fri Jul 09 18:49:03 2010 +0200
+++++ b/lib/clplumbing/ipctransientclient.c Wed Jul 14 10:11:57 2010 +0900
++@@ -159,11 +159,11 @@
++
++ if(lpc < MAX_MESSAGES && strcmp(messages[lpc], buffer) != 0)
++ {
++- cl_log(LOG_ERR, "[Client] Recieved someone else's message [%s] instead of [%s]", buffer, messages[lpc]);
+++ cl_log(LOG_ERR, "[Client] Received someone else's message [%s] instead of [%s]", buffer, messages[lpc]);
++ }
++ else if(lpc >= MAX_MESSAGES)
++ {
++- cl_log(LOG_ERR, "[Client] Recieved an extra message [%s]", buffer);
+++ cl_log(LOG_ERR, "[Client] Receivedan extra message [%s]", buffer);
++ }
++
++ lpc++;
++diff -r 1c54d2895647 -r a8657472ea8e lib/lrm/clientlib.c
++--- a/lib/lrm/clientlib.c Fri Jul 09 18:49:03 2010 +0200
+++++ b/lib/lrm/clientlib.c Wed Jul 14 10:11:57 2010 +0900
++@@ -1597,11 +1597,11 @@
+ case EXECRA_FAILED_MASTER:
+ return "master (failed)";
+ case EXECRA_RA_DEAMON_DEAD1:
+- return "status: deamon dead";
++ return "status: daemon dead";
+ case EXECRA_RA_DEAMON_DEAD2:
+- return "status: deamon dead";
++ return "status: daemon dead";
+ case EXECRA_RA_DEAMON_STOPPED:
+- return "status: deamon stopped";
++ return "status: daemon stopped";
+ case EXECRA_STATUS_UNKNOWN:
+ return "status: unknown";
+ default:
- --- cluster-glue-1.0.3.orig/lib/clplumbing/ipctransientclient.c
- +++ cluster-glue-1.0.3/lib/clplumbing/ipctransientclient.c
- @@ -159,11 +159,11 @@ transient_client_callback(IPC_Channel* s
-
- if(lpc < MAX_MESSAGES && strcmp(messages[lpc], buffer) != 0)
- {
- - cl_log(LOG_ERR, "[Client] Recieved someone else's message [%s] instead of [%s]", buffer, messages[lpc]);
- + cl_log(LOG_ERR, "[Client] Received someone else's message [%s] instead of [%s]", buffer, messages[lpc]);
- }
- else if(lpc >= MAX_MESSAGES)
- {
- - cl_log(LOG_ERR, "[Client] Recieved an extra message [%s]", buffer);
- + cl_log(LOG_ERR, "[Client] Receivedan extra message [%s]", buffer);
- }
-
- lpc++;
- --- cluster-glue-1.0.3.orig/lrm/lrmd/lrmd.c
- +++ cluster-glue-1.0.3/lrm/lrmd/lrmd.c
- @@ -2688,7 +2688,7 @@ add_op_to_runlist(lrmd_rsc_t* rsc, lrmd_
- rsc->op_list = g_list_append(rsc->op_list, op);
- if (g_list_length(rsc->op_list) >= 4) {
- lrmd_log(LOG_WARNING
- - , "operations list for %s is suspicously"
- + , "operations list for %s is suspiciously"
- " long [%d]"
- , rsc->id
- , g_list_length(rsc->op_list));
- --- cluster-glue-1.0.3.orig/lrm/admin/lrmadmin.c
- +++ cluster-glue-1.0.3/lrm/admin/lrmadmin.c
- @@ -139,7 +139,7 @@ static int call_id = 0;
++diff -r 1c54d2895647 -r a8657472ea8e lrm/admin/lrmadmin.c
++--- a/lrm/admin/lrmadmin.c Fri Jul 09 18:49:03 2010 +0200
+++++ b/lrm/admin/lrmadmin.c Wed Jul 14 10:11:57 2010 +0900
++@@ -140,7 +140,7 @@
+ static int TIMEOUT = -1; /* the unit is ms */
+
+ static const char *simple_help_screen =
- -"lrmadmin {-d|--deamon}\n"
- +"lrmadmin {-d|--daemon}\n"
- " {-A|--add} <rscid> <raclass> <ratype> <provider|NULL> [<rsc_params_list>]\n"
- " {-D|--delete} <rscid>\n"
- " {-F|--flush} <rscid>\n"
- --- cluster-glue-1.0.3.orig/lrm/admin/lrmadmin.txt
- +++ cluster-glue-1.0.3/lrm/admin/lrmadmin.txt
- @@ -4,7 +4,7 @@ NAME
++-"lrmadmin -d,--deamon\n"
+++"lrmadmin -d,--daemon\n"
++ " -A,--add <rscid> <raclass> <ratype> <provider|NULL> [<rsc_params_list>]\n"
++ " -D,--delete <rscid>\n"
++ " -F,--flush <rscid>\n"
++diff -r 1c54d2895647 -r a8657472ea8e lrm/admin/lrmadmin.txt
++--- a/lrm/admin/lrmadmin.txt Fri Jul 09 18:49:03 2010 +0200
+++++ b/lrm/admin/lrmadmin.txt Wed Jul 14 10:11:57 2010 +0900
++@@ -4,7 +4,7 @@
+ lrmadmin - Local Resource Manager Commander-line Daministrator Tools
+
+ SYNOPSIS
+-lrmadmin {-d|--deamon}
++lrmadmin {-d|--daemon}
+ {-A|--add} <rscid> <rsc_class> <rsc_type> [<rsc_params_list>]
+ {-D|--delete} <rscid>
+ {-F|--flush} <rscid>
- @@ -20,8 +20,8 @@ lrmadmin {-d|--deamon}
++@@ -20,8 +20,8 @@
+
+ Detailed Explanation for Options
+
+-Lrmd deamon options
+- {-d|--deamon}
++Lrmd daemon options
++ {-d|--daemon}
+ # -s The status of lrmd: running or not running
+ # -r Reset lrmd (?)
+
++diff -r 1c54d2895647 -r a8657472ea8e lrm/lrmd/lrmd.c
++--- a/lrm/lrmd/lrmd.c Fri Jul 09 18:49:03 2010 +0200
+++++ b/lrm/lrmd/lrmd.c Wed Jul 14 10:11:57 2010 +0900
++@@ -2705,7 +2705,7 @@
++ rsc->op_list = g_list_append(rsc->op_list, op);
++ if (g_list_length(rsc->op_list) >= 4) {
++ lrmd_log(LOG_WARNING
++- , "operations list for %s is suspicously"
+++ , "operations list for %s is suspiciously"
++ " long [%d]"
++ , rsc->id
++ , g_list_length(rsc->op_list));
diff --cc debian/rules
index 02156f6,0000000..d8618a5
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,100 -1,0 +1,104 @@@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
++# enable quilt usage
++include /usr/share/quilt/quilt.make
++
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+ MAKEFLAGS += -j$(NUMJOBS)
+endif
+
+
+DTMP:=$(CURDIR)/debian/tmp
+RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }')
+UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/')
+
+
- configure: configure-stamp
++configure: patch configure-stamp
+configure-stamp:
+ dh_testdir
+ test -x ./configure || ./autogen.sh
+ ./configure --with-ocf-root=/usr/lib/ocf --with-initdir=/etc/init.d \
+ --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+ --mandir=/usr/share/man --libdir=/usr/lib \
+ --disable-fatal-warnings
+ touch configure-stamp
+
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+ $(MAKE)
+ touch $@
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure-stamp
+ touch $@
+
+clean:
+ dh_testdir
+ dh_testroot
+ [ ! -f Makefile ] || $(MAKE) clean
+ [ ! -f Makefile ] || $(MAKE) distclean
++ $(MAKE) -f debian/rules unpatch
+ dh_clean
+
+install: install-indep install-arch
+install-indep:
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_prep -s
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+ chrpath -r "" debian/tmp/usr/lib/stonith/plugins/stonith2/ipmilan.so
+ dh_install --sourcedir=$(CURDIR)/debian/tmp --list-missing
+
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs ChangeLog
+ dh_installdocs
+ dh_installman
+ dh_lintian
+ dh_installinit --name=logd -pcluster-glue -u 'defaults 20 32'
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_perl
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/cluster-glue.git
More information about the Debian-HA-Commits
mailing list