packages (pacemaker-1_1): pacemaker/pacemaker.spec, pacemaker/pacemaker-cs_...

[jajcus]

Author: jajcus                       Date: Sun Jul  1 15:15:06 2012 GMT
Module: packages                      Tag: pacemaker-1_1
---- Log message:
- enable quorum API for corosync 1.4.3 (pacemaker otherwise refuses to start under corosync)
- build with libqb

---- Files affected:
packages/pacemaker:
   pacemaker.spec (1.17.2.4 -> 1.17.2.5) , pacemaker-cs_quorum.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/pacemaker/pacemaker.spec
diff -u packages/pacemaker/pacemaker.spec:1.17.2.4 packages/pacemaker/pacemaker.spec:1.17.2.5
--- packages/pacemaker/pacemaker.spec:1.17.2.4	Sat Jun 30 22:01:51 2012
+++ packages/pacemaker/pacemaker.spec	Sun Jul  1 17:15:01 2012
@@ -18,6 +18,7 @@
 Patch0:		%{name}-ncurses.patch
 Patch1:		%{name}-libs.patch
 Patch2:		%{name}-awk.patch
+Patch3:		%{name}-cs_quorum.patch
 URL:		http://clusterlabs.org/wiki/Main_Page
 BuildRequires:	asciidoc
 BuildRequires:	autoconf
@@ -29,6 +30,7 @@
 BuildRequires:	gnutls-devel
 %{?with_heartbeat:BuildRequires: heartbeat-devel >= 2.99}
 BuildRequires:	libesmtp-devel
+BuildRequires:	libqb
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	libxslt-devel
@@ -112,6 +114,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -275,6 +278,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17.2.5  2012/07/01 15:15:01  jajcus
+- enable quorum API for corosync 1.4.3 (pacemaker otherwise refuses to start under corosync)
+- build with libqb
+
 Revision 1.17.2.4  2012/06/30 20:01:51  jajcus
 - use --with-initdir for %configure instead of moving the script in %install
   (which could even not be there)

================================================================
Index: packages/pacemaker/pacemaker-cs_quorum.patch
diff -u /dev/null packages/pacemaker/pacemaker-cs_quorum.patch:1.1.2.1
--- /dev/null	Sun Jul  1 17:15:06 2012
+++ packages/pacemaker/pacemaker-cs_quorum.patch	Sun Jul  1 17:15:01 2012
@@ -0,0 +1,58 @@
+--- ClusterLabs-pacemaker-b5b0a7b.orig/lib/cluster/corosync.c	2012-03-28 08:14:13.000000000 +0200
++++ ClusterLabs-pacemaker-b5b0a7b/lib/cluster/corosync.c	2012-07-01 14:38:57.297207127 +0200
+@@ -672,7 +672,11 @@
+ 
+   bail:
+     if(ais_ipc_handle) {
++#  if CS_USES_LIBQB
+         crm_err("AIS connection failed: %p", (void*)ais_ipc_handle);
++#  else
++        crm_err("AIS connection failed: %li", (long)ais_ipc_handle);
++#  endif
+     }
+     return FALSE;
+ }
+@@ -1075,11 +1079,10 @@
+     int rc = -1;
+     int fd = 0;
+     int quorate = 0;
+-    uint32_t quorum_type = 0;
+ 
+     crm_debug("Configuring Pacemaker to obtain quorum from Corosync");
+ 
+-    rc = quorum_initialize(&pcmk_quorum_handle, &quorum_callbacks, &quorum_type);
++    rc = quorum_initialize(&pcmk_quorum_handle, &quorum_callbacks);
+     if (rc != CS_OK) {
+         crm_err("Could not connect to the Quorum API: %d\n", rc);
+         goto bail;
+--- ClusterLabs-pacemaker-b5b0a7b.orig/configure.ac	2012-07-01 14:27:54.000000000 +0200
++++ ClusterLabs-pacemaker-b5b0a7b/configure.ac	2012-07-01 14:49:25.664207127 +0200
+@@ -1182,7 +1182,7 @@
+ fi
+ 
+ 
+-if test $SUPPORT_CS = 1 -a x$HAVE_oldipc = x0 ; then
++if true ; then
+     dnl Support for plugins was removed about the time the IPC was
+     dnl moved to libqb.
+     dnl The only option now is the built-in quorum API
+--- ClusterLabs-pacemaker-b5b0a7b.orig/tools/ccm_epoche.c	2012-03-28 08:14:13.000000000 +0200
++++ ClusterLabs-pacemaker-b5b0a7b/tools/ccm_epoche.c	2012-07-01 16:02:03.952168127 +0200
+@@ -505,7 +505,6 @@
+ {
+     int rc = 0;
+     int quorate = 0;
+-    uint32_t quorum_type = 0;
+     unsigned int nodeid = 0;
+     cpg_handle_t c_handle = 0;
+     quorum_handle_t q_handle = 0;
+@@ -521,7 +520,7 @@
+ 
+         case 'q':
+             /* Go direct to the Quorum API */
+-            rc = quorum_initialize(&q_handle, NULL, &quorum_type);
++            rc = quorum_initialize(&q_handle, NULL);
+             if (rc != CS_OK) {
+                 crm_err("Could not connect to the Quorum API: %d\n", rc);
+                 return FALSE;
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/pacemaker/pacemaker.spec?r1=1.17.2.4&r2=1.17.2.5