commit 2625e302a0f31105aa2b5e41cd97a13c76e8a63c Author: Michael Prokop Date: Tue Jun 21 22:07:39 2011 +0000 Provide debian/ directory of heartbeat v2 backport for squeeze. Once we have a fully working package (needs lots of testing right now) we might want to integrate full sources, but for now this is the relevant stuff to build the heartbeat-2_2.1.3-6lenny4~bpo60+1 Debian package for Debian/squeeze, using the sources retrieved via dget http://ftp.de.debian.org/debian/pool/main/h/heartbeat/heartbeat_2.1.3-6lenny4.dsc From: Michael Prokop diff --git a/debian/Makefile.am b/debian/Makefile.am new file mode 100644 index 0000000..88e7a63 --- /dev/null +++ b/debian/Makefile.am @@ -0,0 +1,43 @@ +# +# linux-ha: Linux-HA heartbeat code +# +# Copyright (C) 2001 Michael Moerz +# This instance created by Horms +# +# This program 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 program 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +MAINTAINERCLEANFILES = Makefile.in + +EXTRA_DIST = apply changelog compat control copyright \ + dpkg-checkbuild rules \ + heartbeat.dirs heartbeat.files \ + heartbeat.postinst heartbeat.postrm \ + heartbeat.preinst \ + heartbeat-dev.dirs heartbeat-dev.files \ + heartbeat-gui.dirs heartbeat-gui.files \ + heartbeat-2.prerm \ + ldirectord.files ldirectord.postinst \ + ldirectord.postrm \ + patches/ipv6-check.patch \ + patches/init-remote_fs.patch \ + patches/init-openhpid.patch \ + patches/init-ntp.patch \ + patches/series/2.1.3-1 \ + patches/series/2.1.3-2 + +clean-local: + rm -f *.substvars *.debhelper files + rm -r -f heartbeat heartbeat-dev ldirectord \ + libpils0 libpils-dev libstonith0 libstonith-dev stonith tmp diff --git a/debian/Makefile.in b/debian/Makefile.in new file mode 100644 index 0000000..f509e4f --- /dev/null +++ b/debian/Makefile.in @@ -0,0 +1,529 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +build_triplet = @build@ +host_triplet = @host@ +subdir = debian +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + $(top_srcdir)/configure.in +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/include/config.h \ + $(top_builddir)/include/hb_config.h +CONFIG_CLEAN_FILES = +SOURCES = +DIST_SOURCES = +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +ACLOCAL = @ACLOCAL@ +ALIGN = @ALIGN@ +AMTAR = @AMTAR@ +AR = @AR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CC = @CC@ +CCDEPMODE = @CCDEPMODE@ +CFLAGS = @CFLAGS@ +CIMOM = @CIMOM@ +CMPI_HEADER_PATH = @CMPI_HEADER_PATH@ +CMPI_PROVIDER_DIR = @CMPI_PROVIDER_DIR@ +CPP = @CPP@ +CPPFLAGS = @CPPFLAGS@ +CRM_DIR = @CRM_DIR@ +CRM_ENABLED = @CRM_ENABLED@ +CRYPTOLIB = @CRYPTOLIB@ +CURSESLIBS = @CURSESLIBS@ +CXX = @CXX@ +CXXCPP = @CXXCPP@ +CXXDEPMODE = @CXXDEPMODE@ +CXXFLAGS = @CXXFLAGS@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +DEPDIR = @DEPDIR@ +DISABLE_TIMES_KLUDGE = @DISABLE_TIMES_KLUDGE@ +DISTDIR = @DISTDIR@ +DISTRO_STYLE_RPMS = @DISTRO_STYLE_RPMS@ +DLOPEN_FORCE_FLAGS = @DLOPEN_FORCE_FLAGS@ +ECHO = @ECHO@ +ECHO_C = @ECHO_C@ +ECHO_CMD = @ECHO_CMD@ +ECHO_E = @ECHO_E@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +EGREP = @EGREP@ +EXEEXT = @EXEEXT@ +F77 = @F77@ +FFLAGS = @FFLAGS@ +GETENT = @GETENT@ +GLIBHEAD = @GLIBHEAD@ +GLIBLIB = @GLIBLIB@ +GNUTLSHEAD = @GNUTLSHEAD@ +GNUTLSLIBS = @GNUTLSLIBS@ +GREP = @GREP@ +GZIP_PROG = @GZIP_PROG@ +HAVE_DECL_GETOPT = @HAVE_DECL_GETOPT@ +HAVE_STRLCPY = @HAVE_STRLCPY@ +HA_APIGID = @HA_APIGID@ +HA_APIGROUP = @HA_APIGROUP@ +HA_CCMUID = @HA_CCMUID@ +HA_CCMUSER = @HA_CCMUSER@ +HA_COREDIR = @HA_COREDIR@ +HA_DATADIR = @HA_DATADIR@ +HA_HAVE_ALPHASORT = @HA_HAVE_ALPHASORT@ +HA_HAVE_DAEMON = @HA_HAVE_DAEMON@ +HA_HAVE_INET_PTON = @HA_HAVE_INET_PTON@ +HA_HAVE_SCANDIR = @HA_HAVE_SCANDIR@ +HA_HAVE_SETENV = @HA_HAVE_SETENV@ +HA_HAVE_STRERROR = @HA_HAVE_STRERROR@ +HA_HAVE_STRNDUP = @HA_HAVE_STRNDUP@ +HA_HAVE_STRNLEN = @HA_HAVE_STRNLEN@ +HA_HAVE_UNSETENV = @HA_HAVE_UNSETENV@ +HA_HAVE_UUID_PARSE = @HA_HAVE_UUID_PARSE@ +HA_HBCONF_DIR = @HA_HBCONF_DIR@ +HA_LIBDIR = @HA_LIBDIR@ +HA_LIBHBDIR = @HA_LIBHBDIR@ +HA_LOGDAEMON_IPC = @HA_LOGDAEMON_IPC@ +HA_NOARCHDATAHBDIR = @HA_NOARCHDATAHBDIR@ +HA_PLUGIN_DIR = @HA_PLUGIN_DIR@ +HA_RC_DIR = @HA_RC_DIR@ +HA_URLBASE = @HA_URLBASE@ +HA_VARLIBDIR = @HA_VARLIBDIR@ +HA_VARLIBHBDIR = @HA_VARLIBHBDIR@ +HA_VARLOCKDIR = @HA_VARLOCKDIR@ +HA_VARLOGDIR = @HA_VARLOGDIR@ +HA_VARRUNDIR = @HA_VARRUNDIR@ +HA_VARRUNHBDIR = @HA_VARRUNHBDIR@ +HA_VARRUNHBRSCDIR = @HA_VARRUNHBRSCDIR@ +HB_INITSTARTPRI = @HB_INITSTARTPRI@ +HB_INITSTOPPRI = @HB_INITSTOPPRI@ +HB_PKG = @HB_PKG@ +HB_RA_DIR = @HB_RA_DIR@ +HG = @HG@ +HTML2TXT = @HTML2TXT@ +IFCONFIG = @IFCONFIG@ +IFCONFIG_A_OPT = @IFCONFIG_A_OPT@ +INCLTDL = @INCLTDL@ +INITDIR = @INITDIR@ +INIT_EXT = @INIT_EXT@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IP2UTIL = @IP2UTIL@ +IPCSOCKET_C = @IPCSOCKET_C@ +IPCSOCKET_LO = @IPCSOCKET_LO@ +JAVA_HOME = @JAVA_HOME@ +LDFLAGS = @LDFLAGS@ +LEX = @LEX@ +LEXLIB = @LEXLIB@ +LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ +LIBADD_DL = @LIBADD_DL@ +LIBADD_INTL = @LIBADD_INTL@ +LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@ +LIBLTDL = @LIBLTDL@ +LIBLTDL_DIR = @LIBLTDL_DIR@ +LIBNETCONFIG = @LIBNETCONFIG@ +LIBNETDEFINES = @LIBNETDEFINES@ +LIBNETLIBS = @LIBNETLIBS@ +LIBOBJS = @LIBOBJS@ +LIBRT = @LIBRT@ +LIBS = @LIBS@ +LIBTOOL = @LIBTOOL@ +LN_S = @LN_S@ +LOCALE = @LOCALE@ +LRM_ENABLED = @LRM_ENABLED@ +LRM_PLUGIN_DIR = @LRM_PLUGIN_DIR@ +LSB_RA_DIR = @LSB_RA_DIR@ +LTLIBOBJS = @LTLIBOBJS@ +MAILCMD = @MAILCMD@ +MAKE = @MAKE@ +MAKEINFO = @MAKEINFO@ +MD5 = @MD5@ +MIBS_DIR = @MIBS_DIR@ +MKDIR_P = @MKDIR_P@ +MKTEMP = @MKTEMP@ +MSGFMT = @MSGFMT@ +MSGHDR_TYPE = @MSGHDR_TYPE@ +NETSTAT = @NETSTAT@ +NON_FATAL_CFLAGS = @NON_FATAL_CFLAGS@ +OBJEXT = @OBJEXT@ +OCF_RA_DIR = @OCF_RA_DIR@ +OCF_ROOT_DIR = @OCF_ROOT_DIR@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +PILSPKG = @PILSPKG@ +PING = @PING@ +PING_TIMEOUT_OPT = @PING_TIMEOUT_OPT@ +PKGCONFIG = @PKGCONFIG@ +PKGNAME = @PKGNAME@ +POD2MAN = @POD2MAN@ +POWEROFF_CMD = @POWEROFF_CMD@ +POWEROFF_OPTIONS = @POWEROFF_OPTIONS@ +PRETTY_CC = @PRETTY_CC@ +PROCROUTE = @PROCROUTE@ +PYTHON = @PYTHON@ +PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@ +PYTHON_INCLUDES = @PYTHON_INCLUDES@ +PYTHON_PLATFORM = @PYTHON_PLATFORM@ +PYTHON_PREFIX = @PYTHON_PREFIX@ +PYTHON_VERSION = @PYTHON_VERSION@ +QUIET_LIBTOOL_OPTS = @QUIET_LIBTOOL_OPTS@ +QUIET_MAKE_OPTS = @QUIET_MAKE_OPTS@ +QUORUMD_ENABLED = @QUORUMD_ENABLED@ +RANLIB = @RANLIB@ +REBOOT = @REBOOT@ +REBOOT_OPTIONS = @REBOOT_OPTIONS@ +ROUTE = @ROUTE@ +ROUTEPARM = @ROUTEPARM@ +RPM = @RPM@ +RPMREL = @RPMREL@ +RPMTARGET = @RPMTARGET@ +RPM_ENABLE_MGMT_CONFIG = @RPM_ENABLE_MGMT_CONFIG@ +RPM_ENABLE_OPENHPI = @RPM_ENABLE_OPENHPI@ +RPM_ENABLE_SNMP_SUBAGENT = @RPM_ENABLE_SNMP_SUBAGENT@ +SCP = @SCP@ +SED = @SED@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +SNMPAGENTLIB = @SNMPAGENTLIB@ +SNMPCONFIG = @SNMPCONFIG@ +SNMPLIB = @SNMPLIB@ +SNMP_RPM_BUILD_REQUIRES = @SNMP_RPM_BUILD_REQUIRES@ +SSH = @SSH@ +STONITHPKG = @STONITHPKG@ +STONITH_RA_DIR = @STONITH_RA_DIR@ +STRIP = @STRIP@ +SWIG = @SWIG@ +TAR = @TAR@ +TARFILE = @TARFILE@ +TEST = @TEST@ +TIPC_INCLUDE = @TIPC_INCLUDE@ +TSA_DIR = @TSA_DIR@ +UCDSNMPDEVEL = @UCDSNMPDEVEL@ +USE_MODULES = @USE_MODULES@ +VALGRIND_BIN = @VALGRIND_BIN@ +VERSION = @VERSION@ +WHOAMI = @WHOAMI@ +XML2CONFIG = @XML2CONFIG@ +XPERIMENTALDIRS = @XPERIMENTALDIRS@ +YACC = @YACC@ +YFLAGS = @YFLAGS@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +ac_configure_args = @ac_configure_args@ +ac_ct_CC = @ac_ct_CC@ +ac_ct_CXX = @ac_ct_CXX@ +ac_ct_F77 = @ac_ct_F77@ +am__include = @am__include@ +am__leading_dot = @am__leading_dot@ +am__quote = @am__quote@ +am__tar = @am__tar@ +am__untar = @am__untar@ +base_includedir = @base_includedir@ +bindir = @bindir@ +build = @build@ +build_alias = @build_alias@ +build_cpu = @build_cpu@ +build_os = @build_os@ +build_vendor = @build_vendor@ +builddir = @builddir@ +cleaned_configure_args = @cleaned_configure_args@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +hb_libdir = @hb_libdir@ +host = @host@ +host_alias = @host_alias@ +host_cpu = @host_cpu@ +host_os = @host_os@ +host_vendor = @host_vendor@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +pils_includedir = @pils_includedir@ +pils_plugindir = @pils_plugindir@ +pkgpyexecdir = @pkgpyexecdir@ +pkgpythondir = @pkgpythondir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +pyexecdir = @pyexecdir@ +pythondir = @pythondir@ +saf_includedir = @saf_includedir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +stonith_ext_plugindir = @stonith_ext_plugindir@ +stonith_includedir = @stonith_includedir@ +stonith_plugindir = @stonith_plugindir@ +subdirs = @subdirs@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ + +# +# linux-ha: Linux-HA heartbeat code +# +# Copyright (C) 2001 Michael Moerz +# This instance created by Horms +# +# This program 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 program 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, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +MAINTAINERCLEANFILES = Makefile.in +EXTRA_DIST = apply changelog compat control copyright \ + dpkg-checkbuild rules \ + heartbeat.dirs heartbeat.files \ + heartbeat.postinst heartbeat.postrm \ + heartbeat.preinst \ + heartbeat-dev.dirs heartbeat-dev.files \ + heartbeat-gui.dirs heartbeat-gui.files \ + heartbeat-2.prerm \ + ldirectord.files ldirectord.postinst \ + ldirectord.postrm \ + patches/ipv6-check.patch \ + patches/init-remote_fs.patch \ + patches/init-openhpid.patch \ + patches/init-ntp.patch \ + patches/series/2.1.3-1 \ + patches/series/2.1.3-2 + +all: all-am + +.SUFFIXES: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu debian/Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu debian/Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs +tags: TAGS +TAGS: + +ctags: CTAGS +CTAGS: + + +distdir: $(DISTFILES) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-am +all-am: Makefile +installdirs: +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) +clean: clean-am + +clean-am: clean-generic clean-libtool clean-local mostlyclean-am + +distclean: distclean-am + -rm -f Makefile +distclean-am: clean-am distclean-generic + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic mostlyclean-libtool + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: + +.MAKE: install-am install-strip + +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-local distclean distclean-generic distclean-libtool \ + distdir dvi dvi-am html html-am info info-am install \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + uninstall uninstall-am + + +clean-local: + rm -f *.substvars *.debhelper files + rm -r -f heartbeat heartbeat-dev ldirectord \ + libpils0 libpils-dev libstonith0 libstonith-dev stonith tmp +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/debian/apply b/debian/apply new file mode 100644 index 0000000..d4113f0 --- /dev/null +++ b/debian/apply @@ -0,0 +1,250 @@ +#!/bin/sh +# Apply script for managing patches for debian builts +# Taken from debian kernel-source-2.4.27 package +# Original Author: Herbert Xu + +set -e + +length=50 + +die() { + echo "E: $@" >&2 + exit 1 +} + +warn() { + echo "W: $@" >&2 +} + +uncompress_patch() { + patch=$1 + case "$patch" in + *.bz2) bzcat $patch ;; + *.gz) zcat $patch ;; + *) cat $patch ;; + esac +} + +find_patch() { + patch=$1 + + if [ -f "$patch" ]; then + echo "$patch" + elif [ -f "$patch.bz2" ]; then + echo "$patch.bz2" + elif [ -f "$patch.gz" ]; then + echo "$patch.gz" + else + die "$patch is in the series, but doesn't exist!" + fi +} + +apply_patch() { + patch=$(find_patch $home/$1) + base=$1 + if uncompress_patch "$patch" | patch -p1 -s -t --no-backup-if-mismatch; then + printf "%-${length}s\tOK (+)\n" "$base" + else + printf "%-${length}s\tFAIL (+)\n" "$base" + exit 1 + fi +} + +deapply_patch() { + patch=$(find_patch $home/$1) + base=$1 + if uncompress_patch "$patch" | patch -p1 -s -t -R --no-backup-if-mismatch; then + printf "%-${length}s\tOK (-)\n" "$base" + else + printf "%-${length}s\tFAIL (-)\n" "$base" + exit 1 + fi +} + +unpatch_series() { + series=$1 + [ -f "$series" ] || die "I wasn't passed a series!" + + tac $series | while read action patch; do + case "$action" in + +) deapply_patch $patch ;; + -) apply_patch $patch ;; + X) + bakfile="$(dirname $patch)/.$(basename $patch).bak" + if [ -f "$bakfile" ]; then + mv -f "$bakfile" "$patch" + printf "%-${length}s\tRESTORED (X)\n" "$patch" + else + printf "%-${length}s\tNO BACKUP (X)\n" "$patch" + fi + ;; + esac + done + echo "--> $(basename $series) fully unapplied." +} + +patch_series() { + series=$1 + [ -f "$series" ] || die "I wasn't passed a series!" + + while read action patch; do + case "$action" in + +) apply_patch $patch ;; + -) deapply_patch $patch ;; + X) + bakfile="$(dirname $patch)/.$(basename $patch).bak" + if [ -f "$patch" ]; then + mv -f "$patch" "$bakfile" + printf "%-${length}s\tREMOVED (X)\n" "$patch" + else + printf "%-${length}s\tNO FILE (X)\n" "$patch" + fi + ;; + esac + done < $series + echo "--> $(basename $series) fully applied." +} + +bubble_sort () +{ + DIR=$1 + shift + SORTED=$@ + + SWAPED=1 + while [ $SWAPED = 1 ]; do + X=0 + A="" + SWAPED=0 + NEW="" + for i in $SORTED; do + if [ -z "$A" ]; then + A="$i" + continue + fi + B="$i" + + if dpkg --compare-versions "$A" "$DIR" "$B"; then + SWAPED=1 + NEW="$NEW $B" + else + NEW="$NEW $A" + A="$B" + fi + + X=$(($X + 1)) + done + SORTED="$NEW $A" + done + + echo $SORTED +} + +bubble_sort_fwd () +{ + bubble_sort "lt" $@ +} + +bubble_sort_rev () +{ + bubble_sort "gt" $@ +} + + +if ! [ -d heartbeat ]; then + die 'Not in heartbeat top level directory. Exiting' + exit 1 +fi + +# for THIS particular version of the source package +#deb_version=$(sed -ne "/^heartbeat/ { s/.*(\([^)]*\)).*/\1/ p" -e "q}" \ +# ${PWD}/debian/changelog) +deb_version=$(dpkg-parsechangelog | awk '/^Version: / { print $2 }') +version=${override_version:-$deb_version} +upstream=${version%-*} +revision=${version#*-} + +home="$PWD/debian/patches" + + +if [ -f version.Debian ]; then + current=$(cat version.Debian) + current_rev=${current#*-} + current_up=${current%-*} + + if [ "$current" = "$upstream" ]; then + current_rev=0 + fi +else + warn "No version.Debian file, assuming pristine heartbeat $upstream" + current=$upstream + current_rev=0 +fi + +target=${1:-$version} + +target_rev=${target#*-} +target_up=${target%-*} + +# Sanity checks +if [ "$target_up" != "$upstream" ]; then + die "Upstream $target_up doesn't match $upstream!" +# We don't have that version out yet! +elif [ ! -n "$target_rev" ] || ( [ "$target_rev" != "$target" ] && dpkg --compare-versions $target_rev gt $revision ); then + year=$(($(date +%Y) + 1)) + die "Can't patch to nonexistent revision $target_rev (wait until $year)" +fi + +# At this point, we must handle three cases. +# 1. $target_rev is greater than $current_rev. We must patch forward for this. +# 2. $target_rev is less than $current_rev. We must reverse the list of series, +# reverse each used series (tac) and unapply applied patches and vice versa. +# 3. $target_rev is undefined, and $target is $upstream. + +# Revert to upstream. +if [ "$target_rev" = "$target" ]; then + # already reverted + if [ "$current" = "$target" ]; then + echo "Nothing to do, exiting." + exit 0 + fi + + for base in $(cd $home/series/ && bubble_sort_fwd $(ls -d *-*)); do + srev=${base#*-} + if [ -n "$srev" ]; then + if dpkg --compare-versions $srev le $current_rev; then + unpatch_series $home/series/$base + fi + else + die "Series doesn't have a revision!" + fi + done +elif [ "$current_rev" = "$upstream" ] || dpkg --compare-versions $target_rev gt $current_rev; then + for base in $(cd $home/series/ && bubble_sort_rev $(ls -d *-*)); do + srev=${base#*-} + if [ -n "$srev" ]; then + if dpkg --compare-versions $srev gt $current_rev && dpkg --compare-versions $srev le $target_rev; then + patch_series $home/series/$base + fi + else + die "Series doesn't have a revision!" + fi + done +elif [ $target_rev = $current_rev ]; then + echo "Nothing to do, exiting." + exit 0 +elif dpkg --compare-versions $target_rev lt $current_rev; then + for base in $(cd $home/series/ && bubble_sort_fwd $(ls -d *-*)); do + srev=${base#*-} + if [ -n "$srev" ]; then + # gt because you don't want to unapply the target series + if dpkg --compare-versions $srev le $current_rev && dpkg --compare-versions $srev gt $target_rev; then + unpatch_series $home/series/$base + fi + else + die "Series doesn't have a revision!" + fi + done +fi + +echo $target > version.Debian diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9093a08 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,1256 @@ +heartbeat-2 (2.1.3-6lenny4~bpo60+1) squeeze-backports; urgency=low + + * Rebuild for squeeze-backports. + * Replace build-depends on libsensors-dev with libsensors4-dev. + * Adjust file path (/usr/lib) in Debian package for 64bit + version (/usr/lib64). + * Rename package to heartbeat-2 to avoid conflicts with version + in squeeze. + + -- Michael Prokop Tue, 21 Jun 2011 23:21:44 +0200 + +heartbeat (2.1.3-6lenny4) stable-proposed-updates; urgency=low + + * Allow for a clean upgrade from etch to lenny. + This follows section 7.6.2 of the Debian Policy Manual, + which seems relevant. + - Add the following to heartbeat: + Provides: libstonith0, libpils0 + Conflicts: libstonith0, libpils0 + Replaces: libstonith0, libpils0 + - Add the following to heartbeat-dev: + Provides: libstonith-dev, libpils-dev + Conflicts: libstonith-dev, libpils-dev + Replaces: libstonith-dev, libpils-dev + (closes: #526085) + + -- Simon Horman Thu, 30 Apr 2009 11:07:27 +1000 + +heartbeat (2.1.3-6lenny3) stable-proposed-updates; urgency=low + + * Fix syntax error in o2cb which prevented it from working + Upstream-status: o2cb has been removed from upstream + (closes: #521394) + + -- Simon Horman Tue, 14 Apr 2009 18:55:26 +1000 + +heartbeat (2.1.3-6lenny2) stable-proposed-updates; urgency=low + + * IPv6addr: Fix handling of /64 prefixes + Upstream-Status: commit 6d5f0f600c0b2147490af0c5e592fc995336902a + "IPv6addr fails on /64 prefixes" + (closes: #515662) + + -- Simon Horman Fri, 20 Feb 2009 02:34:29 +0000 + +heartbeat (2.1.3-6lenny1) stable-proposed-updates; urgency=low + + * dopd: fix basic failover; fix hb message corruption by fprintf(stderr) + Patch: fix-basic-failover-fix-hb-message-corruption-by-fprintf.patch + Upstream-Status: commit 47f60bebe7b25abd88ea7b5488e66dfe187416ae + "dopd: fix basic failover; fix hb message corruption by + fprintf(stderr)" + (closes: #486071) + + -- Simon Horman Mon, 16 Feb 2009 02:54:43 +0000 + +heartbeat (2.1.3-6lenny0) testing-proposed-updates; urgency=low + + * heartbeat-gui dependancy on python-xml + (closes: #496951) + + * heartbeat-gui dependancy on uuid-runtime + (closes: #512403) + + * heartbeat dependancy on mawk + + With this change heartbeat now depends on both gawk and mawk. + Clearly there is roome for improvment here. I will try and + get things cleaned-up in upstream and unstable. + + (closes: #512403) + + -- Simon Horman Thu, 22 Jan 2009 03:37:43 +0000 + +heartbeat (2.1.3-6) unstable; urgency=low + + * Run confgure before clean in debian/rules to handle the + bizzare case where targets exist but Makefiles don't - + This is actually the case in 2.1.3-5, I'm not sure when or + how this occured. + + Thanks to Andrew Suffield for pointing this out + + (closes: #476700) + + * Recompile using a version of debhelper that doesn't feature + a bug whereby manpages aren't compressed. + + (closes: #475667) + + -- Simon Horman Wed, 23 Apr 2008 05:18:45 +0000 + +heartbeat (2.1.3-5) unstable; urgency=high + + * ldirectord: Define $rows in check_sql() + Upstream-Status: commit 600697207ff573913787d78ee56a1c6e458f08eb + Patch: ldirectord-rows.patch + (closes: #472663) + + -- Simon Horman Wed, 26 Mar 2008 11:52:35 +0900 + +heartbeat (2.1.3-4) unstable; urgency=low + + * Add LSB tags to ldirectord init script + Upstream-Status: commit 34212491d1e069d99c0339e0479145af5d480711 + Patch: ldirectord-init-lsb.patch + (closes: #469764) + + -- Simon Horman Fri, 07 Mar 2008 10:52:51 +0900 + +heartbeat (2.1.3-3) unstable; urgency=low + + * Updated syslog related recommends + ldirectord: from: sysklogd | syslog-ng + to: rsyslog | system-log-daemon + (closes: #464011) + heartbeat: from: sysklogd | syslog-ng | system-log-daemon + to: rsyslog | system-log-daemon + * Remove bashisms in ocf-tester, hb_report and heartbeat's init script + Upstream-Status: commit 2b3a34dc4257b65761f1ba021623d59f15944ae5 + (closes: #464985) + * ldirectord: allow sql select checks to work + Thanks to Geoff Harrison + Upstream-Staus: commit eaa43842608caf75552e9f755c91e35b7a2ff6d1 + Patch: bashisms.patch + * ldirectord: clear memory config on reload + Thanks to Geoff Harrison + Upstream-Status: c01c9790d2b83f493a4aa5f86e1a5b1233d7daa2 + Patch: ldirectord-clear-config-in-memory-on-reload.patch + * lrm: Don't list complted opperations as failed + Linux Foundation Bug #1822 + http://developerbugs.linux-foundation.org/show_bug.cgi?id=1833 + Upstream-Status: Pending + Patch: lrm-dont-revise-op_status.patch + + -- Simon Horman Mon, 18 Feb 2008 12:37:47 +0900 + +heartbeat (2.1.3-2) unstable; urgency=low + + * Update standards version from 3.7.2 to 3.7.3 + * Add should-start/stop $remote_fs to init script (closes: #459497) + * Add should-start/stop openhpid to init scrpt (see: #459497) + * Remove should-stop ntp to init script (see: #459497) + * Rebase tree against tarball - its almost as if the 2.1.3-1 upload + was based on another tree + - Update + + /usr/lib/libpe_rules.so.1.0.0 to libpe_rules.so.2.0.0 + + /usr/lib/libpe_status.so.1.0.0 to libpe_status.so.2.0.0 + - Move + + /usr/lib/heartbeat/ha_logd.cf to /usr/share/doc/heartbeat/logd.cf + - Add + + /usr/lib/heartbeat/utillib.sh + + /usr/lib/ocf/resource.d/heartbeat/iscsi + + /usr/lib/stonith/plugins/external/ibmrsa-telnet + + /usr/lib/stonith/plugins/external/ipmi + + /usr/include/clplumbing/cl_reboot.h + + /usr/share/heartbeat/utillib.sh + + /usr/share/doc/heartbeat/hb_report.html + + /usr/share/doc/heartbeat/hb_report.txt + + /usr/sbin/hb_report + + /usr/sbin/ciblint + - A host of other changes as per the 2.1.3 changelog + * Add SphinxSearchDaemon OCF resource that was missing from the distribution + + * Build notes: + - Unpacked tarball from linux-ha.org + - Applied changes detaile above + - Applied debian patches: ./debian/rules patch + - Affected changes to configure.in + + Backed up libltdl.tar, haclient.zh_CN.mo + + Ran ./ConfigureMe bootstrap to effect changes to configure.in + + Removed symlinks created by ./ConfigureMe: + - autoconf, automake, autoheader + + Restored libltdl.tar, haclient.zh_CN.mo + - Built package + + -- Simon Horman Tue, 08 Jan 2008 11:58:03 +0900 + +heartbeat (2.1.3-1) unstable; urgency=low + + * New Upstream (closes: #457577) + * Add Debian patches that were missing in the tarball + * Add dependacy on to heartbeat gawk as it is required by + the OCF IPaddr resource (closes: #447932) + * Updated check to enable build of IPv6Addr + - hopefully this one can be merged upstream + - The old check was applied to configure.in but configure had not been + updated + (closes: #455255) + * Add a prerm to heartbeat-2 to remove stale .pyc files (closes: #455050) + * Add dependancy on libxml2-utils to hartbeat as the BasicSanityCheck + needs xmllint + * Use -common files in hbmgmtd's pam file (closes: #444371) + - Add dependancy on libpam-runtime (>= 0.76-14) to heartbeat to ensure + that common-* files exist + * Don't include .pyc and .pyo files in heartbeat package + - As per section 2.6 of the Debian Python Policy + * Add tomcat OCF module + + * Build notes: + - Unpacked tarball from linux-ha.org + - Applied changes detaile above + - Applied debian patches: ./debian/rules patch + - Affected changes to configure.in + + Backed up libltdl.tar, haclient.zh_CN.mo + + Ran ./ConfigureMe bootstrap to effect changes to configure.in + + Removed symlinks created by ./ConfigureMe: + - autoconf, automake, autoheader + + Restored libltdl.tar, haclient.zh_CN.mo + - Built package + + -- Simon Horman Wed, 26 Dec 2007 11:07:17 +0900 + +heartbeat (2.1.2+hg.11310.702e4f418ca8-2) unstable; urgency=low + + * Add patches in debian/patches/ which went missing in action somewhere + + -- Simon Horman Sat, 29 Sep 2007 11:16:33 +0900 + +heartbeat (2.1.2+hg.11310.702e4f418ca8-1) unstable; urgency=low + + * New Upstream: + - Snapshot of: http://hg.linux-ha.org/dev/shortlog/702e4f418ca8 + - See: http://www.gossamer-threads.com/lists/linuxha/users/42476 + - Dowloaded: http://hg.linux-ha.org/dev/archive/obs-2.1.2-4.tar.bz2 + - Ran ./ConfigureMe configure && make dist + - Used resulting tarball as orig.tar.gz for this release + - The downloaded STABLE-2.1.0.tar.bz2 could not be used as + bootstraping it to the point where the code could be built + resulted in changes that could not be represented in the diff.gz + - Added the contents of lrm/test/testcases/ from obs-2.1.2-4.tar.bz2. + These was not included in the tarball due to an error + in the Makefile.am in that directory which has subsequently + been fixed by http://hg.linux-ha.org/dev/shortlog/b0b696766097 + - Added the files in lrm/test/ from obs-2.1.2-4.tar.bz2. + These was not included in the tarball due to an error + in the Makefile.am in that directory which has subsequently + been fixed by http://hg.linux-ha.org/dev/shortlog/7c31795636db and + http://hg.linux-ha.org/dev/shortlog/e7a4ddfa7cd6 + (closes: #444278) + * Make package binMMU safe. Thanks to Lior Kaplan. + (closes: #435974) + * Remove ipmilan stonith module as it seems to be cronically broken + - Remove the build dependancy on libopenipmi-dev (>= 2.0.1) accordingly + * Add dependancy on libperl-dev as libperl is needed + (though I am not sure why) + * Remove duplicate changelog + (closes: #443163) + + -- Simon Horman Fri, 28 Sep 2007 12:27:58 +0900 + +heartbeat (2.1.2-1) unstable; urgency=low + + * New Upstream + - Fix file relocation problems + (closes: #434829) + - Fix IPaddr's handling of CIDR netmasks + - Ran ./ConfigureMe bootstrap && make distclean && + rm ltdl.m4 libtool.m4 autoconf automake autoheader + to effect changes made to configure.in + * Add openhpi stonith module + - Add build dependancy on libopenhpi-dev + - Add usr/lib/stonith/plugins/stonith2/bladehpi.so to heartbeat.files + * IPv6 configure check + - For the ipv6 check to work Debian ia64 currently needs to check + "sys/types.h", a patch went into the tree a while ago to fix this. + However, at the 11th hour a patch went into 2.1.2 to reverse this + change as it breaks the build on RHEL4. So for now, until a proper + fix is made, just reverse that change in Debian packages. + - Ran ./ConfigureMe bootstrap && make distclean && + rm ltdl.m4 libtool.m4 autoconf automake autoheader + to effect changes made to configure.in + - Patch: ipv6-check.patch + + -- Simon Horman Tue, 31 Jul 2007 11:01:16 +0900 + +heartbeat (2.1.1-1) unstable; urgency=low + + * New Upstream + * Remove merged patches + - README.config-heartbeat-2.patch + - README.config-heartbeat.patch + - ipaddr2-bashism.patch + - ipv6addr-21-char-devname.patch + - ipv6addr-find_if-overflow.patch + - ipv6addr-scanf-return.patch + - ldirectord-init.patch + - configure-sys-types.h.patch + * After unpacking apply patches and run autoconf to effect + changes to configure.in + * Update files included in heartbeat, heartbeat-dev and ldirectord packages + * Update rules file to reflect that /usr/lib/heartbeat/cts/README + has been moved to usr/share/heartbeat/cts/README. + This README is installed as /usr/share/doc/heartbeat/README.cts + + -- Simon Horman Wed, 25 Jul 2007 14:15:38 +0900 + +heartbeat (2.0.8-10) unstable; urgency=low + + * Remove apparently bogus build-dependacy on modutils + Thanks to Russell Coker for spotting this. + A bug was subsequently filed as the result of some automated testing. + (closes: #432441) + * Build dependancy on libsnmp-dev rather than libsnmp10-dev | libsnmp-dev + as libsnmp10-dev does not seem to exist (any more?) + * Change heartbeat-gui's dependancy on heartbeat to a suggests, + as heartbat-gui can access heartbeat remotely + (closes: #430082) + + -- Simon Horman Thu, 19 Jul 2007 13:38:35 +0900 + +heartbeat (2.0.8-9) unstable; urgency=low + + * Run autoconf so that the FTBFS on ia64 fix included in + 2.0.8-8 actually takes effect. Bahh! + + -- Simon Horman Thu, 31 May 2007 19:37:43 +0900 + +heartbeat (2.0.8-8) unstable; urgency=low + + * Use sys/types.h instead of asm/types.h when trying to detect + the preseance of linux/icmpv6.h. Resolves FTBFS on ia64 + Patch: configure-sys-types.h.patch + * Remove linux-kernel-headers for ia64 added in 2.0.8-7 as + a) it didn't resolve the problem and b) the types.h change + above does. + * Use << instead of < for dependancy relations + * Add --enable-glib-malloc to configure's arguments + on advice from Andrew Beekhof + + -- Simon Horman Thu, 31 May 2007 18:26:10 +0900 + +heartbeat (2.0.8-7) unstable; urgency=low + + * Add a (tempoary) build dependancy on linux-kernel-headers for ia64 + to get around a curious autobuild problem. + See: http://lists.debian.org/debian-ia64/2007/05/msg00003.html + + -- Simon Horman Fri, 25 May 2007 16:07:22 +0900 + +heartbeat (2.0.8-5) unstable; urgency=low + + * The heartbeat-2-dev.dirs and friends change in 2.0.8-4 closes + #424192, not #424053 (which is also fixed by a different change + in 2.0.8-4) + * Add missing dummy package for stonith + + -- Simon Horman Thu, 17 May 2007 15:43:55 +0900 + +heartbeat (2.0.8-4) unstable; urgency=low + + * Create a Debian init script for ldirectord + Thanks to Ratiu Petru Iulius + Patch: ldirectord-init.patch + (closes: #391974) + * Documentation path of ldirectord should be /usr/share/doc/ldirectord, + not /usr/share/doc/ldirectord-2 + * Change priority of ldirectord to extra to match the lowest priority + of any of its dependancies + * Add versioned conflicts on old pils and stonith packages to heartbeat and + heartbeat-dev, which include those old package's files. + (closes: #424053) + * Have the clean target of debian rules remove the following files that + are priovided by the orig.tar.gz - Debian packages can't delete files + - heartbeat-2-dev.dirs heartbeat-2-dev.files heartbeat-2.dirs + heartbeat-2.files heartbeat-2.postinst heartbeat-2.postrm + heartbeat-2.preinst ldirectord-2.files ldirectord-2.postinst + ldirectord-2.postrm + (closes: #424053) + + -- Simon Horman Wed, 16 May 2007 13:58:24 +0900 + +heartbeat (2.0.8-3) unstable; urgency=low + + * Rename source package from heartbeat-2 to heartbeat. + Previously the heartbeat source package was used to package + up the 1.2.X series of releases, and heartebat-2 was used + for the newer 2.0.X series of releases. The idea being to offer + stable "heartbeat" packages when the 2.0.X stuff was all + new. It turns out that the 2.0.X tree has been at least as + stable as the 1.2.X tree for quite a while now, and the 1.2.X doesn't + get much attention any more, so there seems little advantage in + having the separate source packages, except perhaps to create confusion + and extra work. + * Update curl build dependancy for libcurl4 + Thanks to Christian Marillat + (closes: #423655) + * 2.0.8 (and probably earilier) includes the corrected scsi command syntax + Thanks to Christoph Martin + (closes: #350586) + + -- Simon Horman Mon, 14 May 2007 12:13:03 +0900 + +heartbeat-2 (2.0.8-2) unstable; urgency=low + + * Update build debendancy and rebuild against libsnmp10. + Somehow libsnmp9 has been removed from the distribution, + rendering heartbeat uninstallable. + Thanks to Steinar H. Gunderson + (closes: #422320) + * IPaddr2: Remove bashisms + Patch: ipaddr2-bashism.patch + Upstream: http://hg.linux-ha.org/dev/rev/165a9a897e3b + Thanks to Erich Schuebert + (closes: #420206) + * Fix up documentation location in /etc/ha.d/README.config + Thanks to Russell Coker + (closes: #418206) + * IPv6addr: Fix potential stack overflow in use of devname in scan_if + Patch: ipv6addr-21-char-devname.patch + Upstream: http://hg.linux-ha.org/dev/rev/37271ae7f117 + * IPv6addr: Fix potential buffer overflow when a 128bit prefix is used + Patch: ipv6addr-find_if-overflow.patch + Upstream: http://hg.linux-ha.org/dev/rev/b4bc188b4ebe + * IPv6addr: Handle scanf failures in scan_if() + Patch: ipv6addr-scanf-return.patch + Upstream: http://hg.linux-ha.org/dev/rev/31d19acfd1b9 + * Run autoconf to incoporate the chown-check-2.patch workaround + to allow the configure script to work under fakeroot. + I have no idea how this was not applied for 2.0.8-1 and yet + the build still worked. + * Change priority of ldirecord from optional to extra to + match the priority of its dependancies ipvsadm and libauthen-radius-perl + + -- Simon Horman Sat, 05 May 2007 13:36:36 +0900 + +heartbeat-2 (2.0.8-1) unstable; urgency=low + + * New Upstream + Thanks to Peter Clapham for his assistance + * errata: CVE-2006-3121 was incorrectly refered to as CVE-2006-3821 in + the changelog for 2.0.6-2 and 2.0.7-1 + * Dropped the following patches as they are now upstream + - ldirectord-1.141-emailalert-2-global.patch (introduced in 2.0.6-2) + * Remove alternate dependancy on netkit-ping as it is being removed + from Debian (closes: #383987) + + -- Simon Horman Tue, 30 Jan 2007 12:43:09 +0900 + +heartbeat-2 (2.0.7-2) unstable; urgency=low + + * Add dependancy and build dependancy on psmisc for fuser + Thanks to Hans-Joachim Baader + (Closes: #400958) + * Acknowldge NMU by Roger Leigh (Closes: #383987) + + -- Simon Horman Thu, 30 Nov 2006 02:26:24 +0000 + +heartbeat-2 (2.0.7-1) unstable; urgency=low + + * New Upstream + * Dropped the following patches as they are now upstream + - ldirectord-1.141-emailalert-1-quiet.patch (introduced in 2.0.6-2) + - ldirectord-1.141-readline_workaround.patch (introduced in 2.0.6-2) + - CVE-2006-3821.patch (introduced in 2.0.6-2) + + -- Simon Horman Mon, 14 Aug 2006 19:00:13 +0900 + +heartbeat-2 (2.0.6-2) unstable; urgency=high + + * ldirectord-1.141-emailalert-1-quiet.patch + Don't send email alerts if the alert address is not configured + (closes: #378450) + * ldirectord-1.141-emailalert-2-global.patch + Allow emailalert and emailalertfreq directives to be global + as well as per-virtual service + * ldirectord-1.141-readline_workaround.patch + readline doesn't seem to return lines after Net::FTP + has been called, so split them up by hand. + * Added recommends iptables to heartbeat-2, as it is needed + for the portblock resource to function correctly + * Added /var/lib/heartbeat/pengine directory + (closes: #379071) + * Replace 02-chown-check.patch with chown-check-2.patch + - use the environement variable FAKED_MODE instead of FAKEROOTKEY to check + if code is runing in fakeroot. At some stage around fakeroot 1.5.10 + FAKEROOTKEY disapeared. Ran autoconf manually to effect this change + after repatching. + - Updated 02-chown-check.patch: fix typos in comment + * CVE-2006-3821.patch + Fix remote denial of causes caused by insufficient bounds checking + on data read from the network. + CVE-2006-3821 + * Python transition - http://wiki.debian.org/DebianPython/NewPolicy + (closes: #380842) + - Update build dependancy on debhelper from (>= 4.0.0) to (>= 5.0.37.2) + - Add dh_python call to debian/rules + - created debian/pycompat with contents of "2" + - heartebeat: deplaced depenancy on python with one on ${python:Depends} + - Added XB-Python-Version: ${python:Versions} to each package + - Replace build dependancy on python2.3-dev with one on python-dev + - Use python-central + + Add build depends on python-central (>= 0.5) + + Add dh_pycentral call right before dh_python in debian/rules + + Add XS-Python-Version: current in the source stanza of debian/control + + -- Simon Horman Tue, 8 Aug 2006 18:49:00 +0900 + +heartbeat-2 (2.0.5-8) unstable; urgency=low + + * ldirectord-2: Add missing dependancy on libmailtools-perl + (Mail::Send) + (closes: #376722) + * ldirectord-2: Add missing dependancy on libnet-perl + (Net::SMTP, Net::FTP, Net::POP3) + * ldirectord-2: Remove unneccesary dependancy on adduser + * Automake transition: http://wiki.debian.org/AutomakeTransition + - Remove unneccesary build-depends on automake1.9 | automaken + - Remove unneccesary build-conflicts on automake1.4 + + -- Simon Horman Wed, 5 Jul 2006 10:55:00 +0900 + +heartbeat-2 (2.0.5-7) unstable; urgency=low + + * Don't run deluser and delgroup in postrm + - These commands may not be available at this time (closes: #375941) + - If there are any files left that belong to this user or group + then they will be left unowned and get inhereited by the + next user that comes along that happens to have hacluster's + old userid or the old haclient groupid respectively. + + -- Simon Horman Thu, 29 Jun 2006 15:13:26 +0900 + +heartbeat-2 (2.0.5-5) unstable; urgency=low + + * Reverse the change made in 2.0.5-4 + It turns out that in heartbeat-2 (as opposed to heartbeat) + is a script which calls a binary that is located in + /usr/lib/ocf/resource.d/heartbeat/ + + -- Simon Horman Mon, 12 Jun 2006 17:19:52 +0900 + +heartbeat-2 (2.0.5-4) unstable; urgency=low + + * Move IPv6addr from /etc/ha.d/resource.d/ into /usr/lib/heartbeat, + and then symlink that back into /etc/ha.d/resource.d/ as binaries + are not allowed in /etc (closes: #372850) + + -- Simon Horman Mon, 12 Jun 2006 16:23:59 +0900 + +heartbeat-2 (2.0.5-3) unstable; urgency=low + + * Fix libgnutls binary dependancy + - Build-Depends on libgnutls-dev instead of libgnutls13-dev + - Recompile against libgnutls13 in place of libgnutls11 + - (closes: #370423) + + -- Simon Horman Mon, 5 Jun 2006 17:57:23 +0900 + +heartbeat-2 (2.0.5-2) unstable; urgency=low + + * Make use of invoke-rc.d (closes: #367761) + * Update from standards versoin from 3.6.2 to 3.7.2 + + -- Simon Horman Fri, 19 May 2006 10:39:07 +0900 + +heartbeat-2 (2.0.5-1) unstable; urgency=low + + * New Upstream + * Removed build depenancy on openssl-devel, + as heartbeat no longer uses openssl directly. + (Libraries that heartbeat depends on may in turn + depend on openssl creating an indirect depenancy + or build-dependancy). + + -- Simon Horman Tue, 9 May 2006 11:55:52 +0900 + +heartbeat-2 (2.0.4-1) unstable; urgency=low + + * New Upstream + * Don't try and stop heartbeat in preinst on the first install + (closes: #355719) + + -- Simon Horman Wed, 8 Mar 2006 09:46:46 +0900 + +heartbeat-2 (2.0.3-2) unstable; urgency=low + + * Add build dependancy on libncurses-dev to allow crm_mon to work + Thanks to Guy Coates + * Move hacluster user and haclient group creation (don't ask me why the + user and group names are different) from preinst to postinst. + Once upon a time there might have been a need for it in preinst, + but the current packaging changes files to have the hacluster user + and haclient group as neccessary in the postinst. So there is + no need to create them before postinst. + This is a better fix to #352158, and the pre-depends on adduser + has been changed to a depends accordingly. + (closes: #352158) + * Stop heartbeat in preinst + + -- Simon Horman Tue, 14 Feb 2006 13:42:37 +0900 + +heartbeat-2 (2.0.3-1) unstable; urgency=low + + * New Upstream + * Make sure adduser is passed the --system flag + (closes: #336580) + * Slightly Enhanced package descriptions + (closes: #337030) + * Add build dependancy on swig + * As PYTHON_PATH has been added to configure.in it seems that autoconf1.4 + can no longer build this tree. Currently autoconf is provided by + autoconf1.4, and autoconfn is a virtual package provided by autoconf1.7, + 1.8 and 1.9. Accordingly, replace the autoconf build dependancy with + autoconf1.9 | autoconfn. And add a build conflict on autoconf1.4. This + way the autoconf command should be autoconf1.7, 1.8 or 1.9, but not 1.4 + as was previously the case. + * Don't apply 00-ssh_scp_path.patch as it should no longer be needed, + instead add a build dependancy on openssh-client. + Also removed call to relevant configure options. + * Removed configure option that no longer exists + --enable-checkpointd + * Removed configure options that are now on by default + --enable-crm --enable-lrm + * Add build dependancy on libgnutls11-dev, as 1.0 probably doesn't + compile as _t types don't exist. + http://lists.gnu.org/archive/html/help-gnutls/2004-08/msg00001.html + * Fix insonsistency between hb_stanby(1) man page, an the wiki + (closes: #339016) + * Make /usr/bin/cl_status setgid + (closes: #351178) + * Make sure that /var/run/heartbeat/{ccm,crm} exist on install + else postinst, and thus the install will abort. + (closes: #351181) + * Fix inconsistency between hb_standb(1) man page and wiki + (closes: #339016) + * Add Pre-Depends on adduser + (closes: #352158) + * Add management tool + ./confgure --enable-mgmt + Build-Depends: python2.3-dev, libpam0g-dev + + -- Simon Horman Sat, 11 Feb 2006 09:41:17 +0000 + +heartbeat-2 (2.0.2-5) unstable; urgency=low + + * Change libcurl3-dev dependancy to libcurl3-openssl-dev + (closes: #334622) + + -- Simon Horman Wed, 19 Oct 2005 19:09:51 +0900 + +heartbeat-2 (2.0.2-4) unstable; urgency=low + + * Include /var/lib/heartbeat/ccm and /var/run/heartbeat/crm + (closes: #330634) + + -- Simon Horman Thu, 29 Sep 2005 12:16:03 +0900 + +heartbeat-2 (2.0.2-3) unstable; urgency=low + + * Get rid of bogus touching of config.status and friends in clean target, + which if run as root causes build failures. + + -- Simon Horman Tue, 27 Sep 2005 22:28:01 +0900 + +heartbeat-2 (2.0.2-2) unstable; urgency=low + + * Add build dependancy on libltdl3-dev + (closes: #330194) + + -- Simon Horman Tue, 27 Sep 2005 20:38:12 +0900 + + +heartbeat-2 (2.0.2-1) unstable; urgency=low + + * New upstream + + -- Simon Horman Mon, 26 Sep 2005 15:11:23 +0900 + +heartbeat-2 (2.0.1-4) unstable; urgency=low + + * Add /var/run/heartbeat directory to package + http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=900 + + -- Simon Horman Sat, 24 Sep 2005 14:56:51 +0900 + +heartbeat-2 (2.0.1-3) unstable; urgency=low + + * Restrurctured provides, conflicts and replaces + * Made heartbeat-2-dev depend on heartbeat-2, not heartbeat + + -- Simon Horman Thu, 22 Sep 2005 17:24:19 +0900 + +heartbeat-2 (2.0.1-2) unstable; urgency=low + + * Uptream initally made the wrong tar ball avaliable for + 2.0.1 and this was used to build 2.0.1-1. + I have asked 2.0.1-1 not to be accepted into the Debian Archive + for this reason. 2.0.1-2 uses the updated, correct tarball from + upstream. + + * Note that this package has a binary dependancy on libssl + only because of linking against libsnmp9 (5.2.1.2-3) + + * Add build dependancy on libsensors-dev (for libsnmp9) + + -- Simon Horman Thu, 22 Sep 2005 12:56:11 +0900 + +heartbeat-2 (2.0.1-1) unstable; urgency=low + + * New upstream + + * Add /var/lib/heartbeat/cores/root, /var/lib/heartbeat/cores/hacluster + and /var/lib/heartbeat/cores/nobody + * Remove usr/lib/stonith/plugins/stonith2/riloe.so, its + no longer in the tree + * Enable snmp_agent + * Added new libplumbgpl + * Added new ha_logd.cf + * Added new iso8601 executable + * Temporarly remove the drac3 module as GPL code that links + against OpenSSL is not acceptable to Debian. + - http://lists.community.tummy.com/pipermail/linux-ha-dev/2005-August/011266.html + - http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=853 + * Update build dependncy from libsnmp5-dev to libsnmp9-dev + * Make configure chown test fakeroot aware to avoid build hang + * Fix syntax error in db OCF resource + * Make crm/test/helper.sh have #! /bin/bash + * Make resources/OCF/ocf-shellfuncs.in have #! /bin/bash + * Update FSF address + * Zero config.status, libltdl/config.log and libltdl/config.status on clean + + -- Simon Horman Thu, 15 Sep 2005 20:24:52 +0900 + +heartbeat-2 (2.0.0-2) unstable; urgency=low + + * Add /var/lib/heartbeat/ccm and /var/lib/heartbeat/cores + + -- Simon Horman Wed, 3 Aug 2005 22:54:35 +0900 + +heartbeat-2 (2.0.0-1) unstable; urgency=low + + * New upstream + * Added dependancy on libnet-dns-perl to ldirectord + * Added --enable-checkpointd to configure arguments + * Added --disable-snmp-subagent to configure arguments + * Added --disable-swig to configure arguments + * Add build dependancy on uuid-dev + * Readranged packages to allow heartbeat 1.2.X to exist in debian + and heartebat 2.X to be heartbeat-2 until heartbeat-2 gets + a bit more testing in the wild. Also consoldidated binary + packages into heartbaet-2, and development packages into + heartbeat-2-dev, ldirectord is still in its own package, + ldirectord2, as it drags in a lot of dependancies that + no other part of the system uses. + + -- Simon Horman Sat, 30 Jul 2005 16:20:55 +0900 + +heartbeat (1.2.3-12) unstable; urgency=high + + * 11-tmpfile-problems.patch, 12-tmpfile-problems-2.patch + Don't use predictable temp files + [heartbeat/lib/BasicSanityCheck.in, heartbeat/resource.d/WAS.in + lib/plugins/stonith/meatware.c, lib/stonith/meatclient.c, + cts/CM_hb.py.in, cts/CTStests.py.in CAN-2005-2231] (closes: #318287) + * debian/apply + Apply patches in the correct order. + * 12-tmpfile-problems-2.patch + Added CTS back in with security fix + [usr/lib/heartbeat/cts/CM_fs.py, usr/lib/heartbeat/cts/CM_hb.py, + usr/lib/heartbeat/cts/CTS.py, usr/lib/heartbeat/cts/CTSaudits.py, + usr/lib/heartbeat/cts/CTSlab.py, usr/lib/heartbeat/cts/CTStests.py + CAN-2005-2231] + * 13-confdir.patch + Change CONF_D defined (and missing) in some resources + to HA_CONFDIR in shelfuncs, allowing arp_config to function + correctly in IPaddr2 and SendArp. (closes: #318266) + * debian/rules + Include cts documentation + * 14-ipadd2_no_loopback_delete.patch + Fix IPaddr2 so it doesn't remove loopback interfaces on stop + * 15-LVM2.patch + Allow the LVM resource to work with LVM2 as well as LVM1 + (closes: #309906) + * Upgrade Standards-Version from 3.6.1 to 3.6.2 + + -- Simon Horman Mon, 18 Jul 2005 22:27:29 +0200 + +heartbeat (1.2.3-10) unstable; urgency=low + + * Make signal handling less aggressive to avoid exiting in + FTP and LDAP chacks. (closes: #310600) + + -- Simon Horman Fri, 17 Jun 2005 18:17:03 +0900 + +heartbeat (1.2.3-9) unstable; urgency=low + + * Stop heartbeat in preinst so starting it in postinst + wont cause an error if it was already running. + (closes: #303149) + + -- Simon Horman Tue, 5 Apr 2005 15:57:44 +0900 + +heartbeat (1.2.3-8) unstable; urgency=low + + * Added dependancy on libnet-dns-perl to ldirectord + * Removed Build-Dependancy on raidtools2 as it is being removed + from the archive and removed the Raid1 resource from the + heartbeat package accordingly. (closes: #296717) + * Added build dependancy on bison and flex. + + -- Simon Horman Tue, 22 Mar 2005 13:20:18 +0900 + +heartbeat (1.2.3-7) unstable; urgency=low + + * Remove the hacluser user and haclient group on purge. (closes: #29951) + * Note the Delay resource bug closed in 1.2.3-4 was #287848, not #28784. + + -- Simon Horman Tue, 15 Mar 2005 12:30:45 +0900 + +heartbeat (1.2.3-5) unstable; urgency=low + + * Added missing libxml2-dev build dependancy that is required + for the drac3 stonith module to build. (closes: #290235) + + -- Simon Horman Fri, 14 Jan 2005 16:23:48 +0900 + +heartbeat (1.2.3-4) unstable; urgency=low + + * Move user and group creation code from postinst to preinst + (Jochen Friedrich) (closes: #285603) + * Don't set uid of user that is created + (Daniel Hermann) (closes: #288818) + * Stonith module for EXTERNAL Stonith device + (Daniel Hermann) (closes: #286274) + * Remove control fifo in postrm + * Fix gcc-4.0 compile problems (Andreas Jochens) (closes: #286347) + * Removed stray heartbeat-stonith.files and heartbeat-ldirectord.files + from debian/, these have not been used for quite some time now. + * Added build dependancy on libcurl-dev to allow drac3 Stonith device to build + * Added drac3 Stonith device to build + * Add --disable-fatal-warnings to ./configure in debian/rules, + this is known not to work cleanly with debian's lex and yacc. + Also, reverse 02-lex_yacc_cflags.patch, which is an attempt to + work around this, which doesn't always work. + * Fix loop in FIFO reader that manifests on SPARC/Linux + (Jochen Friedrich) (closes: #285356) + * Fix typo in Delay resource that causes both stop and start to fail + (Daniel Hermann) (closes: #28784) + + -- Simon Horman Wed, 12 Jan 2005 12:22:01 +0900 + +heartbeat (1.2.3-3) unstable; urgency=low + + * Removed /etc/ha.d/resource.d/apache as it does not work + properly _on Debian_ and by removing it /etc/init.d/apache will be used + which does work. Reported by Fraser Campbell. (closes: #283447) + * Update ldirectord from 1.77.2.5 to 1.77.2.6 for https bug. + http://www.gossamer-threads.com/lists/linuxha/users/22059 + Requested by Amadeus Scherhaufer. + + -- Simon Horman Wed, 1 Dec 2004 16:35:59 +0900 + +heartbeat (1.2.3-2) unstable; urgency=low + + * Fixed a bug related to repeat STONITHs failing because we freed some + data we shouldn't have. + * Don't run exclude cl_status from dh_fixperms as it overrides permissions + that the build system sets which are needed for correct opperation. + + -- Simon Horman Tue, 16 Nov 2004 15:54:28 +0900 + +heartbeat (1.2.3-1) unstable; urgency=low + + * New Upstream + - Incoporate init script patch from 1.2.2-12 (Bug#268670) + - Incoporate ssh dependancy patch from 1.2.2-11 + - All other changes were merged upstream for 1.2.3 + * Added patch manager from kernel-source-2.4.27 to keep debian + specific and otherwise unmerged patches in order + + -- Simon Horman Tue, 21 Sep 2004 16:05:46 +0900 + +heartbeat (1.2.2-12) unstable; urgency=low + + * Backport send ARP from head branch + - broadcast works with -C + - -C is documented + - (closes: Bug#262288) + * Some init scipts tell us that they are not running, + heartbeat mistakenly just sees "running" and assumes they are. + - Fix by adding the following to ResourceManager(.in) + case `$spath $arg status` in + -> *not [Rr]unning*) return 3;; + *[Rr]unning*|*OK*) return 0;; + *) return 3;; + esac + - (closes: Bug#268670) + * Remove config.log in clean target of rules file + + -- Simon Horman Mon, 30 Aug 2004 12:21:20 +0900 + +heartbeat (1.2.2-11) unstable; urgency=medium + + * Remove build dependancy on ssh as the package has ongoing + install problems on arm and this is preventing this package + from moving into sarge. Instead, provide configure options + to specify the path to ssh and scp. + + -- Simon Horman Mon, 26 Jul 2004 12:00:37 +0900 + +heartbeat (1.2.2-10) unstable; urgency=low + + * Revert to tar ball that was used for previous (> 1.2.2-9) builds. + You can't modify the tar ball on debian.org !!! (silly me) + + -- Simon Horman Wed, 7 Jul 2004 12:17:28 +0900 + +heartbeat (1.2.2-9) unstable; urgency=low + + * Fix sequence number wrap in ping_group + (Patched ping_group.c from 1.10 to 1.11) + * Build against tar ball from linux-ha.org + A locally produced tar ball had been used in the past (my mistake) + + -- Simon Horman Wed, 7 Jul 2004 11:20:41 +0900 + +heartbeat (1.2.2-8) unstable; urgency=low + + * The previous version never made it into testing because + the build failed on arm because the ssh package was broken + at the time. I have not had any luck contacting someone to + rebuild the package. + * Updated ldirectord to 1.77.2.4 (from 1.77.2.2). + Fixes a problem where real servers present in multiple + virtuals would only be added to one virtual service. + + -- Simon Horman Wed, 23 Jun 2004 17:01:26 +0900 + +heartbeat (1.2.2-7) unstable; urgency=low + + * Link the apcmastersnmp stonith module against libsnmp + + -- Simon Horman Fri, 4 Jun 2004 16:07:49 +0900 + +heartbeat (1.2.2-5) unstable; urgency=low + + * Fixed alignment error in IPv6addr.c that manifests on ia64 + (closes: Bug#249847) + + -- Simon Horman Thu, 20 May 2004 11:20:47 +0900 + +heartbeat (1.2.2-4) unstable; urgency=low + + * Put back inary-arch and binary-indep targets + (closes: Bug#188835) (closes: Bug#249606) + * Put the prioroty of all packages, except ldirectord back to optional + Left ldrirectord as optional as it depends on ipvsadm, + which is optional. + + -- Simon Horman Wed, 19 May 2004 12:21:54 +0900 + +heartbeat (1.2.2-3) unstable; urgency=low + + * Package provides /etc/ha.d and /etc/heartbeat + (actually fixed in 1.2.2-2) (closes: Bug#222712) + * There is a known limitation with ifconfig's handling of + long interface names. Use IPadd2, which used the ip command, + instead. (Fixed in upstream) (closes: Bug#229978) + * New upstream (closes: Bug#248611) + * Heartbeat package does not use debconf anymore + (Fixed a while ago) (closes: Bug#189932) + * Evms seems to no longer depend on heartbeat. + (closes: Bug#207607) + * Made dependancy on libnet1-dev instead of + libnet1-dev | libnet0-dev | libnet-dev. + - libnet0-dev is in setction oldlibs in stable + - allows IPv6addr to be included. + * Include IPv6addr + * Made dependancy on libssl-dev instead of libssl-dev | libssl09-dev + as libssl09-dev is not in stable. + * Changed priority to extra as that is the lowest common + denominator of our dependancies. + + -- Simon Horman Tue, 18 May 2004 12:54:30 +0900 + +heartbeat (1.2.2-2) unstable; urgency=low + + * New Upstream + * ldirectord uses host portion of request string as documented in + the man page. (closes: Bug#242220) + * ldirectord check_ftp no longer uses pipes. (closes: Bug#243157) + * The binary-arch and binary-indep targets did not conform to Debian policy. + It is rather difficult to implement them correctly given the heartbeat + build system, and the policy allows them not to exist. (closes: Bug#188835) + * Added dependancy on libmail-imapclient-perl. (closes: Bug#242077) + * The timestamp overflow was fixed long time ago. + (closes: Bug#239683) (closes: Bug#239687) + * inet_aton is no longer used in mcast.c (closes: Bug#239684) + * Patch is superseeded by much newer codebase + (closes: #239685) (closes: Bug#239686) + * Init script no longer uses -e argument to echo. (closes: Bug#136541) + * Plugins no longer need to be executable. (closes: Bug#247348) + (closes: Bug#247485) + * Merged debian packaging in Debian Unstable pool with the + linux-ha tree. + + -- Simon Horman Fri, 14 May 2004 12:32:26 +0900 + +heartbeat (1.2.0-2) unstable; urgency=low + + * Added Depends on libmail-imapclient-perl to ldirectord. + (Closes: #242077) Thanks Cyril Bouthors for noticing. + + -- Alberto Gonzalez Iniesta Mon, 5 Apr 2004 09:11:03 +0200 + +heartbeat (1.2.0-1) unstable; urgency=low + + * The 'My f*cking Toshiba HD crashed and delayed everything' release + * New upstream release + + -- Alberto Gonzalez Iniesta Tue, 16 Mar 2004 20:24:24 +0100 + +heartbeat (1.0.4-3) unstable; urgency=low + + * Corrected default paths to Apache binary and configuration file. + (Closes: #230042) + * Corrected typo in heartbeat-dev description (Closes: #230639) + * Corrected grammatical confusion in template (Closes: #232459) + * Actually correct permissions on /var/lib/heartbeat/ccm. + (Closes: #233021) + + -- Alberto Gonzalez Iniesta Wed, 28 Jan 2004 07:36:17 +0100 + +heartbeat (1.0.4-2) unstable; urgency=low + + * Improved haclient user and group creation/deletion [postinst & postrm] + Make use of gentent instead of greping /etc/(passwd|group) + Inspired by Horms' packages ;) + * Moved to debhelper compatability 4. Created debian/compat. + * Avoid failing while moving contents from old configuration dir to + new one if expected contents are not found. + (Closes: #221546) + * Removed README.config from /etc (Closes: #222708) + * Make 'daemon' be the default syslog facility for heartbeat + (Closes: #226600) + * Corrected owner and permissions under /var/lib/heartbeat + (Closes: #228505) + * Make libstonith0 depend on libsnmp5. Thanks Stefan Beck for noticing. + (Closes: #228544) + * Make libstonith0 depend on libssl0.9.7. Why the f*ck does dpkg-shlibdeps + not find these? + * Make heartbeat start later and stop sooner (S75 and K05) so that it + won't f*ck drbd. Thanks Stefan Schleifer for noticing. + Created a debconf template to ask if the change should be done when + upgrading from previous versions. + * Fixed debconf template text for directory movement. + + -- Alberto Gonzalez Iniesta Wed, 12 Nov 2003 15:05:00 +0100 + +heartbeat (1.0.4-1) unstable; urgency=low + + * New upstream release + * Bumped Standards-Version to 3.6.1. No change + * Removed debconf supported configuration of heartbeat. + It was buggy, and a pain to debug. I'd rather not have it + on sarge. (Closes: #204775) I'll work on a new one when time + permits. + + -- Alberto Gonzalez Iniesta Sat, 4 Oct 2003 17:36:40 +0200 + +heartbeat (1.0.3-3) unstable; urgency=low + + * Removed deletion of fifo files in heartbeat.prerm + (That shouldn't be done there. It broke dpkg-reconfigure) + * Added Depends on libwww-perl and libnet-ssleay-perl + (Closes: #142297) + * libstonith-dev's Section is now libdevel (Closes: #188206) + + -- Alberto Gonzalez Iniesta Sun, 13 Jul 2003 17:13:43 +0200 + +heartbeat (1.0.3-2) unstable; urgency=low + + * Fixed sections for libstonith-dev, it's libdevel + + -- Alberto Gonzalez Iniesta Sat, 12 Jul 2003 20:10:59 +0200 + +heartbeat (1.0.3-1) unstable; urgency=low + + * The 'debcamp' release + * New upstream release + * Added build-depends on iputils-ping, I hoped it wouldn't be + necessary. (Closes: #200938) + * Also added Depends on iputils-ping. That's the ping package + with the ping syntax we need (Closes: #170799) + * The heartbeat.config from 0.4.9.2-1 did 'cut' the right way + (Closes: #166065) + * Added missing db_stop in heartbeat.postinst + (Closes: #199484) + * /usr/lib/heartbeat/ResourceManager now has the right path to + init.d scripts (Closes: #169865) + * Made Simon Horman a co-maintainer + + -- Alberto Gonzalez Iniesta Sat, 12 Jul 2003 12:13:03 +0200 + +heartbeat (1.0.2-1) unstable; urgency=low + + * New upstream release (Closes: #186900) + * New maintainer (Closes: #192680) + * Bumped Standards-Version to 3.5.10 + * Patched ha_msg.c to fix format string bug (Closes: #199016) + + -- Alberto Gonzalez Iniesta Wed, 02 Jul 2003 00:11:24 +0200 + +heartbeat (0.4.9.2-3.1) unstable; urgency=low + + * Use -r instead of -R for ipvsadm. Thanks to Sergio Talens-Oliag. + (Closes: #147290) + * Fix lintian errors by removing *.conffiles. + + -- James Morrison Sat, 29 Mar 2003 14:56:12 -0500 + +heartbeat (0.4.9.2-3) unstable; urgency=low + + * fixed a build bug caused by a buggy ld - I don't know if ld still + has that problem (it doesn't seem to me), but anyway it's done. + (closes: #129361) + + -- Michael Moerz Tue, 15 Oct 2002 12:44:05 +0200 + +heartbeat (0.4.9.2-2) unstable; urgency=low + + * and again I was caught by that groupadd in the Makefiles + this is fixed now (closes: 164773) + + -- Michael Moerz Tue, 15 Oct 2002 02:08:52 +0200 + +heartbeat (0.4.9.2-1) unstable; urgency=low + + * new upstream release + * fixed cut problem (caused by missing escape sequences) + (closes: #130895, #131253, #131259) + * corrected missing Depends on adduser (closes: #147661) + * corrected problem with install and duplicate files (closes: #162446) + * fixed false assumption about possition of fuser from /sbin to /bin + * changed configuration directory from /etc/ha.d to /etc/heartbeat + * added the essential question if the user wants to use debconf + for the configuration of heartbeat + + -- Michael Moerz Mon, 14 Oct 2002 11:30:52 +0200 + +heartbeat (0.4.9.0l-7.2) unstable; urgency=low + + * corrected wrong dependency (on lvs) (Closes: #141922) + + -- Michael Moerz Sun, 28 Apr 2002 02:31:57 +0200 + +heartbeat (0.4.9.0l-7.1) unstable; urgency=high + + * Non-maintainer upload, trying to get a release into woody + * Use ifconfig 0 instead of ifconfig down + (Closes: #129779) + + -- Matt Zimmerman Sat, 2 Mar 2002 22:49:32 -0500 + +heartbeat (0.4.9.0l-7) unstable; urgency=low + + * removed call of groupadd in hearbeat/Makefile (Closes: #121244) + * heartbeat depends on system-log-daemon instead of sysklogd. + (Closes: #120721) + * corrected the soname of libhbclient from .0.0.0 to + libhbclient.so.0.0.0 + * removed debian/.shlibs files since they are autogenerated now + by dh_makeshlibs -V + * removed some log file that remained in debian/ from testing and + debugging the debconf interface + + -- Michael Moerz Thu, 13 Dec 2001 03:14:42 +0100 + +heartbeat (0.4.9.0l-6) unstable; urgency=low + + * this time I hope I got it right with the sections of the several packages + involved + * heartbeat is up to date now (Closes: #79946, #90521, #63259) + * /usr/lib/heartbeat/ResourceManager: renamed init.d directory + (Closes: #89598) + * A newer README.Debian added (Closes: #94469) + + -- Michael Moerz Mon, 12 Nov 2001 20:27:59 +0100 + +heartbeat (0.4.9.0l-5) unstable; urgency=low + + * an other forgotten debug statement that caused trouble (Closes: #118984) + * fixed some missing ldconfig in heartbeat.postinst and heartbeat.postrm + * fixed so version in heartbeat.shlibs + + -- Michael Moerz Sat, 10 Nov 2001 19:21:19 +0100 + +heartbeat (0.4.9.0l-4) unstable; urgency=low + + * corrected section of ldirectords and stoniths to section admin + * corrected wrong dependency of ldirectord to lvs (ipvsadm) + + -- Michael Moerz Sat, 10 Nov 2001 11:43:22 +0100 + +heartbeat (0.4.9.0l-3) unstable; urgency=low + + * corrected my faulty control file - so 0l-2 and 0l-1 never ever made + it into the archive + + -- Michael Moerz Fri, 9 Nov 2001 00:49:11 +0100 + +heartbeat (0.4.9.0l-2) unstable; urgency=low + + * removed some debug output causing a file testj to be written in the + current directory + + -- Michael Moerz Thu, 8 Nov 2001 01:34:30 +0100 + +heartbeat (0.4.9.0l-1) unstable; urgency=low + + * taking package after talking to Paolo Molaro - well I was really lazy + cause it took me a lot of time to create a working new package, but I + hope the debconf interface was worth the waiting ... + * Updated for 0.4.9.0l + * modified package to fit policy 3.5.3.0 + * added Build Depends + * added debconf support for heartbeat + * wrote a very short manpage for stonith and meatclient + + -- Michael Moerz Tue, 8 Nov 2001 22:56:01 +0200 + +heartbeat (0.4.6-2.2) frozen unstable; urgency=low + + * NMU + * Fix Build-depends, this time with source. Closes: #105837 + + -- LaMont Jones Wed, 15 Aug 2001 23:48:09 -0600 + +heartbeat (0.4.6-2) frozen unstable; urgency=low + + * Fix ugly bug with prerm (Closes: bug#56671). To the release manager: + get this in potato as that bug is really annoying (endless loop + with the yes program when uninstalling). You still need to kill or Crtl-C + the prerm script, as it seems it's not possible to override + a broken prerm script before it's run by dpkg. + * Applied little patch from Terry Katz to make IPAddr work correctly + with multiple similar IPs on the same pc (Closes: bug#55925). + + -- Paolo Molaro Mon, 7 Feb 2000 15:36:38 +0100 + +heartbeat (0.4.6-1) unstable; urgency=low + + * New upstream release. + + -- Paolo Molaro Thu, 2 Dec 1999 16:51:41 +0100 + +heartbeat (0.4.5a-1) unstable; urgency=low + + * Initial Release. + + -- Paolo Molaro Wed, 17 Nov 1999 17:30:23 +0100 + +Local variables: +mode: debian-changelog +End: diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..0f3866d --- /dev/null +++ b/debian/control @@ -0,0 +1,124 @@ +Source: heartbeat-2 +Section: admin +Priority: optional +Maintainer: Simon Horman +Build-Depends: debhelper (>= 5.0.37.2), 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, libltdl3-dev, swig, openssh-client, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, psmisc, libopenhpi-dev +Standards-Version: 3.7.3 +XS-Python-Version: current + +Package: ldirectord +Section: admin +Priority: extra +Architecture: all +Depends: ${perl:Depends}, ipvsadm, libauthen-radius-perl, libcrypt-ssleay-perl, libdbi-perl, libdigest-hmac-perl, libdigest-md5-perl, libmail-pop3client-perl, libmailtools-perl, libnet-dns-perl, libnet-imap-simple-perl, libnet-imap-simple-ssl-perl, libnet-ldap-perl, libnet-perl, libwww-perl +Recommends: rsyslog | system-log-daemon, logrotate +Conflicts: libpils0 (<< 2.0.8-3), libstonith0 (<< 2.0.8-3), stonith (<< 2.0.8-3) +XB-Python-Version: ${python:Versions} +Description: Monitors virtual services provided by LVS + ldirectord is a stand-alone daemon to monitor services of real + for virtual services provided by The Linux Virtual Server (LVS). + and works with Linux-HA's heartbeat package. + +Package: heartbeat-2 +Section: admin +Priority: optional +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends}, iproute, adduser, iputils-ping, psmisc, gawk, mawk, libxml2-utils, libpam-runtime (>= 0.76-14) +Recommends: rsyslog | system-log-daemon, logrotate, iptables +Provides: libstonith0, libpils0 +Conflicts: libstonith0, libpils0, heartbeat +Replaces: libstonith0, libpils0 +XB-Python-Version: ${python:Versions} +Description: Subsystem for High-Availability Linux + heartbeat is a basic heartbeat subsystem for Linux-HA which implements + serial, UDP, and PPP/UDP heartbeats together with IP address takeover + including a nice resource model including resource groups. + . + It currently supports a very sophisticated dependency model for n-node + clusters. It is both extremely useful and quite stable at this point in + time. + +Package: heartbeat-2-dev +Section: devel +Priority: optional +Architecture: any +Depends: heartbeat-2 (= ${binary:Version}) +Provides: libstonith-dev, libpils-dev +Conflicts: libstonith-dev, libpils-dev +Replaces: libstonith-dev, libpils-dev +XB-Python-Version: ${python:Versions} +Description: Subsystem for High-Availability Linux - development files + heartbeat is a basic heartbeat subsystem for Linux-HA which implements + serial, UDP, and PPP/UDP heartbeats together with IP address takeover + including a nice resource model including resource groups. + . + It currently supports a very sophisticated dependency model for n-node + clusters. It is both extremely useful and quite stable at this point in + time. + . + This package contains development files + +Package: heartbeat-2-gui +Section: admin +Priority: optional +Architecture: any +Depends: ${python:Depends}, python-gtk2, python-glade2, uuid-runtime, python-xml +Suggests: heartbeat-2 (= ${binary:Version}) +XB-Python-Version: ${python:Versions} +Description: Provides a gui interface to manage heartbeat clusters + GUI client for heartbeat clusters + +Package: ldirectord-2 +Section: admin +Priority: optional +Architecture: all +Depends: ldirectord (= ${source:Version}) +Description: Monitors virtual services provided by LVS + This is a transitional dummy package. If nothing depends on it, this + package can be safely removed. + +Package: stonith +Section: libs +Priority: optional +Architecture: any +Depends: heartbeat-2 (= ${binary:Version}) +Description: Interface for remotely powering down a node in the cluster + This is a transitional dummy package. If nothing depends on it, this + package can be safely removed. + +Package: libstonith0 +Section: libs +Priority: optional +Architecture: any +Depends: heartbeat-2 (= ${binary:Version}) +Description: Interface for remotely powering down a node in the cluster + This is a transitional dummy package. If nothing depends on it, this + package can be safely removed. + +Package: libstonith-dev +Section: admin +Priority: optional +Architecture: all +Depends: heartbeat-2-dev (>= ${source:Version}) +Description: Interface for remotely powering down a node in the cluster + This is a transitional dummy package. If nothing depends on it, this + package can be safely removed. + +Package: libpils0 +Section: libs +Priority: optional +Architecture: any +Depends: heartbeat-2 (= ${binary:Version}) +Description: Plugin and Interface Loading System + This is a transitional dummy package. If nothing depends on it, this + package can be safely removed. + +Package: libpils-dev +Section: admin +Priority: optional +Architecture: all +Depends: heartbeat-2-dev (>= ${source:Version}) +Description: Plugin and Interface Loading System - development files + This is a transitional dummy package. If nothing depends on it, this + package can be safely removed. + diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..786c500 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,107 @@ +This package was first debianized by Paolo Molaro on +Wed, 17 Nov 1999 17:30:23 +0100. + +The original sources can be found at: + http://www.linux-ha.org/download/ + +Upstream Authors (from doc/AUTHORS): + +NOTE: The work of everyone on this project is dearly appreciated. If you + are not listed here but should be, please notify us! + +The following people have kindly helped with heartbeat development by +providing code, documentation or testing, or fixes: + + Alan Robertson + Main architect. + Things other people don't want to do. + +Contributors, ordered by last name: + + Eric Ayers + Nightware RPC100S, and WTI RPS10 support + Andrew Beekhof + Cluster Resource Manager + Darwin Cleanups + Stéphane Billiart - unicast support + Gregor Binder - "meatware" STONITH support + Juan Pedro Paredes Caballero - Debian support + Dusan Djordjevic - documentation + Kevin Dwyer - ipfail, bug fixes. + Joachim Gleissner ssh STONITH support + Luis Claudio R. Gonçalves + nice_failback code, hb_standby code, fixes + Thomas Hepper + solaris and Debian support + Masaki Hasegawa - send_arp research, fix + Andrew Hildebrand - IRIX port. + Horms + LVS support, ldirectord, many fixes + Gregor Howey + Holger Kiehl + Kirk Lawson - Audible alarm support + Mike Ledoux + APC master switch and WTI [WT]PS-xxx support + David Lee - autoconf and solaris support + Xiaoxiang Liu + interprocess communication library + Friedrich Lobenstock - SuSE compatibility fixes + Lars Marowsky-Brée + LVM, ICP and ssh STONITH support, many fixes + SuSE package maintainer + STABLE_1_0 / 1.0.x release maintenance + Michael Moerz - automake support + Ram Pai - Consensus Membership module + Rudy Pawul + Documentation, first production customer + Andreas Piesk + APC Masterswitch (snmp) and APCSmart support + Jacob Rief - ldirectord + Stefan Salzer + Mitja Sarp + Initial authentication support (first big contribution) + Guochun Shi + Communication/core/membership layer support + Matthew Soffen + FreeBSD port, Solaris fixes, and release manager + Guenther Thomsen + Debian compliance + Mike Tilstra - VACM support + Marcelo Tosatti + API support, initial plugin support + Iñaki Fernández Villanueva - debian support + Todd Wheeling + APC master switch and WTI [WT]PS-xxx support + Volker Wiegand + /proc file system, initial SuSE support, documentation + Chris Wright + Multicast support, inet_pton replacement, fixes + + +Code for the following pieces borrowed from code by: + Tom Vogt (udp code) + yuri volobuev (send_arp.c) + 'Network UPS Tools' by Russell Kroll + homepage: http://www.exploits.org/nut/ + (Andreas Piesk borrowed code for APCSmart support) + David C. Teigland + wrote original meatware support for GFS stomith + salz@pebbles.bbn.com - replacement scandir function + Internet Software Consortium (bind) - replacement inet_pton() + function + +All binaries provided by this package are GNU GPL or GNU LGPL. +Some source files are under the BSD licence or in the public domain, +as annotated by those files. All source files without a specific +licence statement are available licenced under the GNU GPL. + +A copy of the GNU GPL licence is available on Debian systems at +/usr/share/common-licenses/GPL + +A copy of the GNU LGPL licence is available on Debian systems at +/usr/share/common-licenses/LGPL + +A copy of the BSD licence is available on Debian systems at +/usr/share/common-licenses/BSD + + diff --git a/debian/dpkg-checkbuild b/debian/dpkg-checkbuild new file mode 100755 index 0000000..823ae60 --- /dev/null +++ b/debian/dpkg-checkbuild @@ -0,0 +1,197 @@ +#!/usr/bin/perl -w +# Copyright 2001 by Joey Hess +# License: GNU General Public License (GPL) + +use strict; +use Getopt::Long; + +sub usage { + print STDERR < \$binary_only)) { + usage(); + exit(2); +} +my $control=shift || "debian/control"; + +open (CONTROL, $control) || die "$control: $!\n"; +my @status=parse_status(); +my (@unmet, @conflicts); +while () { + chomp; + last if $_ eq ''; # end of first stanza + + if (/^Build-Depends:\s+(.*)/i) { + push @unmet, build_depends($1, @status); + } + elsif (/^Build-Conflicts:\s+(.*)/i) { + push @conflicts, build_conflicts($1, @status); + } + elsif (! $binary_only && /^Build-Depends-Indep:\s+(.*)/i) { + push @unmet, build_depends($1, @status); + } + elsif (! $binary_only && /^Build-Conflicts-Indep:\s+(.*)/i) { + push @conflicts, build_conflicts($1, @status); + } +} +close CONTROL; + +if (@unmet) { + print STDERR "$me: Unmet build dependancies: "; + print STDERR join(", ", @unmet), "\n"; +} +if (@conflicts) { + print STDERR "$me: Build conflicts: "; + print STDERR join(", ", @conflicts), "\n"; +} +exit 1 if @unmet || @conflicts; + +# This part could be replaced. Silly little status file parser. +# thanks to Matt Zimmerman. Returns two hash references that +# are exactly what the other functions need... +sub parse_status { + my $status=shift || "/var/lib/dpkg/status"; + + my %providers; + my %version; + local $/ = ''; + open(STATUS, "<$status") || die "$status: $!\n"; + while () { + next unless /^Status: .*ok installed$/m; + + my ($package) = /^Package: (.*)$/m; + push @{$providers{$package}}, $package; + ($version{$package}) = /^Version: (.*)$/m; + + if (/^Provides: (.*)$/m) { + foreach (split(/,\s+/, $1)) { + push @{$providers{$_}}, $package; + } + } + } + close STATUS; + + return \%version, \%providers; +} + +# This function checks the build dependancies passed in as the first +# parameter. If they are satisfied, returns false. If they are unsatisfied, +# an list of the unsatisfied depends is returned. +# +# Additional parameters that must be passed: +# * A reference to a hash of all "ok installed" the packages on the system, +# with the hash key being the package name, and the value being the +# installed version. +# * A reference to a hash, where the keys are package names, and the +# value is a true value iff some package installed on the system provides +# that package (all installed packages provide themselves) +# +# Optionally, the architecture the package is to be built for can be passed +# in as the 4th parameter. If not set, dpkg will be queried for the build +# architecture. +sub build_depends { + return check_line(1, @_); +} + +# This function is exactly like unmet_build_depends, except it +# checks for build conflicts, and returns a list of the packages +# that are installed and are conflicted with. +sub build_conflicts { + return check_line(0, @_); +} + +# This function does all the work. The first parameter is 1 to check build +# deps, and 0 to check build conflicts. +sub check_line { + my $build_depends=shift; + my $line=shift; + my %version=%{shift()}; + my %providers=%{shift()}; + my $build_arch=shift || `dpkg --print-architecture`; + chomp $build_arch; + + my @unmet=(); + foreach my $dep (split(/,\s+/, $line)) { + my $ok=0; + my @possibles=(); +ALTERNATE: foreach my $alternate (split(/\s*\|\s*/, $dep)) { + my ($package, $rest)=split(/\s+/, $alternate, 2); + + # Check arch specifications. + if (defined $rest && $rest=~m/\[(.*?)\]/) { + my $arches=lc($1); + my $seen_arch=''; + foreach my $arch (split(' ', $arches)) { + if ($arch eq $build_arch) { + $seen_arch=1; + next; + } + elsif ($arch eq "!$build_arch") { + next ALTERNATE; + } + elsif ($arch =~ /!/) { + # This is equivilant to + # having seen the current arch, + # unless the current arch + # is also listed.. + $seen_arch=1; + } + } + if (! $seen_arch) { + next; + } + } + + # This is a possibile way to meet the dependancy. + # Remove the arch stuff from $alternate. + $alternate=~s/\s+\[.*?\]//; + push @possibles, $alternate; + + # Check version. + if (defined $rest && $rest=~m/\((..)\s+(.*?)\)/) { + my $relation=$1; + my $version=$2; + + if (! exists $version{$package}) { + # Not installed at all, so fail. + next; + } + else { + # Compare installed and needed + # version number. + system("dpkg", "--compare-versions", + $version{$package}, $relation, + $version); + if (($? >> 8) != 0) { + next; # fail + } + } + } + elsif (! defined $providers{$package}) { + # It's not a versioned dependancy, and + # nothing provides it, so fail. + next; + } + + # If we get to here, the dependancy was met. + $ok=1; + } + + if (@possibles && (($build_depends && ! $ok) || + (! $build_depends && $ok))) { + # TODO: this could return a more complex + # data structure instead to save re-parsing. + push @unmet, join (" | ", @possibles); + } + } + + return @unmet; +} diff --git a/debian/heartbeat-2-dev.dirs b/debian/heartbeat-2-dev.dirs new file mode 100644 index 0000000..cd8aa78 --- /dev/null +++ b/debian/heartbeat-2-dev.dirs @@ -0,0 +1,7 @@ +usr/include/clplumbing +usr/include/heartbeat +usr/include/linux-ha +usr/include/ocf +usr/include/pils +usr/include/saf +usr/include/stonith diff --git a/debian/heartbeat-2-dev.files b/debian/heartbeat-2-dev.files new file mode 100644 index 0000000..40aea47 --- /dev/null +++ b/debian/heartbeat-2-dev.files @@ -0,0 +1,138 @@ +usr/include/clplumbing/GSource.h +usr/include/clplumbing/GSource_internal.h +usr/include/clplumbing/Gmain_timeout.h +usr/include/clplumbing/apphb_cs.h +usr/include/clplumbing/base64.h +usr/include/clplumbing/cl_log.h +usr/include/clplumbing/cl_malloc.h +usr/include/clplumbing/cl_misc.h +usr/include/clplumbing/cl_pidfile.h +usr/include/clplumbing/cl_plugin.h +usr/include/clplumbing/cl_poll.h +usr/include/clplumbing/cl_quorum.h +usr/include/clplumbing/cl_quorumd.h +usr/include/clplumbing/cl_random.h +usr/include/clplumbing/cl_signal.h +usr/include/clplumbing/cl_syslog.h +usr/include/clplumbing/cl_tiebreaker.h +usr/include/clplumbing/cl_uuid.h +usr/include/clplumbing/coredumps.h +usr/include/clplumbing/coredumps.h +usr/include/clplumbing/cpulimits.h +usr/include/clplumbing/ipc.h +usr/include/clplumbing/loggingdaemon.h +usr/include/clplumbing/longclock.h +usr/include/clplumbing/lsb_exitcodes.h +usr/include/clplumbing/md5.h +usr/include/clplumbing/mkstemp_mode.h +usr/include/clplumbing/netstring.h +usr/include/clplumbing/proctrack.h +usr/include/clplumbing/realtime.h +usr/include/clplumbing/recoverymgr_cs.h +usr/include/clplumbing/replytrack.h +usr/include/clplumbing/setproctitle.h +usr/include/clplumbing/timers.h +usr/include/clplumbing/uids.h +usr/include/heartbeat/HBauth.h +usr/include/heartbeat/HBcomm.h +usr/include/heartbeat/apphb.h +usr/include/heartbeat/apphb_notify.h +usr/include/heartbeat/compress.h +usr/include/heartbeat/crm/cib.h +usr/include/heartbeat/crm/common/ctrl.h +usr/include/heartbeat/crm/common/ipc.h +usr/include/heartbeat/crm/common/iso8601.h +usr/include/heartbeat/crm/common/msg.h +usr/include/heartbeat/crm/common/util.h +usr/include/heartbeat/crm/common/xml.h +usr/include/heartbeat/crm/crm.h +usr/include/heartbeat/crm/msg_xml.h +usr/include/heartbeat/crm/pengine/common.h +usr/include/heartbeat/crm/pengine/complex.h +usr/include/heartbeat/crm/pengine/rules.h +usr/include/heartbeat/crm/pengine/status.h +usr/include/heartbeat/crm/transition.h +usr/include/heartbeat/fencing/stonithd_api.h +usr/include/heartbeat/fencing/stonithd_msg.h +usr/include/heartbeat/ha_msg.h +usr/include/heartbeat/hb_api.h +usr/include/heartbeat/hb_config.h +usr/include/heartbeat/heartbeat.h +usr/include/heartbeat/lrm/lrm_api.h +usr/include/heartbeat/lrm/lrm_msg.h +usr/include/heartbeat/lrm/racommon.h +usr/include/heartbeat/lrm/raexec.h +usr/include/heartbeat/mgmt/mgmt.h +usr/include/heartbeat/mgmt/mgmt_client.h +usr/include/heartbeat/mgmt/mgmt_common.h +usr/include/heartbeat/mgmt/mgmt_tls.h +usr/include/heartbeat/recoverymgr.h +usr/include/heartbeat/replace_uuid.h +usr/include/ocf/oc_event.h +usr/include/ocf/oc_membership.h +usr/include/pils/generic.h +usr/include/pils/interface.h +usr/include/pils/plugin.h +usr/include/saf/ais.h +usr/include/saf/ais_amf.h +usr/include/saf/ais_base.h +usr/include/saf/ais_checkpoint.h +usr/include/saf/ais_event.h +usr/include/saf/ais_lock.h +usr/include/saf/ais_membership.h +usr/include/saf/ais_message.h +usr/include/stonith/expect.h +usr/include/stonith/st_ttylock.h +usr/include/stonith/stonith.h +usr/include/stonith/stonith_plugin.h +usr/lib64/libapphb.a +usr/lib64/libapphb.la +usr/lib64/libapphb.so +usr/lib64/libccmclient.a +usr/lib64/libccmclient.la +usr/lib64/libccmclient.so +usr/lib64/libcib.a +usr/lib64/libcib.la +usr/lib64/libcib.so +usr/lib64/libclm.a +usr/lib64/libclm.la +usr/lib64/libclm.so +usr/lib64/libcrmcommon.a +usr/lib64/libcrmcommon.la +usr/lib64/libcrmcommon.so +usr/lib64/libhbclient.a +usr/lib64/libhbclient.la +usr/lib64/libhbclient.so +usr/lib64/liblrm.a +usr/lib64/liblrm.la +usr/lib64/liblrm.so +usr/lib64/libpe_rules.a +usr/lib64/libpe_rules.la +usr/lib64/libpe_rules.so +usr/lib64/libpe_status.a +usr/lib64/libpe_status.la +usr/lib64/libpe_status.so +usr/lib64/libpengine.a +usr/lib64/libpengine.la +usr/lib64/libpengine.so +usr/lib64/libpils.a +usr/lib64/libpils.la +usr/lib64/libpils.so +usr/lib64/libplumb.a +usr/lib64/libplumb.la +usr/lib64/libplumb.so +usr/lib64/libplumbgpl.a +usr/lib64/libplumbgpl.la +usr/lib64/libplumbgpl.so +usr/lib64/librecoverymgr.a +usr/lib64/librecoverymgr.la +usr/lib64/librecoverymgr.so +usr/lib64/libstonith.a +usr/lib64/libstonith.la +usr/lib64/libstonith.so +usr/lib64/libstonithd.a +usr/lib64/libstonithd.la +usr/lib64/libstonithd.so +usr/lib64/libtransitioner.a +usr/lib64/libtransitioner.la +usr/lib64/libtransitioner.so diff --git a/debian/heartbeat-2-gui.dirs b/debian/heartbeat-2-gui.dirs new file mode 100644 index 0000000..80607e8 --- /dev/null +++ b/debian/heartbeat-2-gui.dirs @@ -0,0 +1 @@ +usr/lib64/heartbeat-gui diff --git a/debian/heartbeat-2-gui.files b/debian/heartbeat-2-gui.files new file mode 100644 index 0000000..e6fb2de --- /dev/null +++ b/debian/heartbeat-2-gui.files @@ -0,0 +1,26 @@ +usr/bin/hb_gui +usr/lib64/heartbeat-gui/_pymgmt.so +usr/lib64/heartbeat-gui/_pymgmt.so.0 +usr/lib64/heartbeat-gui/_pymgmt.so.0.0.0 +usr/lib64/heartbeat-gui/haclient.py +usr/lib64/heartbeat-gui/pymgmt.py +usr/share/heartbeat-gui/active-node.png +usr/share/heartbeat-gui/add-resource.png +usr/share/heartbeat-gui/cleanup-resource.png +usr/share/heartbeat-gui/default-resource.png +usr/share/heartbeat-gui/down-resource.png +usr/share/heartbeat-gui/exit.png +usr/share/heartbeat-gui/ha.png +usr/share/heartbeat-gui/haclient.glade +usr/share/heartbeat-gui/haclient.py +usr/share/heartbeat-gui/login.png +usr/share/heartbeat-gui/logout.png +usr/share/heartbeat-gui/master-resource.png +usr/share/heartbeat-gui/mgmtcmd.py +usr/share/heartbeat-gui/remove-resource.png +usr/share/heartbeat-gui/slave-resource.png +usr/share/heartbeat-gui/standby-node.png +usr/share/heartbeat-gui/start-resource.png +usr/share/heartbeat-gui/stop-resource.png +usr/share/heartbeat-gui/up-resource.png +usr/share/locale/zh_CN/LC_MESSAGES/haclient.mo diff --git a/debian/heartbeat-2.dirs b/debian/heartbeat-2.dirs new file mode 100644 index 0000000..590ece3 --- /dev/null +++ b/debian/heartbeat-2.dirs @@ -0,0 +1,33 @@ +etc/ha.d +etc/ha.d/conf +etc/ha.d/cts +etc/ha.d/rc.d +etc/ha.d/resource.d +etc/init.d +etc/logrotate.d/ +usr/include/pils +usr/lib64/heartbeat +usr/lib64/heartbeat/plugins +usr/lib64/heartbeat/plugins/AppHBNotification +usr/lib64/heartbeat/plugins/HBauth +usr/lib64/heartbeat/plugins/HBcomm +usr/lib64/heartbeat/plugins/test +usr/lib64/pils/plugins +usr/lib64/pils/plugins/InterfaceMgr +usr/lib64/stonith/ +usr/lib64/stonith/plugins/ +var/lib/heartbeat +var/lib/heartbeat/api +var/lib/heartbeat/casual +var/lib/heartbeat/ccm +var/lib/heartbeat/cores +var/lib/heartbeat/cores/root +var/lib/heartbeat/cores/nobody +var/lib/heartbeat/cores/hacluster +var/lib/heartbeat/crm +var/lib/heartbeat/ckpt +var/lib/heartbeat/pengine +var/lock/subsys +var/run/heartbeat +var/run/heartbeat/ccm +var/run/heartbeat/crm diff --git a/debian/heartbeat-2.files b/debian/heartbeat-2.files new file mode 100644 index 0000000..300e715 --- /dev/null +++ b/debian/heartbeat-2.files @@ -0,0 +1,361 @@ +/etc/ha.d/README.config +/etc/ha.d/harc +/etc/ha.d/rc.d/ask_resources +/etc/ha.d/rc.d/hb_takeover +/etc/ha.d/rc.d/ip-request +/etc/ha.d/rc.d/ip-request-resp +/etc/ha.d/rc.d/status +/etc/ha.d/resource.d/AudibleAlarm +/etc/ha.d/resource.d/Delay +/etc/ha.d/resource.d/Filesystem +/etc/ha.d/resource.d/ICP +/etc/ha.d/resource.d/IPaddr +/etc/ha.d/resource.d/IPaddr2 +/etc/ha.d/resource.d/IPsrcaddr +/etc/ha.d/resource.d/IPv6addr +/etc/ha.d/resource.d/LVM +/etc/ha.d/resource.d/LVSSyncDaemonSwap +/etc/ha.d/resource.d/LinuxSCSI +/etc/ha.d/resource.d/MailTo +/etc/ha.d/resource.d/OCF +/etc/ha.d/resource.d/Raid1 +/etc/ha.d/resource.d/SendArp +/etc/ha.d/resource.d/ServeRAID +/etc/ha.d/resource.d/WAS +/etc/ha.d/resource.d/WinPopup +/etc/ha.d/resource.d/Xinetd +/etc/ha.d/resource.d/apache +/etc/ha.d/resource.d/db2 +/etc/ha.d/resource.d/hto-mapfuncs +/etc/ha.d/resource.d/ids +/etc/ha.d/resource.d/portblock +/etc/ha.d/shellfuncs +/etc/heartbeat +/etc/init.d/heartbeat +/etc/logrotate.d/heartbeat +/etc/pam.d/hbmgmtd +usr/bin/cl_respawn +usr/bin/cl_status +usr/include/clplumbing/cl_reboot.h +usr/lib64/heartbeat/BasicSanityCheck +usr/lib64/heartbeat/ResourceManager +usr/lib64/heartbeat/SNMPAgentSanityCheck +usr/lib64/heartbeat/TestHeartbeatComm +usr/lib64/heartbeat/api_test +usr/lib64/heartbeat/apphbd +usr/lib64/heartbeat/apphbtest +usr/lib64/heartbeat/atest +usr/lib64/heartbeat/attrd +usr/lib64/heartbeat/base64_md5_test +usr/lib64/heartbeat/ccm +usr/lib64/heartbeat/ccm_testclient +usr/lib64/heartbeat/cib +usr/lib64/heartbeat/cibmon +usr/lib64/heartbeat/clmtest +usr/lib64/heartbeat/crm.dtd +usr/lib64/heartbeat/crm_commands.py +usr/lib64/heartbeat/crm_primitive.py +usr/lib64/heartbeat/crm_utils.py +usr/lib64/heartbeat/crmd +usr/lib64/heartbeat/cts +usr/lib64/heartbeat/dopd +usr/lib64/heartbeat/drbd-peer-outdater +usr/lib64/heartbeat/findif +usr/lib64/heartbeat/ha_config +usr/lib64/heartbeat/ha_logd +usr/lib64/heartbeat/ha_logger +usr/lib64/heartbeat/ha_propagate +usr/lib64/heartbeat/haresources2cib.py +usr/lib64/heartbeat/hb_addnode +usr/lib64/heartbeat/hb_delnode +usr/lib64/heartbeat/hb_setsite +usr/lib64/heartbeat/hb_setweight +usr/lib64/heartbeat/hb_standby +usr/lib64/heartbeat/hb_takeover +usr/lib64/heartbeat/hbagent +usr/lib64/heartbeat/heartbeat +usr/lib64/heartbeat/ipctest +usr/lib64/heartbeat/ipctransientclient +usr/lib64/heartbeat/ipctransientserver +usr/lib64/heartbeat/ipfail +usr/lib64/heartbeat/logtest +usr/lib64/heartbeat/lrmadmin +usr/lib64/heartbeat/lrmd +usr/lib64/heartbeat/lrmtest +usr/lib64/heartbeat/mach_down +usr/lib64/heartbeat/mgmtd +usr/lib64/heartbeat/mgmtdtest +usr/lib64/heartbeat/mlock +usr/lib64/heartbeat/ocf-returncodes +usr/lib64/heartbeat/ocf-shellfuncs +usr/lib64/heartbeat/pengine +usr/lib64/heartbeat/pingd +usr/lib64/heartbeat/plugins/AppHBNotification/recmgr.so +usr/lib64/heartbeat/plugins/HBauth/crc.so +usr/lib64/heartbeat/plugins/HBauth/md5.so +usr/lib64/heartbeat/plugins/HBauth/sha1.so +usr/lib64/heartbeat/plugins/HBcomm/bcast.so +usr/lib64/heartbeat/plugins/HBcomm/mcast.so +usr/lib64/heartbeat/plugins/HBcomm/ping.so +usr/lib64/heartbeat/plugins/HBcomm/ping_group.so +usr/lib64/heartbeat/plugins/HBcomm/serial.so +usr/lib64/heartbeat/plugins/HBcomm/ucast.so +usr/lib64/heartbeat/plugins/HBcompress/bz2.so +usr/lib64/heartbeat/plugins/HBcompress/zlib.so +usr/lib64/heartbeat/plugins/RAExec/heartbeat.so +usr/lib64/heartbeat/plugins/RAExec/lsb.so +usr/lib64/heartbeat/plugins/RAExec/ocf.so +usr/lib64/heartbeat/plugins/RAExec/stonith.so +usr/lib64/heartbeat/plugins/quorum/majority.so +usr/lib64/heartbeat/plugins/quorum/quorumd.so +usr/lib64/heartbeat/plugins/quorum/twonodes.so +usr/lib64/heartbeat/plugins/quorum/weight.so +usr/lib64/heartbeat/plugins/quorumd/2_0_8.so +usr/lib64/heartbeat/plugins/test/test.so +usr/lib64/heartbeat/plugins/tiebreaker/twonodes.so +usr/lib64/heartbeat/quorumd +usr/lib64/heartbeat/quorumdtest +usr/lib64/heartbeat/recoverymgrd +usr/lib64/heartbeat/req_resource +usr/lib64/heartbeat/send_arp +usr/lib64/heartbeat/stonithd +usr/lib64/heartbeat/stonithdtest/apitest +usr/lib64/heartbeat/tengine +usr/lib64/heartbeat/transient-test.sh +usr/lib64/heartbeat/ttest +usr/lib64/heartbeat/utillib.sh +usr/lib64/libapphb.so.0 +usr/lib64/libapphb.so.0.0.0 +usr/lib64/libccmclient.so.1 +usr/lib64/libccmclient.so.1.0.0 +usr/lib64/libcib.so.1 +usr/lib64/libcib.so.1.0.1 +usr/lib64/libclm.so.1 +usr/lib64/libclm.so.1.0.0 +usr/lib64/libcrmcommon.so.1 +usr/lib64/libcrmcommon.so.1.0.1 +usr/lib64/libhbclient.so.1 +usr/lib64/libhbclient.so.1.0.0 +usr/lib64/libhbmgmt.so +usr/lib64/libhbmgmt.so.0 +usr/lib64/libhbmgmt.so.0.0.0 +usr/lib64/libhbmgmtclient.so +usr/lib64/libhbmgmtclient.so.0 +usr/lib64/libhbmgmtclient.so.0.0.0 +usr/lib64/libhbmgmtcommon.so +usr/lib64/libhbmgmtcommon.so.0 +usr/lib64/libhbmgmtcommon.so.0.0.0 +usr/lib64/libhbmgmttls.so +usr/lib64/libhbmgmttls.so.0 +usr/lib64/libhbmgmttls.so.0.0.0 +usr/lib64/liblrm.so.0 +usr/lib64/liblrm.so.0.0.0 +usr/lib64/libpe_rules.so.2 +usr/lib64/libpe_rules.so.2.0.0 +usr/lib64/libpe_status.so.2 +usr/lib64/libpe_status.so.2.0.0 +usr/lib64/libpengine.so.3 +usr/lib64/libpengine.so.3.0.0 +usr/lib64/libpils.so.1 +usr/lib64/libpils.so.1.0.0 +usr/lib64/libplumb.so.1 +usr/lib64/libplumb.so.1.0.0 +usr/lib64/libplumbgpl.so.1 +usr/lib64/libplumbgpl.so.1.0.0 +usr/lib64/librecoverymgr.so.1 +usr/lib64/librecoverymgr.so.1.0.0 +usr/lib64/libstonith.so.1 +usr/lib64/libstonith.so.1.0.0 +usr/lib64/libstonithd.so.0 +usr/lib64/libstonithd.so.0.0.0 +usr/lib64/libtransitioner.so.1 +usr/lib64/libtransitioner.so.1.0.0 +usr/lib/ocf/resource.d/heartbeat/.ocf-binaries +usr/lib/ocf/resource.d/heartbeat/.ocf-directories +usr/lib/ocf/resource.d/heartbeat/.ocf-returncodes +usr/lib/ocf/resource.d/heartbeat/.ocf-shellfuncs +usr/lib/ocf/resource.d/heartbeat/AudibleAlarm +usr/lib/ocf/resource.d/heartbeat/ClusterMon +usr/lib/ocf/resource.d/heartbeat/Delay +usr/lib/ocf/resource.d/heartbeat/Dummy +usr/lib/ocf/resource.d/heartbeat/EvmsSCC +usr/lib/ocf/resource.d/heartbeat/Evmsd +usr/lib/ocf/resource.d/heartbeat/Filesystem +usr/lib/ocf/resource.d/heartbeat/ICP +usr/lib/ocf/resource.d/heartbeat/IPaddr +usr/lib/ocf/resource.d/heartbeat/IPaddr2 +usr/lib/ocf/resource.d/heartbeat/IPsrcaddr +usr/lib/ocf/resource.d/heartbeat/IPv6addr +usr/lib/ocf/resource.d/heartbeat/LVM +usr/lib/ocf/resource.d/heartbeat/LinuxSCSI +usr/lib/ocf/resource.d/heartbeat/MailTo +usr/lib/ocf/resource.d/heartbeat/ManageRAID +usr/lib/ocf/resource.d/heartbeat/ManageVE +usr/lib/ocf/resource.d/heartbeat/Pure-FTPd +usr/lib/ocf/resource.d/heartbeat/Raid1 +usr/lib/ocf/resource.d/heartbeat/SAPDatabase +usr/lib/ocf/resource.d/heartbeat/SAPInstance +usr/lib/ocf/resource.d/heartbeat/SendArp +usr/lib/ocf/resource.d/heartbeat/ServeRAID +usr/lib/ocf/resource.d/heartbeat/SphinxSearchDaemon +usr/lib/ocf/resource.d/heartbeat/Stateful +usr/lib/ocf/resource.d/heartbeat/SysInfo +usr/lib/ocf/resource.d/heartbeat/VIPArip +usr/lib/ocf/resource.d/heartbeat/WAS +usr/lib/ocf/resource.d/heartbeat/WAS6 +usr/lib/ocf/resource.d/heartbeat/WinPopup +usr/lib/ocf/resource.d/heartbeat/Xen +usr/lib/ocf/resource.d/heartbeat/Xinetd +usr/lib/ocf/resource.d/heartbeat/apache +usr/lib/ocf/resource.d/heartbeat/db2 +usr/lib/ocf/resource.d/heartbeat/drbd +usr/lib/ocf/resource.d/heartbeat/eDir88 +usr/lib/ocf/resource.d/heartbeat/ids +usr/lib/ocf/resource.d/heartbeat/iscsi +usr/lib/ocf/resource.d/heartbeat/mysql +usr/lib/ocf/resource.d/heartbeat/o2cb +usr/lib/ocf/resource.d/heartbeat/oracle +usr/lib/ocf/resource.d/heartbeat/oralsnr +usr/lib/ocf/resource.d/heartbeat/pgsql +usr/lib/ocf/resource.d/heartbeat/pingd +usr/lib/ocf/resource.d/heartbeat/portblock +usr/lib/ocf/resource.d/heartbeat/rsyncd +usr/lib/ocf/resource.d/heartbeat/tomcat +usr/lib64/pils/plugins/InterfaceMgr/generic.so +usr/lib64/stonith/plugins/external/ibmrsa +usr/lib64/stonith/plugins/external/ibmrsa-telnet +usr/lib64/stonith/plugins/external/ipmi +usr/lib64/stonith/plugins/external/rackpdu +usr/lib64/stonith/plugins/external/riloe +usr/lib64/stonith/plugins/external/ssh +usr/lib64/stonith/plugins/external/vmware +usr/lib64/stonith/plugins/stonith2/apcmaster.so +usr/lib64/stonith/plugins/stonith2/apcmastersnmp.so +usr/lib64/stonith/plugins/stonith2/apcsmart.so +usr/lib64/stonith/plugins/stonith2/baytech.so +usr/lib64/stonith/plugins/stonith2/bladehpi.so +usr/lib64/stonith/plugins/stonith2/cyclades.so +usr/lib64/stonith/plugins/stonith2/drac3.so +usr/lib64/stonith/plugins/stonith2/external.so +usr/lib64/stonith/plugins/stonith2/ibmhmc.so +usr/lib64/stonith/plugins/stonith2/meatware.so +usr/lib64/stonith/plugins/stonith2/null.so +usr/lib64/stonith/plugins/stonith2/nw_rpc100s.so +usr/lib64/stonith/plugins/stonith2/rcd_serial.so +usr/lib64/stonith/plugins/stonith2/ribcl.py +usr/lib64/stonith/plugins/stonith2/rps10.so +usr/lib64/stonith/plugins/stonith2/ssh.so +usr/lib64/stonith/plugins/stonith2/suicide.so +usr/lib64/stonith/plugins/stonith2/wti_nps.so +usr/sbin/attrd_updater +usr/sbin/ccm_tool +usr/sbin/cibadmin +usr/sbin/ciblint +usr/sbin/crm_attribute +usr/sbin/crm_diff +usr/sbin/crm_failcount +usr/sbin/crm_master +usr/sbin/crm_mon +usr/sbin/crm_resource +usr/sbin/crm_sh +usr/sbin/crm_standby +usr/sbin/crm_uuid +usr/sbin/crm_verify +usr/sbin/crmadmin +usr/sbin/ha_logger +usr/sbin/hb_report +usr/sbin/iso8601 +usr/sbin/meatclient +usr/sbin/ocf-tester +usr/sbin/ptest +usr/sbin/stonith +usr/share/doc/heartbeat/AUTHORS +usr/share/doc/heartbeat/DirectoryMap.txt +usr/share/doc/heartbeat/GettingStarted.html +usr/share/doc/heartbeat/GettingStarted.txt +usr/share/doc/heartbeat/HardwareGuide.html +usr/share/doc/heartbeat/HardwareGuide.txt +usr/share/doc/heartbeat/README +usr/share/doc/heartbeat/README.cts +usr/share/doc/heartbeat/Requirements.html +usr/share/doc/heartbeat/Requirements.txt +usr/share/doc/heartbeat/apphbd.cf +usr/share/doc/heartbeat/authkeys +usr/share/doc/heartbeat/faqntips.html +usr/share/doc/heartbeat/faqntips.txt +usr/share/doc/heartbeat/ha.cf +usr/share/doc/heartbeat/haresources +usr/share/doc/heartbeat/hb_report.html +usr/share/doc/heartbeat/hb_report.txt +usr/share/doc/heartbeat/heartbeat_api.html +usr/share/doc/heartbeat/heartbeat_api.txt +usr/share/doc/heartbeat/logd.cf +usr/share/doc/heartbeat/rsync.html +usr/share/doc/heartbeat/rsync.txt +usr/share/doc/heartbeat/startstop +usr/share/heartbeat/BasicSanityCheck +usr/share/heartbeat/ResourceManager +usr/share/heartbeat/SNMPAgentSanityCheck +usr/share/heartbeat/TestHeartbeatComm +usr/share/heartbeat/crm.dtd +usr/share/heartbeat/cts/CIB.py +usr/share/heartbeat/cts/CM_LinuxHAv2.py +usr/share/heartbeat/cts/CM_fs.py +usr/share/heartbeat/cts/CM_hb.py +usr/share/heartbeat/cts/CTS.py +usr/share/heartbeat/cts/CTSaudits.py +usr/share/heartbeat/cts/CTSlab.py +usr/share/heartbeat/cts/CTSproxy.py +usr/share/heartbeat/cts/CTStests.py +usr/share/heartbeat/cts/LSBDummy +usr/share/heartbeat/cts/OCFIPraTest.py +usr/share/heartbeat/cts/extracttests.py +usr/share/heartbeat/cts/getpeinputs.sh +usr/share/heartbeat/ha_config +usr/share/heartbeat/ha_propagate +usr/share/heartbeat/hb_addnode +usr/share/heartbeat/hb_delnode +usr/share/heartbeat/hb_setsite +usr/share/heartbeat/hb_setweight +usr/share/heartbeat/hb_standby +usr/share/heartbeat/hb_takeover +usr/share/heartbeat/lrmtest/LRMBasicSanityCheck +usr/share/heartbeat/lrmtest/README.regression +usr/share/heartbeat/lrmtest/defaults +usr/share/heartbeat/lrmtest/descriptions +usr/share/heartbeat/lrmtest/evaltest.sh +usr/share/heartbeat/lrmtest/language +usr/share/heartbeat/lrmtest/lrmadmin-interface +usr/share/heartbeat/lrmtest/lrmregtest +usr/share/heartbeat/lrmtest/lrmregtest-heartbeat +usr/share/heartbeat/lrmtest/lrmregtest-lsb +usr/share/heartbeat/lrmtest/regression.sh +usr/share/heartbeat/lrmtest/testcases/BSC +usr/share/heartbeat/lrmtest/testcases/common.filter +usr/share/heartbeat/lrmtest/testcases/metadata +usr/share/heartbeat/lrmtest/testcases/metadata.exp +usr/share/heartbeat/lrmtest/testcases/ra-list.sh +usr/share/heartbeat/lrmtest/testcases/rscexec +usr/share/heartbeat/lrmtest/testcases/rscexec.exp +usr/share/heartbeat/lrmtest/testcases/rscmgmt +usr/share/heartbeat/lrmtest/testcases/rscmgmt.exp +usr/share/heartbeat/lrmtest/testcases/rscmgmt.log_filter +usr/share/heartbeat/lrmtest/testcases/xmllint.sh +usr/share/heartbeat/mach_down +usr/share/heartbeat/req_resource +usr/share/heartbeat/stonithdtest/STONITHDBasicSanityCheck +usr/share/heartbeat/utillib.sh +usr/share/man/man1/cl_status.1.gz +usr/share/man/man1/ha_logger.1.gz +usr/share/man/man1/hb_addnode.1.gz +usr/share/man/man1/hb_delnode.1.gz +usr/share/man/man1/hb_standby.1.gz +usr/share/man/man1/hb_takeover.1.gz +usr/share/man/man8/apphbd.8.gz +usr/share/man/man8/cibadmin.8.gz +usr/share/man/man8/crm_resource.8.gz +usr/share/man/man8/ha_logd.8.gz +usr/share/man/man8/heartbeat.8.gz +usr/share/man/man8/meatclient.8.gz +usr/share/man/man8/stonith.8.gz +usr/share/snmp/mibs/LINUX-HA-MIB.mib diff --git a/debian/heartbeat-2.postinst b/debian/heartbeat-2.postinst new file mode 100644 index 0000000..bead368 --- /dev/null +++ b/debian/heartbeat-2.postinst @@ -0,0 +1,102 @@ +#!/bin/sh +# +# License: GNU General Public License (GPL) +# +# postinst script for heartbeat +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# + +case "$1" in + configure) + if ! getent group haclient > /dev/null ; then + addgroup --system --group haclient > /dev/null + fi + if ! getent passwd hacluster > /dev/null ; then + adduser --system --no-create-home \ + --ingroup haclient \ + --gecos "Heartbeat System Account" \ + --no-create-home --disabled-login \ + --home /usr/lib64/heartbeat --shell /bin/false \ + --disabled-password hacluster > /dev/null + fi + + # + #fifo (0600, root, root) + # + rm -f /var/lib/heartbeat/fifo + mknod -m 0600 /var/lib/heartbeat/fifo p + + for i in /var/lib/heartbeat/ccm /var/lib/heartbeat/crm \ + /var/run/heartbeat/ccm /var/run/heartbeat/crm \ + /var/lib/heartbeat/pengine; do + chmod 750 $i + chown hacluster $i + chgrp haclient $i + done + + + chgrp haclient /usr/bin/cl_status + chmod 2555 /usr/bin/cl_status + + for i in root nobody hacluster; do + chmod 700 /var/lib/heartbeat/cores/$i + chown $i /var/lib/heartbeat/cores/$i + chgrp root /var/lib/heartbeat/cores/$i + done + + # Do we want to move the old S20 symlinks to S75 ones? + if [ -n "$2" ] ; then + if `dpkg --compare-versions "$2" lt 1.0.4-2`; then + # use debconf + . /usr/share/debconf/confmodule + db_get heartbeat/change_init || RET="false" + if [ "$RET" = "true" ]; then + /usr/sbin/update-rc.d -f heartbeat remove > /dev/null + fi + db_stop + fi + fi + update-rc.d heartbeat start 75 2 3 4 5 . stop 05 0 1 6 . >/dev/null || true + + ldconfig + + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d heartbeat start || true + else + /etc/init.d/heartbeat start || true + fi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + # restart heartbeat + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d heartbeat start || true + else + /etc/init.d/heartbeat start || true + fi + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/heartbeat-2.postrm b/debian/heartbeat-2.postrm new file mode 100644 index 0000000..aab7a20 --- /dev/null +++ b/debian/heartbeat-2.postrm @@ -0,0 +1,33 @@ +#! /bin/sh +# +# License: GNU General Public License (GPL) +# +# postrm script for heartbeat +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `remove' +# * `purge' +# * `upgrade' +# * `failed-upgrade' +# * `abort-install' +# * `abort-install' +# * `abort-upgrade' +# * `disappear' overwrit>r> +# for details, see /usr/doc/packaging-manual/ + +if [ "$1" = "remove" ]; then + ldconfig + update-rc.d -f heartbeat remove >/dev/null + rm -f /var/lib/heartbeat/fifo +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + + diff --git a/debian/heartbeat-2.preinst b/debian/heartbeat-2.preinst new file mode 100644 index 0000000..3d41489 --- /dev/null +++ b/debian/heartbeat-2.preinst @@ -0,0 +1,22 @@ +#!/bin/sh +# +# License: GNU General Public License (GPL) +# +# postinst script for heartbeat +# +# see: dh_installdeb(1) + +if [ -x /etc/init.d/heartbeat ]; then + if which invoke-rc.d >/dev/null 2>&1; then + invoke-rc.d heartbeat stop + else + /etc/init.d/heartbeat stop + fi +fi + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/heartbeat-2.prerm b/debian/heartbeat-2.prerm new file mode 100644 index 0000000..8d7caba --- /dev/null +++ b/debian/heartbeat-2.prerm @@ -0,0 +1,36 @@ +#! /bin/sh +# +# License: GNU General Public License (GPL) +# +# postrm script for heartbeat +# +# see: dh_installdeb(1) + +set -e + +# It should be safe to remove these +# As they are no longer provided by any package + +rm -f /usr/lib64/heartbeat/cts/CIB.pyc +rm -f /usr/lib64/heartbeat/cts/CM_LinuxHAv2.pyc +rm -f /usr/lib64/heartbeat/cts/CM_fs.pyc +rm -f /usr/lib64/heartbeat/cts/CM_hb.pyc +rm -f /usr/lib64/heartbeat/cts/CTS.pyc +rm -f /usr/lib64/heartbeat/cts/CTSaudits.pyc +rm -f /usr/lib64/heartbeat/cts/CTSlab.pyc +rm -f /usr/lib64/heartbeat/cts/CTSproxy.pyc +rm -f /usr/lib64/heartbeat/cts/CTStests.pyc +rm -f /usr/lib64/heartbeat/cts/OCFIPraTest.pyc +rm -f /usr/lib64/heartbeat/cts/extracttests.pyc +rm -f /usr/lib64/heartbeat/haclient.pyc +rm -f /usr/lib64/heartbeat/haresources2cib.pyc +rm -f /usr/lib64/heartbeat/mgmtcmd.pyc +rm -f /usr/lib64/heartbeat/pymgmt.pyc +rm -f /usr/lib64/stonith/plugins/stonith2/ribcl.pyc + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + + diff --git a/debian/ldirectord.files b/debian/ldirectord.files new file mode 100644 index 0000000..d0725e8 --- /dev/null +++ b/debian/ldirectord.files @@ -0,0 +1,8 @@ +/etc/ha.d/resource.d/ldirectord +/etc/init.d/ldirectord +/etc/default/ldirectord +/etc/logrotate.d/ldirectord +usr/lib/ocf/resource.d/heartbeat/ldirectord +usr/sbin/ldirectord +usr/share/doc/ldirectord/ldirectord.cf +usr/share/man/man8/ldirectord.8.gz diff --git a/debian/ldirectord.postinst b/debian/ldirectord.postinst new file mode 100644 index 0000000..acd1b17 --- /dev/null +++ b/debian/ldirectord.postinst @@ -0,0 +1,47 @@ +#! /bin/sh +# +# License: GNU General Public License (GPL) +# +# postinst script for ldirectord +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see /usr/doc/packaging-manual/ +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + update-rc.d ldirectord defaults >/dev/null + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/debian/patches/IPv6addr-64.patch b/debian/patches/IPv6addr-64.patch new file mode 100644 index 0000000..f4d073b --- /dev/null +++ b/debian/patches/IPv6addr-64.patch @@ -0,0 +1,75 @@ +# HG changeset patch +# User Philipp Kolmann +# Date 1235094639 -39600 +# Node ID 6d5f0f600c0b2147490af0c5e592fc995336902a +# Parent 4a4773bb2ea42046e24f6d6c3b6ff2eb6f105c41 +IPv6addr fails on /64 prefixes + +Hi Simon, + +it seems I am the one unlucky guy who uses heartbeat with IPv6.... + +I started updateing my cluster today to lenny and IPv6addr fails again: + +scs1:/etc/heartbeat/resource.d# ./IPv6addr 2001:629:3800:33:0:0:0:122 start +2009/02/16_20:19:50 ERROR: Generic error +ERROR: Generic error + + +I dug into the source of IPv6addr.c and it seems that the mask is too long +and therefore the scan_if isn't matching. + +I have a 2001:629:3800:33::/64 subnet but it seems from my debug output +that IPv6addr tries to match /96 bits of the IP address which fails. + +My C knowledge is sadly too little to fix this myself. + +I would greatly be happy if you could help me with that. + +------------------------------------------------------------------------------ + +Hi, + +we found some discussion about this issue here: + +http://www.velocityreviews.com/forums/t283343-shifting-bits-shift-32-bits-on-32-bit-int.html + +In post #4 it reads: +The behaviour of shifts defined only if the value of the right operand +is less than the number of bits in the left operand. So shifting a +32-bit value by 32 or more is undefined... + +further info in #7: + +Better yet, read the first part of section 5.8 of the ISO/IEC 14882:2003 +standard: + +The behavior is undefined if the right operand is negative, +or greater than or equal to the length in bits of the +promoted left operand. + +So it seems that my patch is the proper fix in the end after all. +Attached as file, since BT distroyed the formatting. + +------------------------------------------------------------------------------- + +This bug was reported as Debian bug #515662 +http://bugs.debian.org/515662 + +Signed-off-by: Simon Horman + +diff -r 4a4773bb2ea4 -r 6d5f0f600c0b resources/OCF/IPv6addr.c +--- a/resources/OCF/IPv6addr.c Tue Feb 17 13:34:34 2009 +0100 ++++ b/resources/OCF/IPv6addr.c Fri Feb 20 12:50:39 2009 +1100 +@@ -499,7 +499,10 @@ + n = plen / 32; + memset(mask.s6_addr32 + n + 1, 0, (3 - n) * 4); + s = 32 - plen % 32; +- mask.s6_addr32[n] = 0xffffffff << s; ++ if (s == 32) ++ mask.s6_addr32[n] = 0x0; ++ else ++ mask.s6_addr32[n] = 0xffffffff << s; + mask.s6_addr32[n] = htonl(mask.s6_addr32[n]); + } + diff --git a/debian/patches/SphinxSearchDaemon.install.patch b/debian/patches/SphinxSearchDaemon.install.patch new file mode 100644 index 0000000..113389f --- /dev/null +++ b/debian/patches/SphinxSearchDaemon.install.patch @@ -0,0 +1,28 @@ +Date: Thu, 27 Dec 2007 09:40:43 +0900 +From: DAIKI MATSUDA +To: High-Availability Linux Development List +Subject: OCF-resources: SphinxSearchDaemon is not installed + +Hi, All. + +Congratulations to release Heartbeat 2.1.3. + +I read Alan's release mail and made own rpm package. So, I was aware +of difference that SphinxSearchDaemon RA is not installed. And I +attached the simply patch file and please confirm. + +Cc: DAIKI MATSUDA +Signed-off-by: Simon Horman + +Index: heartbeat/resources/OCF/Makefile.am +=================================================================== +--- heartbeat.orig/resources/OCF/Makefile.am 2007-11-30 16:15:19.000000000 +0900 ++++ heartbeat/resources/OCF/Makefile.am 2008-01-08 13:16:50.000000000 +0900 +@@ -76,6 +76,7 @@ ocf_SCRIPTS = ClusterMon \ + SAPInstance \ + SendArp \ + ServeRAID \ ++ SphinxSearchDaemon \ + Stateful \ + SysInfo \ + tomcat \ diff --git a/debian/patches/SphinxSearchDaemon.patch b/debian/patches/SphinxSearchDaemon.patch new file mode 100644 index 0000000..a2ce2ac --- /dev/null +++ b/debian/patches/SphinxSearchDaemon.patch @@ -0,0 +1,225 @@ +--- /dev/null 2007-11-12 10:15:50.332049316 +0900 ++++ a/resources/OCF/SphinxSearchDaemon 2007-11-29 16:49:13.000000000 +0900 +@@ -0,0 +1,222 @@ ++#!/bin/sh ++# ++# ++# Searchd OCF RA. ++# Manages the Sphinx search daemon ++# ++# Copyright (c) 2007 Christian Rishoj (christian@rishoj.net) ++# All Rights Reserved. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of version 2 of the GNU General Public License as ++# published by the Free Software Foundation. ++# ++# This program is distributed in the hope that it would be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++# ++# Further, this software is distributed without any warranty that it is ++# free of the rightful claim of any third person regarding infringement ++# or the like. Any license provided herein, whether implied or ++# otherwise, applies only to this software file. Patent licenses, if ++# any, provided herein do not apply to combinations of this program with ++# other software, or any other product whatsoever. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write the Free Software Foundation, ++# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. ++# ++ ++####################################################################### ++# Initialization: ++ ++. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs ++ ++####################################################################### ++ ++meta_data() { ++ cat < ++ ++ ++1.0 ++ ++ ++This is a searchd Resource Agent. It manages the Sphinx Search Daemon. ++ ++searchd resource agent ++ ++ ++ ++ ++ ++searchd configuration file ++ ++Configuration file ++ ++ ++ ++ ++ ++searchd binary ++ ++searchd binary ++ ++ ++ ++ ++ ++Search binary for functional testing in the monitor action. ++ ++search binary ++ ++ ++ ++ ++ ++Test query for functional testing in the monitor action. ++The query does not need to match any documents in the index. ++The purpose is merely to test whether the search daemon is ++is able to query its indices and respond properly. ++ ++test query ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++END ++} ++ ++####################################################################### ++ ++searchd_usage() { ++ cat < /dev/null && [ `ps -p "$1" | grep searchd | wc -l` -eq 1 ] ++} ++ ++searchd_status() { ++ pidfile=`grep -v "^#" "$OCF_RESKEY_config" | grep -w pid_file | awk -F "[ \t]*=[ \t]*" '{ print $2 }'` ++ if [ -f "$pidfile" ] ; then ++ PID=`head -n 1 $pidfile` ++ if [ ! -z "$PID" ] ; then ++ isRunning "$PID" ++ if [ $? = 0 ] ; then ++ return 0 ++ fi ++ fi ++ fi ++ false ++} ++ ++searchd_check() { ++ $OCF_RESKEY_search --config $OCF_RESKEY_config --noinfo "$OCF_RESKEY_testQuery" > /dev/null ++} ++ ++searchd_monitor() { ++ if ! searchd_validate ; then ++ return $OCF_NOT_RUNNING ++ fi ++ if searchd_status ; then ++ if searchd_check ; then ++ return $OCF_RUNNING ++ else ++ return $OCF_ERR_GENERIC ++ fi ++ else ++ return $OCF_NOT_RUNNING ++ fi ++} ++ ++searchd_validate() { ++ if [ ! -x "$OCF_RESKEY_search" ]; then ++ ocf_log err "search binary '$OCF_RESKEY_search' does not exist or cannot be executed" ++ return $OCF_ERR_ARGS ++ fi ++ ++ if [ ! -x "$OCF_RESKEY_searchd" ]; then ++ ocf_log err "searchd binary '$OCF_RESKEY_searchd' does not exist or cannot be executed" ++ return $OCF_ERR_ARGS ++ fi ++ ++ if [ ! -f "$OCF_RESKEY_config" ]; then ++ ocf_log err "config file '$OCF_RESKEY_config' does not exist" ++ return $OCF_ERR_ARGS ++ fi ++ ++ return $OCF_SUCCESS ++} ++ ++: ${OCF_RESKEY_config=/etc/sphinx/sphinx.conf} ++: ${OCF_RESKEY_search=/usr/local/bin/search} ++: ${OCF_RESKEY_searchd=/usr/local/bin/searchd} ++: ${OCF_RESKEY_testQuery=Heartbeat_Monitor_Query_Match_string} ++ ++case $__OCF_ACTION in ++meta-data) meta_data ++ exit $OCF_SUCCESS ++ ;; ++start) searchd_start;; ++stop) searchd_stop;; ++monitor) searchd_monitor;; ++validate-all) searchd_validate;; ++usage|help) searchd_usage ++ exit $OCF_SUCCESS ++ ;; ++*) searchd_usage ++ exit $OCF_ERR_UNIMPLEMENTED ++ ;; ++esac ++rc=$? ++ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc" ++exit $rc ++ diff --git a/debian/patches/bashisms.patch b/debian/patches/bashisms.patch new file mode 100644 index 0000000..858843e --- /dev/null +++ b/debian/patches/bashisms.patch @@ -0,0 +1,69 @@ +Remove bashisms in ocf-tester, hb_report and heartbeat's init script + +Debian bug #464985 +See: http://bugs.debian.org/464985 + +In the case of the use of "echo -e" in ocf-tester, the -e flag doesn't +exist in dash and it interpates escaape sequences by default. Bash on the +other hand has the -e flag and may or may not interprate escape sequences +by default. In any case, it seems that it is never called with a string +that includes escape sequences, so it is safe just to remove -e. + +In the case of the use of cnt=$((cnt + 1) in hb_report, +it seems that cnt=$(($cnt + 1) is the non-bashish way to do this. + +And in the case of the use of cmd &> /dev/null in heartbeat's init +script, it seems that cmd >/dev/null 2>&1 is the non-bashish way +to do this. + +Signed-off-by: Simon Horman + + +Index: heartbeat/heartbeat/init.d/heartbeat.in +=================================================================== +--- heartbeat.orig/heartbeat/init.d/heartbeat.in 2008-02-15 18:24:28.000000000 +0900 ++++ heartbeat/heartbeat/init.d/heartbeat.in 2008-02-15 18:26:13.000000000 +0900 +@@ -346,7 +346,7 @@ StopHA() { + EchoNoNl "Stopping High-Availability services: " + + if +- $HA_BIN/heartbeat -k &> /dev/null # Kill it ++ $HA_BIN/heartbeat -k >/dev/null 2>&1 # Kill it + then + echo_success + return 0 +Index: heartbeat/tools/hb_report.in +=================================================================== +--- heartbeat.orig/tools/hb_report.in 2008-02-15 18:22:19.000000000 +0900 ++++ heartbeat/tools/hb_report.in 2008-02-15 18:24:11.000000000 +0900 +@@ -416,7 +416,7 @@ analyze_one() { + for n in `getnodes`; do + if [ "$node0" ]; then + diffcheck $1/$node0/$2 $1/$n/$2 +- rc=$((rc+$?)) ++ rc=$(($rc+$?)) + else + node0=$n + fi +@@ -557,7 +557,7 @@ if [ "$SLAVE" = "" ]; then + [?]) usage short;; + esac + done +- shift $((OPTIND-1)) ++ shift $(($OPTIND-1)) + [ $# -ne 1 ] && usage short + DESTDIR=`echo $1 | sed 's,/*$,,'` + chkdirname $DESTDIR +Index: heartbeat/tools/ocf-tester.in +=================================================================== +--- heartbeat.orig/tools/ocf-tester.in 2008-02-15 17:48:54.000000000 +0900 ++++ heartbeat/tools/ocf-tester.in 2008-02-15 18:22:01.000000000 +0900 +@@ -44,7 +44,7 @@ assert() { + exit_code=$1; shift + if [ $rc -ne $target ]; then + num_errors=`expr $num_errors + 1` +- echo -e "* rc=$rc: $msg" ++ echo "* rc=$rc: $msg" + if [ ! -z $exit_code ]; then + echo "Aborting tests" + exit $exit_code diff --git a/debian/patches/dopd-fix-basic-failover-fix-hb-message-corruption-by-fprintf_stderr_.patch b/debian/patches/dopd-fix-basic-failover-fix-hb-message-corruption-by-fprintf_stderr_.patch new file mode 100644 index 0000000..8af4813 --- /dev/null +++ b/debian/patches/dopd-fix-basic-failover-fix-hb-message-corruption-by-fprintf_stderr_.patch @@ -0,0 +1,110 @@ +# HG changeset patch +# User Rasto Levrinc +# Date 1206539836 -3600 +# Node ID 47f60bebe7b25abd88ea7b5488e66dfe187416ae +# Parent 17c0cf487322287d0689a036c32f21b900ce5a80 +dopd: fix basic failover; fix hb message corruption by fprintf(stderr) + +check_drbd_peer() used to return FALSE for "node name not in node list", +so drbd-peer-outdater returned "invalid nodename". +Then the semantic changed, and check_drbd_peer learned about "dead" peers +and returned FALSE for them as well. Which made basic failover impossible :( + +The return code was now changed to "peer unreachable" for a dead peer. +And even for nodes which really are not in the host list (and thus could be +classified as invalide), because, after all, thats what they are. +unreachable. + +Node name comparison needs to be case insensitive; fixed. + +During testing with 15 concurrent drbd resources several dopd crashes have been +observed, which after some debugging turned out to be simply a wrong assumption +about the global availability of stderr: some fprintf(stderr, "debug message") +had accidentally used the heartbeat communication channel file descriptor, +which seriously confused the comm layer. +All those fprintfs have now been changed to use cl_log. + +diff -r 17c0cf487322 -r 47f60bebe7b2 contrib/drbd-outdate-peer/dopd.c +--- a/contrib/drbd-outdate-peer/dopd.c Mon Mar 24 16:14:12 2008 +0100 ++++ b/contrib/drbd-outdate-peer/dopd.c Wed Mar 26 14:57:16 2008 +0100 +@@ -202,14 +202,17 @@ + } + + /* check_drbd_peer() +- * walk the nodes and return TRUE if peer is not this node and it exists. ++ * walk the nodes and return ++ * FALSE if peer is not found, not a "normal" node, or "dead" ++ * (no point in trying to reach those nodes). ++ * TRUE if peer is found to be alive and "normal". + */ + gboolean + check_drbd_peer(const char *drbd_peer) + { + const char *node; + gboolean found = FALSE; +- if (!strcmp(drbd_peer, node_name)) { ++ if (!strcasecmp(drbd_peer, node_name)) { + cl_log(LOG_WARNING, "drbd peer node %s is me!\n", drbd_peer); + return FALSE; + } +@@ -306,9 +309,9 @@ + } else + pthread_mutex_unlock(&conn_mutex); + } else { +- /* wrong peer was specified, +- send return code 20 to the client */ +- send_to_client(curr_client, "20"); ++ /* peer "dead" or not in node list. ++ * return "peer could not be reached" */ ++ send_to_client(curr_client, "5"); + } + + ha_msg_del(msg); +diff -r 17c0cf487322 -r 47f60bebe7b2 contrib/drbd-outdate-peer/drbd-peer-outdater.c +--- a/contrib/drbd-outdate-peer/drbd-peer-outdater.c Mon Mar 24 16:14:12 2008 +0100 ++++ b/contrib/drbd-outdate-peer/drbd-peer-outdater.c Wed Mar 26 14:57:16 2008 +0100 +@@ -76,7 +76,7 @@ + + msg = msgfromIPC_noauth(server); + if (!msg) { +- fprintf(stderr, "no message from server or other " ++ cl_log(LOG_WARNING, "no message from server or other " + "instance is running\n"); + if (client->mainloop != NULL && + g_main_is_running(client->mainloop)) +@@ -92,7 +92,7 @@ + errno = 0; + rc = strtol(rc_string, &ep, 10); + if (errno != 0 || *ep != EOS) { +- fprintf(stderr, "unknown message: %s from server", rc_string); ++ cl_log(LOG_WARNING, "unknown message: %s from server", rc_string); + client->rc = 20; /* "officially undefined", unspecified error */ + ha_msg_del(msg); + if (client->mainloop != NULL && +@@ -124,7 +124,7 @@ + outdater_timeout_dispatch(gpointer user_data) + { + dop_client_t *client = (dop_client_t *)user_data; +- fprintf(stderr, "error: could not connect to dopd after %i seconds" ++ cl_log(LOG_WARNING, "error: could not connect to dopd after %i seconds" + ": timeout reached\n", client->timeout); + if (client->mainloop != NULL && g_main_is_running(client->mainloop)) + g_main_quit(client->mainloop); +@@ -255,7 +255,7 @@ + (gpointer)new_client, &ipc_server); + + if (ipc_server == NULL) { +- fprintf(stderr, "Could not connect to "T_OUTDATER" channel\n"); ++ cl_log(LOG_WARNING, "Could not connect to "T_OUTDATER" channel\n"); + dop_exit(new_client); /* unreachable */ + } + +@@ -267,7 +267,7 @@ + ha_msg_add(update, F_OUTDATER_RES, drbd_resource); + + if (msg2ipcchan(update, ipc_server) != HA_OK) { +- fprintf(stderr, "Could not send message\n"); ++ cl_log(LOG_WARNING, "Could not send message\n"); + dop_exit(new_client); + } + diff --git a/debian/patches/init-ntp.patch b/debian/patches/init-ntp.patch new file mode 100644 index 0000000..8d055f2 --- /dev/null +++ b/debian/patches/init-ntp.patch @@ -0,0 +1,23 @@ +From: Simon Horman +To: Petter Reinholdtsen , 459497@bugs.debian.org +Cc: linux-ha-dev@lists.linux-ha.org +Subject: [patch] init: no need to start ntp as $time is a required-start + +See http://wiki.debian.org/LSBInitScripts + +Cc: Petter Reinholdtsen +Signed-off-by: Simon Horman + +Index: heartbeat/heartbeat/init.d/heartbeat.in +=================================================================== +--- heartbeat.orig/heartbeat/init.d/heartbeat.in 2008-01-08 11:56:04.000000000 +0900 ++++ heartbeat/heartbeat/init.d/heartbeat.in 2008-01-08 11:57:15.000000000 +0900 +@@ -37,7 +37,7 @@ + # Short-Description: High-availability services. + # Provides: heartbeat HA + # Required-Start: $remote_fs $network $time $syslog +-# Should-Start: ntp openhpid ++# Should-Start: openhpid + # Required-Stop: $remote_fs $network $time $syslog + # Should-stop: openhpid + # Default-Start: 2 3 4 5 diff --git a/debian/patches/init-openhpid.patch b/debian/patches/init-openhpid.patch new file mode 100644 index 0000000..9323c24 --- /dev/null +++ b/debian/patches/init-openhpid.patch @@ -0,0 +1,45 @@ +Subject: init: should-start/stop $remote_fs to init script +From: Simon Horman +To: Petter Reinholdtsen , 459497@bugs.debian.org +Cc: linux-ha-dev@lists.linux-ha.org +Subject: [patch] init: add should-start/stop $remote_fs to init script +In-Reply-To: <2fly7b261cx.fsf@saruman.uio.no> + +On Sun, Jan 06, 2008 at 11:22:22PM +0100, Petter Reinholdtsen wrote: + +[snip] + +> I notice the package depend on openhpid. If heartbeat need openhpid +> to start before it in the boot, it should list it in required-start or +> should-start, depending on how hard the dependency should be. And the +> same in required-stop or should-stop, if heartbeat need to stop before +> openhpid during shutdown. I do not know the package enough to say. + +Hi Petter, + +I've looked into this breifly and I believe that the short answer is yes. + +It seems that in Debian openhpid is a recomemdation of libopenhpi2 which +is a dependancy of heartbeat, and thus using should-start/should-stop in +the init script would be the most appropriate option. This should also +nicely cover other distributions with a loose package dependancy on +openhpid (the script in question is generic IIRC). + +Acked-by: Petter Reinholdtsen +Signed-off-by: Simon Horman + +Index: heartbeat/heartbeat/init.d/heartbeat.in +=================================================================== +--- heartbeat.orig/heartbeat/init.d/heartbeat.in 2008-01-07 11:53:23.000000000 +0900 ++++ heartbeat/heartbeat/init.d/heartbeat.in 2008-01-07 11:54:17.000000000 +0900 +@@ -37,8 +37,9 @@ + # Short-Description: High-availability services. + # Provides: heartbeat HA + # Required-Start: $remote_fs $network $time $syslog +-# Should-Start: ntp ++# Should-Start: ntp openhpid + # Required-Stop: $remote_fs $network $time $syslog ++# Should-stop: openhpid + # Default-Start: 2 3 4 5 + # Default-Stop: 0 1 6 + ### END INIT INFO diff --git a/debian/patches/init-remote_fs.patch b/debian/patches/init-remote_fs.patch new file mode 100644 index 0000000..602113d --- /dev/null +++ b/debian/patches/init-remote_fs.patch @@ -0,0 +1,108 @@ +From horms Mon Jan 7 01:27:37 2008 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.2.1-kirsty.vergenet.net_2007012401 + (2007-05-02) on kirsty.vergenet.net +X-Spam-Level: +X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00 autolearn=ham + version=3.2.1-kirsty.vergenet.net_2007012401 +X-Original-To: horms@verge.net.au +Delivered-To: horms@vergenet.net +Received: from mail.au.vergenet.net [202.4.237.240] + by tabatha.lab.ultramonkey.org with POP3 (fetchmail-6.3.8) + for (single-drop); Mon, 07 Jan 2008 10:27:37 +0900 (JST) +Received: from rietz.debian.org (rietz.debian.org [140.211.166.43]) + by kirsty.vergenet.net (Postfix) with ESMTP id 5E7CA24060 + for ; Mon, 7 Jan 2008 09:39:43 +1100 (EST) +Received: from debbugs by rietz.debian.org with local (Exim 4.63) + (envelope-from ) + id 1JBe94-0008Vf-KQ; Sun, 06 Jan 2008 22:39:06 +0000 +X-Loop: owner@bugs.debian.org +Subject: init: add should-start/stop $remote_fs to init script +Reply-To: Petter Reinholdtsen , 459497@bugs.debian.org +Resent-From: Petter Reinholdtsen +Original-Sender: Petter Reinholdtsen +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Simon Horman +Resent-Date: Sun, 06 Jan 2008 22:39:04 +0000 +Resent-Message-ID: +X-Debian-PR-Message: report 459497 +X-Debian-PR-Package: heartbeat +X-Debian-PR-Keywords: patch +X-Debian-PR-Source: heartbeat +Received: via spool by submit@bugs.debian.org id=B.11996581495099 + (code B ref -1); Sun, 06 Jan 2008 22:39:04 +0000 +Received: (at submit) by bugs.debian.org; 6 Jan 2008 22:22:29 +0000 +Received: from pat.uio.no ([129.240.10.15]) + by rietz.debian.org with esmtp (Exim 4.63) + (envelope-from ) + id 1JBdsz-0001J6-9B + for submit@bugs.debian.org; Sun, 06 Jan 2008 22:22:29 +0000 +Received: from mail-mx4.uio.no ([129.240.10.45]) + by pat.uio.no with esmtp (Exim 4.67) + (envelope-from ) + id 1JBdst-0001Uz-E5 + for submit@bugs.debian.org; Sun, 06 Jan 2008 23:22:23 +0100 +Received: from saruman.uio.no ([129.240.5.17]) + by mail-mx4.uio.no with esmtp (Exim 4.67) + (envelope-from ) + id 1JBdss-0006Xm-Pu; Sun, 06 Jan 2008 23:22:23 +0100 +Received: from pre by saruman.uio.no with local (Exim 4.44) + id 1JBdss-0005XY-AZ; Sun, 06 Jan 2008 23:22:22 +0100 +To: submit@bugs.debian.org +From: Petter Reinholdtsen +Date: Sun, 06 Jan 2008 23:22:22 +0100 +Message-ID: <2fly7b261cx.fsf@saruman.uio.no> +User-Agent: Gnus/5.1008 (Gnus v5.10.8) Emacs/21.4 (usg-unix-v) +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Sender: Petter Reinholdtsen +X-UiO-ClamAV-Virus: No +X-UiO-Spam-info: not spam, SpamAssassin (score=-4.0, required=5.0, autolearn=disabled, AWL=0.978,UIO_MAIL_IS_INTERNAL=-5) +X-UiO-Scanned: 970378EB478AA26CD34F4A6F0CC56B6A453886AE +X-UiO-SPAM-Test: remote_host: 129.240.5.17 spam_score: -39 maxlevel 99990 minaction 0 bait 0 mail/h: 1 total 38077 max/h 47 blacklist 0 greylist 0 ratelimit 0 +Delivered-To: submit@bugs.debian.org +Resent-Sender: Debian BTS +Resent-Date: Sun, 06 Jan 2008 22:39:06 +0000 +X-Loop: oathstix_finish by kirsty.vergenet.net +X-Loop: oathstix_finish by tabatha.lab.ultramonkey.org +Status: RO +X-Status: A +Content-Length: 1632 +Lines: 46 + +When testing dependency based boot sequencing, I discovered what I +believe is a bug in the init.d/heartbeat script. It need a mounted +/usr/, but do not depend on $remote_fs which is the dependency +required for scripts needing /usr/. It uses the default params when +calling update-rc.d, but do not list the equivalent runlevels in the +LSB header. + +Debian Bug #459497. See: http://bugs.debian.org/459497 + +Cc: Petter Reinholdtsen +Signed-off-by: Simon Horman + +diff -ur heartbeat-2.1.3.orig/heartbeat/init.d/heartbeat.in heartbeat-2.1.3/heartbeat/init.d/heartbeat.in +--- heartbeat-2.1.3.orig/heartbeat/init.d/heartbeat.in 2008-01-06 23:07:28.000000000 +0100 ++++ heartbeat-2.1.3/heartbeat/init.d/heartbeat.in 2008-01-06 23:12:48.000000000 +0100 +@@ -36,11 +36,11 @@ + # + # Short-Description: High-availability services. + # Provides: heartbeat HA +-# Required-Start: $network $time $syslog ++# Required-Start: $remote_fs $network $time $syslog + # Should-Start: ntp +-# Required-Stop: $network $time $syslog +-# Default-Start: 3 5 +-# Default-Stop: 0 6 ++# Required-Stop: $remote_fs $network $time $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 + ### END INIT INFO + + +Happy hacking, +-- +Petter Reinholdtsen + + diff --git a/debian/patches/ipv6-check.patch b/debian/patches/ipv6-check.patch new file mode 100644 index 0000000..761e32b --- /dev/null +++ b/debian/patches/ipv6-check.patch @@ -0,0 +1,39 @@ +Subject: IPv6addr: Check for netinet/icmp6.h instead of linux/icmpv6.h +Date: Tue, 25 Dec 2007 13:51:34 +0900 +To: linux-ha-dev@lists.linux-ha.org +Cc: Tuomo Soini +From: Simon Horman + +Configure currently checks for asm/types.h+netinet/icmp6.h, +however this check fails on debian ia64. Changing the check +to sys/types.h+netinet/icmp6.h resolves the problem for Debian, +but breaks RHEL 4. + +http://developerbugs.linux-foundation.org/show_bug.cgi?id=1660 + +This revised check looks for sys/types.h+netinet/icmp6.h which +is more or less what resources/OCF/IPv6addr.c actually uses, +so hopefully this check keeps all the relevant parties happy. + +Tuomo, could you check this patch and see if it causes you pain? + +Cc: Tuomo Soini +Signed-off-by: Simon Horman + +Index: heartbeat/configure.in +=================================================================== +--- heartbeat.orig/configure.in 2007-12-25 13:24:20.000000000 +0900 ++++ heartbeat/configure.in 2007-12-25 13:44:26.000000000 +0900 +@@ -1099,9 +1099,9 @@ fi + CPPFLAGS="$CPPFLAGS $XML2HEAD" + + dnl ************************************************************************ +-dnl * Check for linux/icmpv6.h to make enable the IPv6addr resource agent +-AC_CHECK_HEADERS(linux/icmpv6.h,[],[],[#include ]) +-AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_linux_icmpv6_h" = yes -a $new_libnet = yes ) ++dnl * Check for netinet/icmp6.h to enable the IPv6addr resource agent ++AC_CHECK_HEADERS(netinet/icmp6.h,[],[],[#include ]) ++AM_CONDITIONAL(USE_IPV6ADDR, test "$ac_cv_header_netinet_icmp6_h" = yes -a $new_libnet = yes ) + AC_CHECK_HEADERS(libxml/xpath.h) + + dnl diff --git a/debian/patches/ldirectord-clear-config-in-memory-on-reload.patch b/debian/patches/ldirectord-clear-config-in-memory-on-reload.patch new file mode 100644 index 0000000..850f86c --- /dev/null +++ b/debian/patches/ldirectord-clear-config-in-memory-on-reload.patch @@ -0,0 +1,60 @@ +# HG changeset patch +# User "mandrake (Geoff Harrison)" +# Date 1200639790 -32400 +# Node ID c01c9790d2b83f493a4aa5f86e1a5b1233d7daa2 +# Parent eaa43842608caf75552e9f755c91e35b7a2ff6d1 +[ldirectord]: clear config in memory on reload +when re-reading a config file you're not actually killing the old config +information. easy way to spot the symptom - move a node from one virtual +web pool to another. + +root@lbtest-001:~# ipvsadm -L +IP Virtual Server version 1.2.1 (size=262144) +Prot LocalAddress:Port Scheduler Flags + -> RemoteAddress:Port Forward Weight ActiveConn InActConn +TCP 172.18.100.120:www rr + -> 192.168.0.201:www Masq 1 0 0 + -> 192.168.0.202:www Masq 1 0 0 +TCP 172.18.100.121:www rr + -> 192.168.0.200:www Masq 1 0 0 +TCP 172.18.100.120:mysql wrr + -> 192.168.0.202:mysql Masq 1 0 0 + -> 192.168.0.201:mysql Masq 1 0 0 + -> 192.168.0.200:mysql Masq 1 0 0 +root@lbtest-001:~# /usr/sbin/ldirectord -d reload +DEBUG2: Running exec(/usr/sbin/ldirectord -d reload) +Running exec(/usr/sbin/ldirectord -d reload) +DEBUG2: Invoking ldirectord invoked as: /usr/sbin/ldirectord reload +Invoking ldirectord invoked as: /usr/sbin/ldirectord reload +DEBUG2: Exiting with exit_status 0: Exiting from ldirectord reload +Exiting with exit_status 0: Exiting from ldirectord reload +root@lbtest-001:~# ipvsadm -L +IP Virtual Server version 1.2.1 (size=262144) +Prot LocalAddress:Port Scheduler Flags + -> RemoteAddress:Port Forward Weight ActiveConn InActConn +TCP 172.18.100.120:www rr + -> 192.168.0.201:www Masq 1 0 0 +TCP 172.18.100.121:www rr + -> 192.168.0.202:www Masq 1 0 0 + -> 192.168.0.200:www Masq 1 0 0 +TCP 172.18.100.120:mysql wrr + -> 192.168.0.202:mysql Masq 1 0 0 + -> 192.168.0.201:mysql Masq 1 0 0 + -> 192.168.0.200:mysql Masq 1 0 0 + +this did not work previously. + +CC: "mandrake (Geoff Harrison)" +Signed-off-by: Simon Horman + +diff -r eaa43842608c -r c01c9790d2b8 ldirectord/ldirectord.in +--- a/ldirectord/ldirectord.in Fri Jan 18 16:03:10 2008 +0900 ++++ b/ldirectord/ldirectord.in Fri Jan 18 16:03:10 2008 +0900 +@@ -965,6 +965,7 @@ sub reread_config + sub reread_config + { + @OLDVIRTUAL = @VIRTUAL; ++ @VIRTUAL = (); + my %OLD_INSTANCE = %LD_INSTANCE; + my %RELOAD; + my %STOP; diff --git a/debian/patches/ldirectord-fix-sql-select-queries.patch b/debian/patches/ldirectord-fix-sql-select-queries.patch new file mode 100644 index 0000000..9d6d2a7 --- /dev/null +++ b/debian/patches/ldirectord-fix-sql-select-queries.patch @@ -0,0 +1,102 @@ +# HG changeset patch +# User "mandrake (Geoff Harrison)" +# Date 1200639790 -32400 +# Node ID eaa43842608caf75552e9f755c91e35b7a2ff6d1 +# Parent 7e7ff0d31af1d66e4dfd7f32905bfedfa215485c +[ldirectord] fix sql select queries - at the expense of non-select +unfortunately, the stuff to make the queries work with non-select doesn't +actually work with anything doing a select out of the db, at least if you +do something like select * + +however, it is completely asinine to assume someone's going to regularly +insert data from the director into dbs he's loadbalancing across, so you +can rule that out pretty much. + +I _CAN_ make this work if you want to do an insert / update in addition to +the select, but it doesn't necessarily make sense to me. + +Cc: "mandrake (Geoff Harrison)" +Signed-off-by: Simon Horman + +diff -r 7e7ff0d31af1 -r eaa43842608c ldirectord/ldirectord.in +--- a/ldirectord/ldirectord.in Thu Jan 17 22:32:50 2008 +0100 ++++ b/ldirectord/ldirectord.in Fri Jan 18 16:03:10 2008 +0900 +@@ -426,7 +426,7 @@ For a DNS check this should the name of + For a DNS check this should the name of an A record, or the address + of a PTR record to look up. + +-For a MySQL, Oracle or PostgeSQL check, this should be an SQL query. ++For a MySQL, Oracle or PostgeSQL check, this should be an SQL SELECT query. + The data returned is not checked, only that the + answer is one or more rows. This is a required setting. + +@@ -2803,44 +2803,33 @@ sub check_sql + goto err_finish; + } + +- # After calling "execute" $sth->{NUM_OF_FIELDS} will be greater +- # than zero for SELECT statements, and 0 for all other statements. ++ # On error "execute" will return undef. + # +- # For non-SELECT statements a non-undef value returned by +- # "execcute" inticates the number of rows returned. "0E0" (Some +- # garbage to make 0 true) or > 1. But testing for this isn't +- # particularly interesting as its quite valid for operations to +- # affect 0 rows. So for non-SELECT statements, if "execute" +- # doesn't return undef, consider the test a success. +- unless ($sth->{NUM_OF_FIELDS}) { ++ # Assuming you're using 'SELECT' you will get the number of rows ++ # returned from the db when running execute: the 'rows' method is ++ # only used when doing something that is NOT a select. I cannot ++ # imagine that you would ever want to insert or update from a ++ # regular polling on this system, so we will assume you are using ++ # SELECT here. ++ # ++ # Ideally you will do something like this: 'select * from ++ # director_slave where enabled=1' This way you can have, say, a ++ # MEMORY table in MySQL where you insert a value into a row ++ # (enabled) that says whether or not you want to actually use this ++ # in the pool from ldirector / ipvs, and disable them without ++ # actually turning off your sql server. ++ ++ unless ($rows = $sth->execute) { ++ check_sql_log_errstr("Error executing statement:", ++ $dbh->errstr, $dbh->err); ++ goto err_finish; ++ } ++ ++ # Actually look to see if there was data returned in this statement, ++ # else disable node ++ if($rows > 0) { + goto out; +- } +- +- # For SELECT staements "execute" will always return a true +- # value unless an error occurs. A "fetch" operation is performed +- # to obtain the row returned by the SELECT statement. Again 0 +- # rows is valid. +- # +- # I suspect that for at leaast some DB engines "execute" will +- # always succeed unless there is some bizzare internal error. +- # So it seems that in order to have a reasonable test "fetch" +- # needs to be called. +- # +- # I also wonder if having a table missing +- # will result in an error or just 0 rows returned. If the +- # latter is true then I guess we need to consider 0 rows an +- # error state. But I'll have the code consider 0 rows a success +- # for now leave this to be changed if testing proves it neccessary. +- +- # As it is important that the SELECT succeeded, rather than +- # how may rows it returns, just call "fetchrow_arrayref" once. +- # +- # I guess that in a pathalogical case the query may fail +- # at a particular row. But I'm not going to worry about that for +- # now. +- $row = $sth->fetchrow_arrayref; +- unless ($row && !$sth->err) { +- check_sql_log_errstr("Error fetching row:", $dbh->errstr); ++ } else { + goto err_finish; + } + diff --git a/debian/patches/ldirectord-init-lsb.patch b/debian/patches/ldirectord-init-lsb.patch new file mode 100644 index 0000000..3c2fc50 --- /dev/null +++ b/debian/patches/ldirectord-init-lsb.patch @@ -0,0 +1,145 @@ +From horms Fri Mar 7 01:10:23 2008 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.2.1-kirsty.vergenet.net_2007012401 + (2007-05-02) on kirsty.vergenet.net +X-Spam-Level: +X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham + version=3.2.1-kirsty.vergenet.net_2007012401 +X-Original-To: horms@verge.net.au +Delivered-To: horms@vergenet.net +Received: from mail.au.vergenet.net [202.4.237.240] + by tabatha.lab.ultramonkey.org with POP3 (fetchmail-6.3.8) + for (single-drop); Fri, 07 Mar 2008 10:10:23 +0900 (JST) +Received: from rietz.debian.org (rietz.debian.org [140.211.166.43]) + by kirsty.vergenet.net (Postfix) with ESMTP id B7D182408E + for ; Fri, 7 Mar 2008 09:42:16 +1100 (EST) +Received: from debbugs by rietz.debian.org with local (Exim 4.63) + (envelope-from ) + id 1JXOjw-00088q-Ps; Thu, 06 Mar 2008 22:39:04 +0000 +X-Loop: owner@bugs.debian.org +Subject: Bug#469764: ldirectord: Please add LSB formatted dependency info in init.d script +Reply-To: Morten Werner Forsbring , 469764@bugs.debian.org +Resent-From: Morten Werner Forsbring +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Simon Horman +Resent-Date: Thu, 06 Mar 2008 22:39:02 +0000 +Resent-Message-ID: +X-Debian-PR-Message: report 469764 +X-Debian-PR-Package: ldirectord +X-Debian-PR-Keywords: patch +X-Debian-PR-Source: heartbeat +Received: via spool by submit@bugs.debian.org id=B.120484301829524 + (code B ref -1); Thu, 06 Mar 2008 22:39:02 +0000 +Received: (at submit) by bugs.debian.org; 6 Mar 2008 22:36:58 +0000 +Received: from mail-forward.uio.no ([129.240.10.42]) + by rietz.debian.org with esmtp (Exim 4.63) + (envelope-from ) + id 1JXOht-0007fX-KL + for submit@bugs.debian.org; Thu, 06 Mar 2008 22:36:58 +0000 +Received: from mail-mx3.uio.no ([129.240.10.44]) + by pat.uio.no with esmtp (Exim 4.67) + (envelope-from ) + id 1JXOhn-0000kO-Pq + for submit@bugs.debian.org; Thu, 06 Mar 2008 23:36:51 +0100 +Received: from sid.forsbring.no ([158.36.191.200]) + by mail-mx3.uio.no with esmtps (TLSv1:AES256-SHA:256) + (Exim 4.67) + (envelope-from ) + id 1JXOhn-0001g2-Bn + for submit@bugs.debian.org; Thu, 06 Mar 2008 23:36:51 +0100 +Received: from localhost + ([127.0.0.1] helo=sid.forsbring.no ident=werner) + by sid.forsbring.no with esmtp (Exim 4.63) + (envelope-from ) + id 1JXPW1-0005VV-Vo + for submit@bugs.debian.org; Fri, 07 Mar 2008 00:28:46 +0100 +From: Morten Werner Forsbring +To: submit@bugs.debian.org +Date: Fri, 07 Mar 2008 00:28:45 +0100 +Message-ID: <87skz35t5e.fsf@sid.forsbring.no> +User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/23.0.60 (gnu/linux) +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-UiO-Spam-info: not spam, SpamAssassin (score=0.0, required=5.0, autolearn=disabled, none) +X-UiO-Scanned: 0B0CA6F9839D49CEBA45966491A982F45BE308F3 +X-UiO-SR-test: EE6083E1527812C73ED972CFAF5726B00DA42D2A +X-UiO-SPAM-Test: remote_host: 158.36.191.200 spam_score: 0 maxlevel 200 minaction 2 bait 0 mail/h: 4 total 287 max/h 16 blacklist 0 greylist 0 ratelimit 0 +Delivered-To: submit@bugs.debian.org +Resent-Sender: Debian BTS +Resent-Date: Thu, 06 Mar 2008 22:39:04 +0000 +X-Loop: oathstix_finish by kirsty.vergenet.net +X-Loop: oathstix_finish by tabatha.lab.ultramonkey.org +Status: RO +Content-Length: 2365 +Lines: 70 + +Package: ldirectord +Version: 2.1.3-3 +Tags: patch +User: initscripts-ng-devel@lists.alioth.debian.org +Usertags: missing-dependency + +To be able to check boot script order, and also to be able to start +boot scripts in parallel, it is important to know the dependencies of +the various boot scripts. The Linux Software Base specifies a init.d +header file format useful for this purpose, and adding such header to +the ldirectord init.d script would make it possible for us to use this +information to check the current sequence and to speed up the Debian +boot. + +I am helping out with a system to update the boot sequence based on +these dependencies, and would like see this as the default in Lenny. +Because of this, it is nice if the dependencies was updated quickly. + + +documents the LSB header format. Some Debian notes are available from +. + +Here is a patch to document the dependencies. I hope this is correct. + +Thanks in advance. + + +- Werner + +diff -ruN heartbeat-2.1.3.orig/ldirectord/init.d/ldirectord.debian +heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian +--- heartbeat-2.1.3.orig/ldirectord/init.d/ldirectord.debian +2007-12-21 21:45:48.000000000 +0100 ++++ heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian 2008-03-06 +23:33:32.864014191 +0100 +@@ -1,4 +1,13 @@ + #!/bin/sh ++# ++### BEGIN INIT INFO ++# Provides: ldirectord ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++### END INIT INFO ++# + # Author: Horms + # + # Debian init script for ldirectord +diff -ruN heartbeat-2.1.3.orig/ldirectord/init.d/ldirectord.debian.in +heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian.in +--- heartbeat-2.1.3.orig/ldirectord/init.d/ldirectord.debian.in +2007-12-21 16:32:27.000000000 +0100 ++++ heartbeat-2.1.3/ldirectord/init.d/ldirectord.debian.in +2008-03-06 23:33:50.815012186 +0100 +@@ -1,4 +1,13 @@ + #!/bin/sh ++# ++### BEGIN INIT INFO ++# Provides: ldirectord ++# Required-Start: $remote_fs $syslog ++# Required-Stop: $remote_fs $syslog ++# Default-Start: 2 3 4 5 ++# Default-Stop: 0 1 6 ++### END INIT INFO ++# + # Author: Horms + # + # Debian init script for ldirectord + diff --git a/debian/patches/ldirectord-rows.patch b/debian/patches/ldirectord-rows.patch new file mode 100644 index 0000000..1ddc195 --- /dev/null +++ b/debian/patches/ldirectord-rows.patch @@ -0,0 +1,76 @@ +From horms Wed Mar 26 02:37:01 2008 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.2.1-kirsty.vergenet.net_2007012401 + (2007-05-02) on kirsty.vergenet.net +X-Spam-Level: +X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,SPF_PASS + autolearn=ham version=3.2.1-kirsty.vergenet.net_2007012401 +X-Original-To: horms@verge.net.au +Delivered-To: horms@vergenet.net +Received: from mail.au.vergenet.net [202.4.237.240] + by tabatha.lab.ultramonkey.org with POP3 (fetchmail-6.3.8) + for (single-drop); Wed, 26 Mar 2008 11:37:01 +0900 (JST) +Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.239]) + by kirsty.vergenet.net (Postfix) with ESMTP id C4C592408E + for ; Tue, 18 Mar 2008 20:31:45 +1100 (EST) +Received: by wx-out-0506.google.com with SMTP id t14so8741969wxc.29 + for ; Tue, 18 Mar 2008 02:31:43 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=googlemail.com; s=gamma; + h=domainkey-signature:received:received:message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; + bh=zKZkkf28M+cKoOwbFJhaOnvPkymMl1G+QAOBnXdcHIc=; + b=s1iSzxAdgUQbKzvI1Hjq7aZP2m8MRTVTjfh7tlURoJUqS5Y1iJnKhT8p7iye0j6/ccbjZvBJbkAoRSuvo7UEYoR5e2SJdiHf8QjJ1vJ1K0fGqn6JNBc4qzD8Jo4xG5ELJJ+CMdG8oYr3MU/jND4RTrkxuWvxbNDcikKwywags4k= +DomainKey-Signature: a=rsa-sha1; c=nofws; + d=googlemail.com; s=gamma; + h=message-id:date:from:to:subject:mime-version:content-type:content-transfer-encoding:content-disposition; + b=P4auvvQ91MMHfUp5uHajwryiKpvRdrWP+dGkuG8mXm6veK5/FNRQJ1pkuramyD0gMj8aSWv0C+UVRg4cKHa6liN+BZHBLVv1nwu+AKmpSLm96IjL3uQdFIFLcZwhaAPgwocmPA0/veKa0Hx7qfxSsHZUIP5cLuItDIl/bvFpVm0= +Received: by 10.114.80.4 with SMTP id d4mr1166627wab.44.1205832703086; + Tue, 18 Mar 2008 02:31:43 -0700 (PDT) +Received: by 10.115.73.18 with HTTP; Tue, 18 Mar 2008 02:31:43 -0700 (PDT) +Message-ID: <441703990803180231x1fc8db5buaf836ee141fe3d53@mail.gmail.com> +Date: Tue, 18 Mar 2008 10:31:43 +0100 +From: "Julius Volz" +To: horms@verge.net.au +Subject: [PATCH] ldirectord: Correctly declare $rows variable in check_sql() +MIME-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 7bit +Content-Disposition: inline +X-Loop: oathstix_finish by tabatha.lab.ultramonkey.org + +Hi Horms, + +Are you the right person to submit patches for ldirectord now? Or +would I better just send them to the linux-ha-dev list (I already sent +this patch there, but it's been hanging in the moderator filter, +although I'm a list member...). + +Anyways, here it goes again, in case you are the right person to talk to: + +In check_sql() in ldirectord, the "$rows" variable is currently +declared incorrectly as "$row" in strict mode, leading to a Perl abort +during startup: + +========================================================= +Global symbol "$rows" requires explicit package name at ldirectord line 2823. +Global symbol "$rows" requires explicit package name at ldirectord line 2831. +BEGIN not safe after errors--compilation aborted at ldirectord line 2924. + +Signed-off-by: Simon Horman + +--- +Fixes Debian Bug #472663 +See: http://bugs.debian.org + +diff -r d887e016452c ldirectord/ldirectord.in +--- a/ldirectord/ldirectord.in Mon Mar 17 12:42:23 2008 ++++ b/ldirectord/ldirectord.in Mon Mar 17 16:48:50 2008 +@@ -2766,7 +2766,7 @@ + require DBI; + my ($v, $r, $dbd, $dbname) = @_; + my $port = ld_checkport($v, $r); +- my ($dbh, $sth, $query, $row, $result); ++ my ($dbh, $sth, $query, $rows, $result); + $result = $SERVICE_DOWN; + $query = $$r{request}; + $query =~ s#^/##; diff --git a/debian/patches/lrm-dont-revise-op_status.patch b/debian/patches/lrm-dont-revise-op_status.patch new file mode 100644 index 0000000..79e066c --- /dev/null +++ b/debian/patches/lrm-dont-revise-op_status.patch @@ -0,0 +1,21 @@ +Call to rsc->get_cur_state() incorrectly lists completed operations as failed (op_status=4) + +LF Bug #1833 +http://developerbugs.linux-foundation.org/show_bug.cgi?id=1833 + +Needs to go upstream + +diff -r 98aeb5f25c95 lib/lrm/clientlib.c +--- a/lib/lrm/clientlib.c Fri Feb 15 17:53:27 2008 +0100 ++++ b/lib/lrm/clientlib.c Fri Feb 15 17:53:56 2008 +0100 +@@ -1190,10 +1190,6 @@ msg_to_op(struct ha_msg* msg) + else { + op->output = NULL; + } +- /* check the rc to revise the op_status */ +- if (0 != op->rc) { +- op->op_status = LRM_OP_ERROR; +- } + } else if(op->op_status == LRM_OP_PENDING) { + op->rc = EXECRA_STATUS_UNKNOWN; + diff --git a/debian/patches/o2cb-INITDIR.patch b/debian/patches/o2cb-INITDIR.patch new file mode 100644 index 0000000..5985aee --- /dev/null +++ b/debian/patches/o2cb-INITDIR.patch @@ -0,0 +1,144 @@ +From horms Sun Mar 29 21:28:35 2009 +Return-Path: +X-Spam-Checker-Version: SpamAssassin 3.2.5-kirsty.vergenet.net_2007012401 + (2008-06-10) on kirsty.vergenet.net +X-Spam-Level: +X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW + autolearn=ham version=3.2.5-kirsty.vergenet.net_2007012401 +X-Original-To: horms@verge.net.au +Delivered-To: horms@vergenet.net +Received: from mail.au.vergenet.net [202.4.237.240] + by yukiko.kent.sydney.vergenet.net with POP3 (fetchmail-6.3.9-rc2) + for (single-drop); Mon, 30 Mar 2009 08:28:35 +1100 (EST) +Received: from master.debian.org (master.debian.org [70.103.162.29]) + by kirsty.vergenet.net (Postfix) with ESMTP id A38DD24060 + for ; Fri, 27 Mar 2009 21:06:11 +1100 (EST) +Received: from qa by master.debian.org with local (Exim 4.69) + (envelope-from ) + id 1Ln8x0-0000TZ-48; Fri, 27 Mar 2009 10:06:10 +0000 +Received: from rietz.debian.org ([140.211.166.43]) by master.debian.org + with esmtp (Exim 4.69) (envelope-from ) id + 1Ln8wz-0000TK-N2 for heartbeat@packages.qa.debian.org; Fri, 27 Mar 2009 + 10:06:09 +0000 +Received: from debbugs by rietz.debian.org with local (Exim 4.63) + (envelope-from ) id 1Ln8r6-0004Ok-JC; Fri, + 27 Mar 2009 10:00:04 +0000 +X-Loop: owner@bugs.debian.org +Subject: Bug#521394: heartbeat: ocf resources script o2cb doesn't work +Reply-To: Michel Rode , 521394@bugs.debian.org +Resent-From: Michel Rode +Resent-To: debian-bugs-dist@lists.debian.org +Resent-CC: Simon Horman +Resent-Date: Fri, 27 Mar 2009 10:00:02 +0000 +Resent-Message-ID: +X-Debian-PR-Message: report 521394 +X-Debian-PR-Package: heartbeat +X-Debian-PR-Keywords: patch +X-Debian-PR-Source: heartbeat +Received: via spool by submit@bugs.debian.org id=B.123814779814011 (code B + ref -1); Fri, 27 Mar 2009 10:00:02 +0000 +Received: (at submit) by bugs.debian.org; 27 Mar 2009 09:56:38 +0000 +Received: from gryps51.uni-greifswald.de ([141.53.8.24]) by + rietz.debian.org with esmtp (Exim 4.63) (envelope-from + ) id 1Ln8nl-0003d5-OV for submit@bugs.debian.org; Fri, + 27 Mar 2009 09:56:37 +0000 +Received: from xen1.azubi.uni-greifswald.de (unverified) by + gryps51.uni-greifswald.de (Clearswift SMTPRS 5.2.9) with ESMTP id + ; Fri, 27 Mar 2009 + 10:56:08 +0100 +Content-Type: text/plain; charset="us-ascii" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +From: Michel Rode +To: Debian Bug Tracking System +Message-ID: <20090327095630.3482.63165.reportbug@xen1.azubi.uni-greifswald.de> +X-Mailer: reportbug 3.48 +Date: Fri, 27 Mar 2009 10:56:30 +0100 +Delivered-To: submit@bugs.debian.org +Resent-Date: Fri, 27 Mar 2009 10:00:04 +0000 +Delivered-To: heartbeat@packages.qa.debian.org +Precedence: list +X-Loop: heartbeat@packages.qa.debian.org +X-Debian: PTS +X-Debian-Package: heartbeat +X-PTS-Package: heartbeat +X-PTS-Keyword: bts +List-Unsubscribe: +Resent-Sender: Debian QA +X-Loop: oathstix_finish by kirsty.vergenet.net +X-Loop: oathstix_finish by yukiko.kent.sydney.vergenet.net +Status: RO +X-Status: A +Content-Length: 3160 +Lines: 70 + +Package: heartbeat +Version: 2.1.3-6lenny0 +Severity: critical +Tags: patch +Justification: breaks the whole system + + +ocf resources script doe't start because there is a missing $ in line 314. + +-- System Information: +Debian Release: 5.0 + APT prefers stable + APT policy: (500, 'stable') +Architecture: i386 (i686) + +Kernel: Linux 2.6.26-1-xen-686 (SMP w/1 CPU core) +Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) +Shell: /bin/sh linked to /bin/bash + +Versions of packages heartbeat depends on: +ii adduser 3.110 add and remove users and groups +ii gawk 1:3.1.5.dfsg-4.1 GNU awk, a pattern scanning and pr +ii iproute 20080725-2 networking and traffic control too +ii iputils-ping 3:20071127-1 Tools to test the reachability of +ii libbz2-1.0 1.0.5-1 high-quality block-sorting file co +ii libc6 2.7-18 GNU C Library: Shared libraries +ii libcurl3 7.18.2-8lenny2 Multi-protocol file transfer libra +ii libglib2.0-0 2.16.6-1+lenny1 The GLib library of C routines +ii libgnutls26 2.4.2-6 the GNU TLS library - runtime libr +ii libltdl3 1.5.26-4 A system independent dlopen wrappe +ii libncurses5 5.7+20081213-1 shared libraries for terminal hand +ii libnet1 1.1.2.1-2 library for the construction and h +ii libopenhpi2 2.12.0-1 OpenHPI libraries (runtime and sup +ii libpam-runtime 1.0.1-5 Runtime support for the PAM librar +ii libpam0g 1.0.1-5 Pluggable Authentication Modules l +ii libsnmp15 5.4.1~dfsg-12 SNMP (Simple Network Management Pr +ii libssl0.9.8 0.9.8g-15 SSL shared libraries +ii libuuid1 1.41.3-1 universally unique id library +ii libwrap0 7.6.q-16 Wietse Venema's TCP wrappers libra +ii libxml2 2.6.32.dfsg-5 GNOME XML library +ii libxml2-utils 2.6.32.dfsg-5 XML utilities +ii mawk 1.3.3-11.1 a pattern scanning and text proces +ii psmisc 22.6-1 Utilities that use the proc filesy +ii python 2.5.2-3 An interactive high-level object-o +ii python-central 0.6.8 register and build utility for Pyt +ii zlib1g 1:1.2.3.3.dfsg-12 compression library - runtime + +Versions of packages heartbeat recommends: +ii iptables 1.4.2-6 administration tools for packet fi +ii logrotate 3.7.1-5 Log rotation utility +ii rsyslog [system-log-daemon] 3.18.6-4 enhanced multi-threaded syslogd + +heartbeat suggests no packages. + +-- no debconf information + +*** /tmp/test/ocf_o2cd.patch +--- a/resources/OCF/o2cb 2009-01-22 06:58:49.000000000 +0100 ++++ a/resources/OCF/o2cb 2009-03-24 15:56:28.000000000 +0100 +@@ -311,7 +311,7 @@ + ;; + esac + +-RCO2CB=INITDIR/o2cb ++RCO2CB=$INITDIR/o2cb + # RCO2CB=/etc/init.d/o2cb + + if [ ! -x $RCO2CB ]; then + + diff --git a/debian/patches/series/2.1.3-1 b/debian/patches/series/2.1.3-1 new file mode 100644 index 0000000..bd090d2 --- /dev/null +++ b/debian/patches/series/2.1.3-1 @@ -0,0 +1 @@ ++ ipv6-check.patch diff --git a/debian/patches/series/2.1.3-2 b/debian/patches/series/2.1.3-2 new file mode 100644 index 0000000..c710145 --- /dev/null +++ b/debian/patches/series/2.1.3-2 @@ -0,0 +1,5 @@ ++ init-remote_fs.patch ++ init-openhpid.patch ++ init-ntp.patch ++ SphinxSearchDaemon.patch ++ SphinxSearchDaemon.install.patch diff --git a/debian/patches/series/2.1.3-3 b/debian/patches/series/2.1.3-3 new file mode 100644 index 0000000..86c57b8 --- /dev/null +++ b/debian/patches/series/2.1.3-3 @@ -0,0 +1,4 @@ ++ bashisms.patch ++ ldirectord-fix-sql-select-queries.patch ++ ldirectord-clear-config-in-memory-on-reload.patch ++ lrm-dont-revise-op_status.patch diff --git a/debian/patches/series/2.1.3-4 b/debian/patches/series/2.1.3-4 new file mode 100644 index 0000000..c3136b2 --- /dev/null +++ b/debian/patches/series/2.1.3-4 @@ -0,0 +1 @@ ++ ldirectord-init-lsb.patch diff --git a/debian/patches/series/2.1.3-5 b/debian/patches/series/2.1.3-5 new file mode 100644 index 0000000..d6a8729 --- /dev/null +++ b/debian/patches/series/2.1.3-5 @@ -0,0 +1 @@ ++ ldirectord-rows.patch diff --git a/debian/patches/series/2.1.3-6lenny1 b/debian/patches/series/2.1.3-6lenny1 new file mode 100644 index 0000000..1ed5a90 --- /dev/null +++ b/debian/patches/series/2.1.3-6lenny1 @@ -0,0 +1 @@ ++ dopd-fix-basic-failover-fix-hb-message-corruption-by-fprintf_stderr_.patch diff --git a/debian/patches/series/2.1.3-6lenny2 b/debian/patches/series/2.1.3-6lenny2 new file mode 100644 index 0000000..5c315a0 --- /dev/null +++ b/debian/patches/series/2.1.3-6lenny2 @@ -0,0 +1 @@ ++ IPv6addr-64.patch diff --git a/debian/patches/series/2.1.3-6lenny3 b/debian/patches/series/2.1.3-6lenny3 new file mode 100644 index 0000000..4dda0c9 --- /dev/null +++ b/debian/patches/series/2.1.3-6lenny3 @@ -0,0 +1 @@ ++ o2cb-INITDIR.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..d64a965 --- /dev/null +++ b/debian/rules @@ -0,0 +1,184 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# Copyright 1997 to 1999 by Joey Hess. +# License: GNU General Public License (GPL) + +#Thanks to Paolo Molaro and heartbeat_0.4.6-2.diff + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# +# Path to SSH and SCP +# Usually this is guessed if ssh is installed. +# However, there is a long standing bug with installing ssh +# on arm in debian and this is preventing heartbeat from +# moving into sarge. By adding this we can remove the build +# dependancy on ssh and get an updated heartbeat into sarge... +# I hope. Horms 26th July 2004 +# +# If this is removed then the build depandancy on ssh should be +# restored +# + +cfg:=--prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --mandir=/usr/share/man \ + --with-group-name=haclient --with-ccmuser-name=hacluster \ + --enable-snmp-subagent --with-mibsdir=/usr/share/snmp/mibs \ + --disable-fatal-warnings --enable-mgmt --enable-glib-malloc + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +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 + +DTMP:=`pwd`/debian/tmp +RELEASE := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }') +UPSTREAM := $(shell echo "$(RELEASE)" | sed 's/:\?\([0-9\.]\+\)-[0-9].*/\1/') + +patch: + override_version=$(RELEASE) sh debian/apply + +unpatch: + override_version=$(RELEASE) sh debian/apply $(UPSTREAM) + +configure: checkbuild + dh_testdir + # Allow debian packages to also be built directly from Hg archives + # Official debian packages are built from dist tarballs + test ! -e ./configure || ./configure $(cfg) + test -e ./configure || ./bootstrap $(cfg) + +build: checkbuild configure build-stamp +build-stamp: + $(MAKE) + touch build-stamp + +clean: configure + dh_testroot + # Add here commands to clean up after the build process. + -$(MAKE) clean MAKE=make + -$(MAKE) distclean MAKE=make + rm -f tools/ccdv + -find . -name '*.py[co]' | xargs rm -f + dh_clean build-stamp install-stamp + rm -f debian/init debian/*.debhelper debian/*.substvars config.log + rm -r -f debian/heartbeat debian/heartbeat-dev debian/ldirectord \ + debian/heartbeat-2 debian/heartbeat-2-dev debian/ldirectord-2 \ + debian/libstonith0 debian/libstonith-dev debian/stonith \ + debian/libpils0 debian/libpils-dev \ + debian/tmp + + # Zero autoconf foo + rm -f config.status libltdl/config.log libltdl/config.status + + +install: build install-stamp +install-stamp: + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) install DESTDIR=$(DTMP) \ + MAKE=make \ + docdir=/usr/share/doc/heartbeat + + mv $(DTMP)/usr/share/heartbeat/cts/README \ + $(DTMP)/usr/share/doc/heartbeat/README.cts + find $(DTMP)/usr/share/man -type f | xargs gzip -v --best + install -c -m 755 heartbeat/init.d/heartbeat \ + $(DTMP)/etc/init.d/heartbeat + -mkdir -p $(DTMP)/usr/share/doc/ldirectord/ + install -c -m 644 ldirectord/ldirectord.cf \ + $(DTMP)/usr/share/doc/ldirectord/ + -mkdir -p $(DTMP)/etc/init.d + install -c -m 755 ldirectord/init.d/ldirectord.debian \ + $(DTMP)/etc/init.d/ldirectord + -mkdir -p $(DTMP)/etc/default/ + install -c -m 755 ldirectord/init.d/ldirectord.debian.default \ + $(DTMP)/etc/default/ldirectord + cd $(DTMP)/etc/ && ln -s ha.d heartbeat + # debug: + find $(DTMP) + dh_movefiles --source=debian/tmp + +binary-indep: build install + dh_testdir -i + dh_testroot -i + dh_installdebconf -i + dh_installdocs -i + dh_installexamples -i +# dh_installmenu -i +# dh_installemacsen -i +# dh_installpam -i + dh_installinit -i -n -u 'defaults 20 32' +# dh_installcron -i + dh_installman -i +# dh_installinfo -i +# dh_undocumented -i + dh_installchangelogs -i + dh_link -i + dh_strip -i + dh_compress -i + dh_fixperms -i +# dh_suidregister -i + dh_makeshlibs -i -V + dh_installdeb -i + dh_perl -i + dh_pycentral -i + dh_python -i `pwd`/usr/lib64/heartbeat/cts `pwd`/usr/lib64/heartbeat + dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdebconf -a + dh_installdocs -a + dh_installexamples -a +# dh_installmenu -a +# dh_installemacsen -a +# dh_installpam -a + dh_installinit -a -n -u 'defaults 20 32' +# dh_installcron -a + dh_installman -a +# dh_installinfo -a +# dh_undocumented -a + dh_installchangelogs -a `pwd`/doc/ChangeLog + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a --exclude usr/bin/cl_status +# dh_suidregister -a + dh_makeshlibs -a -V + dh_installdeb -a + dh_perl -a + dh_pycentral -a + dh_python -a `pwd`/usr/lib64/heartbeat/cts `pwd`/usr/lib64/heartbeat + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + @echo "Any unpackaged files follow (.a and .la files omitted):" + @cd $(DTMP) && find ./ \! -type d | egrep -v \\\.l?a + +checkbuild: + chmod u+x ./debian/dpkg-checkbuild + ./debian/dpkg-checkbuild debian/control + +.PHONY: build clean binary binary-indep binary-arch install checkbuild \ + patch unpatch