[Debian-ha-maintainers] Bug#681082: pacemaker-mgmt: diff for NMU version 2.0.0+hg1141-2.2
Laurent Bigonville
bigon at debian.org
Tue Jul 10 13:59:23 UTC 2012
Package: pacemaker-mgmt
Version: 2.0.0+hg1141-2.1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for pacemaker-mgmt (versioned as 2.0.0+hg1141-2.2) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -u pacemaker-mgmt-2.0.0+hg1141/debian/control pacemaker-mgmt-2.0.0+hg1141/debian/control
--- pacemaker-mgmt-2.0.0+hg1141/debian/control
+++ pacemaker-mgmt-2.0.0+hg1141/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian HA Maintainers <debian-ha-maintainers at lists.alioth.debian.org>
Uploaders: Martin Loschwitz <madkiss at debian.org>, Simon Horman <horms at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), libsnmp-dev, libglib2.0-dev, net-tools, python, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libltdl3-dev, swig, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, intltool, pacemaker-dev (>= 1.0.9.1+hg15626), quilt (>=0.46-7~), libxslt1-dev
+Build-Depends: debhelper (>= 5.0.37.2), libsnmp-dev, libglib2.0-dev, net-tools, python, libtool, libcurl4-openssl-dev | libcurl3-openssl-dev, libxml2-dev, bison, flex, uuid-dev, lynx, libbz2-dev, zlib1g-dev, uuid-dev, libltdl3-dev, swig, libgnutls-dev, python-central (>= 0.5), python-dev, libpam0g-dev, libncurses5-dev, intltool, pacemaker-dev (>= 1.1), quilt (>=0.46-7~), libxslt1-dev
Standards-Version: 3.9.1
XS-Python-Version: current
Homepage: http://www.clusterlabs.org
diff -u pacemaker-mgmt-2.0.0+hg1141/debian/changelog pacemaker-mgmt-2.0.0+hg1141/debian/changelog
--- pacemaker-mgmt-2.0.0+hg1141/debian/changelog
+++ pacemaker-mgmt-2.0.0+hg1141/debian/changelog
@@ -1,3 +1,16 @@
+pacemaker-mgmt (2.0.0+hg1141-2.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Rebuild for libpe-status transition (Closes: #651630)
+ * Drop d/p/undo-argument-change.patch and bump build-dependency of
+ pacemaker-dev to 1.1 (Closes: #640340)
+ * Add debian/patches/r1163.patch, debian/patches/r1165.patch to fix FTBFS
+ (taken from upstream)
+ * Add debian/patches/implicit-declaration.patch: Fix further FTBFS
+ (Thanks to Ilya Barygin <randomaction at ubuntu.com>)
+
+ -- Laurent Bigonville <bigon at debian.org> Tue, 10 Jul 2012 15:55:14 +0200
+
pacemaker-mgmt (2.0.0+hg1141-2.1) unstable; urgency=low
* Non-maintainer upload.
reverted:
--- pacemaker-mgmt-2.0.0+hg1141/debian/patches/undo-argument-change.patch
+++ pacemaker-mgmt-2.0.0+hg1141.orig/debian/patches/undo-argument-change.patch
@@ -1,21 +0,0 @@
-diff -ruN pacemaker-mgmt-2.0.0+hg1141.orig//mgmt/daemon/mgmt_crm.c pacemaker-mgmt-2.0.0+hg1141/mgmt/daemon/mgmt_crm.c
---- pacemaker-mgmt-2.0.0+hg1141.orig//mgmt/daemon/mgmt_crm.c 2010-03-26 11:05:47.000000000 +0000
-+++ pacemaker-mgmt-2.0.0+hg1141/mgmt/daemon/mgmt_crm.c 2010-08-05 15:16:16.594063568 +0000
-@@ -1303,7 +1303,7 @@
- argv[1], cib_error2string(rc));
- } else {
- buffer = crm_concat("fail-count", argv[2], '-');
-- delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL, NULL,
-+ delete_attr(cib_conn, cib_sync_call, XML_CIB_TAG_STATUS, dest_node, NULL,
- NULL, buffer, NULL, FALSE);
- crm_free(dest_node);
- crm_free(buffer);
-@@ -1313,7 +1313,7 @@
- sleep(2); /* wait for the refresh */
- now_s = crm_itoa(now);
- update_attr(cib_conn, cib_sync_call,
-- XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
-+ XML_CIB_TAG_CRMCONFIG, NULL, NULL, NULL, "last-lrm-refresh", now_s, FALSE);
- crm_free(now_s);
-
- crmd_channel->ops->destroy(crmd_channel);
diff -u pacemaker-mgmt-2.0.0+hg1141/debian/patches/series pacemaker-mgmt-2.0.0+hg1141/debian/patches/series
--- pacemaker-mgmt-2.0.0+hg1141/debian/patches/series
+++ pacemaker-mgmt-2.0.0+hg1141/debian/patches/series
@@ -1,3 +1,5 @@
-undo-argument-change.patch
fix-haclient.py.in-pyxml.patch
fix-desktop-icon-file.patch
+r1163.patch
+r1165.patch
+implicit-declaration.patch
only in patch2:
unchanged:
--- pacemaker-mgmt-2.0.0+hg1141.orig/debian/patches/implicit-declaration.patch
+++ pacemaker-mgmt-2.0.0+hg1141/debian/patches/implicit-declaration.patch
@@ -0,0 +1,31 @@
+Description: fix build problem with is_heartbeat_cluster() function
+ Unconditionally include header where this function is declared.
+ Unconditionally link with necessary library. This is similar to change in
+ upstream revision 1163.
+Author: Ilya Barygin <randomaction at ubuntu.com>
+
+--- pacemaker-mgmt-2.0.0+hg1141.orig/snmp_subagent/Makefile.am
++++ pacemaker-mgmt-2.0.0+hg1141/snmp_subagent/Makefile.am
+@@ -77,9 +77,7 @@
+ -lplumb -lcrmcommon -lcib -lpe_status \
+ $(CLUSTERLIBS) $(CURSESLIBS) $(GLIBLIB)
+
+-if !BUILD_HEARTBEAT_SUPPORT
+ hbagent_LDADD += -lcrmcluster
+-endif
+ hbagent_LDFLAGS = @SNMPAGENTLIB@
+
+ # test cases
+--- pacemaker-mgmt-2.0.0+hg1141.orig/snmp_subagent/hbagent.c
++++ pacemaker-mgmt-2.0.0+hg1141/snmp_subagent/hbagent.c
+@@ -39,9 +39,8 @@
+ #if SUPPORT_HEARTBEAT
+ #include "hb_api.h"
+ #include "heartbeat.h"
+-#else
+-#include <crm/common/cluster.h>
+ #endif
++#include <crm/common/cluster.h>
+
+ #include "clplumbing/cl_log.h"
+ #include "clplumbing/coredumps.h"
only in patch2:
unchanged:
--- pacemaker-mgmt-2.0.0+hg1141.orig/debian/patches/r1163.patch
+++ pacemaker-mgmt-2.0.0+hg1141/debian/patches/r1163.patch
@@ -0,0 +1,30 @@
+
+# HG changeset patch
+# User Yan Gao <ygao at novell.com>
+# Date 1303370055 -28800
+# Node ID efff2a4588e5ce3b3373210cfb72651cd5a6c213
+# Parent e68478cba1cbea12af2e011550211aba586f6fc9
+Low: Build: Resolve an implicit declaration (determination of the stack has been moved into libcrmcluster)
+
+diff -r e68478cba1cb -r efff2a4588e5 mgmt/daemon/Makefile.am
+--- a/mgmt/daemon/Makefile.am Mon Apr 18 13:42:39 2011 +0800
++++ b/mgmt/daemon/Makefile.am Thu Apr 21 15:14:15 2011 +0800
+@@ -59,5 +59,5 @@
+ libhbmgmt_la_CFLAGS = $(INCLUDES)
+ libhbmgmt_la_LDFLAGS = $(GNUTLSLIBS)
+ libhbmgmt_la_LIBADD = $(top_builddir)/lib/mgmt/libhbmgmttls.la \
+- -lcib -lcrmcommon -lpe_status \
++ -lcib -lcrmcommon -lpe_status -lcrmcluster \
+ $(COMMONLIBS) $(CLUSTERLIBS) $(CURSESLIBS)
+diff -r e68478cba1cb -r efff2a4588e5 mgmt/daemon/mgmt_crm.c
+--- a/mgmt/daemon/mgmt_crm.c Mon Apr 18 13:42:39 2011 +0800
++++ b/mgmt/daemon/mgmt_crm.c Thu Apr 21 15:14:15 2011 +0800
+@@ -42,6 +42,7 @@
+ #include <crm/cib.h>
+ #include <crm/msg_xml.h>
+ #include <crm/pengine/status.h>
++#include <crm/common/cluster.h>
+
+ #ifdef SUPPORT_AIS
+ #undef SUPPORT_AIS
+
only in patch2:
unchanged:
--- pacemaker-mgmt-2.0.0+hg1141.orig/debian/patches/r1165.patch
+++ pacemaker-mgmt-2.0.0+hg1141/debian/patches/r1165.patch
@@ -0,0 +1,97 @@
+
+# HG changeset patch
+# User Gao,Yan <ygao at novell.com>
+# Date 1306917143 -28800
+# Node ID 1a1d9055abec035fc9352a5b96e3dddb3a18e757
+# Parent 02e8b0bba63305fd627e3ced7e2b4442fd22d2a5
+Medium: Build: Use pkg-config to determine the location of pacemaker daemons (CRM_DAEMON_DIR)
+
+diff -r 02e8b0bba633 -r 1a1d9055abec configure.in
+--- a/configure.in Thu Apr 21 17:48:02 2011 +0800
++++ b/configure.in Wed Jun 01 16:32:23 2011 +0800
+@@ -138,7 +138,7 @@
+ fi
+ }
+
+-extract_heartbeat_define() {
++extract_header_define() {
+ AC_MSG_CHECKING(for $2 in $1)
+ Cfile=/tmp/extract_define.$2.${$}
+ printf "#include <stdio.h>\n" > ${Cfile}.c
+@@ -1215,41 +1215,41 @@
+ AC_MSG_FAILURE(Core development headers were not found)
+ fi
+
+-HA_HBCONF_DIR=`extract_heartbeat_define $GLUE_HEADER HA_HBCONF_DIR`
++HA_HBCONF_DIR=`extract_header_define $GLUE_HEADER HA_HBCONF_DIR`
+ AC_SUBST(HA_HBCONF_DIR)
+
+-HB_RA_DIR=`extract_heartbeat_define $GLUE_HEADER HB_RA_DIR`
++HB_RA_DIR=`extract_header_define $GLUE_HEADER HB_RA_DIR`
+ AC_SUBST(HB_RA_DIR)
+
+ LIBDIR="${libdir}"
+ AC_SUBST(LIBDIR)
+ AC_DEFINE_UNQUOTED(LIBDIR,"$LIBDIR", lib directory)
+
+-HA_LIBDIR=`extract_heartbeat_define $GLUE_HEADER HA_LIBDIR`
++HA_LIBDIR=`extract_header_define $GLUE_HEADER HA_LIBDIR`
+ AC_SUBST(HA_LIBDIR)
+
+-HA_LIBHBDIR=`extract_heartbeat_define $GLUE_HEADER HA_LIBHBDIR`
++HA_LIBHBDIR=`extract_header_define $GLUE_HEADER HA_LIBHBDIR`
+ AC_SUBST(HA_LIBHBDIR)
+
+-HA_VARRUNDIR=`extract_heartbeat_define $GLUE_HEADER HA_VARRUNDIR`
++HA_VARRUNDIR=`extract_header_define $GLUE_HEADER HA_VARRUNDIR`
+ AC_DEFINE_UNQUOTED(HA_VARRUNDIR,"$HA_VARRUNDIR", Location for sockets)
+ AC_SUBST(HA_VARRUNDIR)
+
+-HA_VARLIBHBDIR=`extract_heartbeat_define $GLUE_HEADER HA_VARLIBHBDIR`
++HA_VARLIBHBDIR=`extract_header_define $GLUE_HEADER HA_VARLIBHBDIR`
+ AC_SUBST(HA_VARLIBHBDIR)
+
+-OCF_ROOT_DIR=`extract_heartbeat_define $GLUE_HEADER OCF_ROOT_DIR`
++OCF_ROOT_DIR=`extract_header_define $GLUE_HEADER OCF_ROOT_DIR`
+ AC_DEFINE_UNQUOTED(OCF_ROOT_DIR,"$OCF_ROOT_DIR", OCF root directory - specified by the OCF standard)
+ AC_SUBST(OCF_ROOT_DIR)
+
+-OCF_RA_DIR=`extract_heartbeat_define $GLUE_HEADER OCF_RA_DIR`
++OCF_RA_DIR=`extract_header_define $GLUE_HEADER OCF_RA_DIR`
+ AC_DEFINE_UNQUOTED(OCF_RA_DIR,"$OCF_RA_DIR", Location for OCF RAs)
+ AC_SUBST(OCF_RA_DIR)
+
+-HA_APIGROUP=`extract_heartbeat_define $GLUE_HEADER HA_APIGROUP`
++HA_APIGROUP=`extract_header_define $GLUE_HEADER HA_APIGROUP`
+ AC_SUBST(HA_APIGROUP)
+
+-HA_CCMUSER=`extract_heartbeat_define $GLUE_HEADER HA_CCMUSER`
++HA_CCMUSER=`extract_header_define $GLUE_HEADER HA_CCMUSER`
+ AC_SUBST(HA_CCMUSER)
+
+ HA_DATADIR="${datadir}"
+@@ -1260,6 +1260,23 @@
+ AC_DEFINE_UNQUOTED(HA_NOARCHDATAHBDIR,"$HA_NOARCHDATAHBDIR", Heartbeat noarch data directory)
+ AC_SUBST(HA_NOARCHDATAHBDIR)
+
++AC_CHECK_HEADERS(crm_config.h)
++
++CRM_HEADER=none
++if test "$ac_cv_header_crm_config_h" = "yes"; then
++ CRM_HEADER=crm_config.h
++
++else
++ AC_MSG_FAILURE(Pacemaker development headers were not found)
++fi
++
++CRM_DAEMON_DIR=`extract_header_define $CRM_HEADER CRM_DAEMON_DIR`
++if test x"$CRM_DAEMON_DIR" = x""; then
++
++ CRM_DAEMON_DIR=`$PKGCONFIG pcmk --variable=daemondir`
++ AC_DEFINE_UNQUOTED(CRM_DAEMON_DIR,"$CRM_DAEMON_DIR", Location for Pacemaker daemons)
++fi
++
+ AC_PATH_PROGS(HG, hg false)
+ AC_MSG_CHECKING(build revision)
+ BUILD_REVISION=unknown
+
More information about the Debian-ha-maintainers
mailing list