[pacemaker/f17] Update and rebuild

[Andrew Beekhof]

commit e9cf52ccc55401dccff6989de97d92c301ecb700
Author: Andrew Beekhof <andrew at beekhof.net>
Date:   Thu Feb 16 21:57:51 2012 +1100

    Update and rebuild

 .gitignore               |    2 ++
 pacemaker-hotfixes.patch |   45 +++++++++++++++++++++++++++++++++++++++++++++
 pacemaker.spec           |   17 ++++++++++++++---
 sources                  |    2 +-
 4 files changed, 62 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5c0bd6..5c22daf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /Pacemaker-1.1.6.tar.bz2
 /ClusterLabs-pacemaker-89678d4.tar.gz
 /ClusterLabs-pacemaker-bc7c125.tar.gz
+/ClusterLabs-pacemaker-148fccf.tar.gz
+/ClusterLabs-pacemaker-7742926.tar.gz
diff --git a/pacemaker-hotfixes.patch b/pacemaker-hotfixes.patch
new file mode 100644
index 0000000..0792c19
--- /dev/null
+++ b/pacemaker-hotfixes.patch
@@ -0,0 +1,45 @@
+diff --git a/mcp/corosync.c b/mcp/corosync.c
+index 07d7490..a4f6b34 100644
+--- a/mcp/corosync.c
++++ b/mcp/corosync.c
+@@ -50,7 +50,6 @@ static struct cpg_name cpg_group = {
+ gboolean use_cman = FALSE;
+ static cpg_handle_t cpg_handle;
+ static corosync_cfg_handle_t cfg_handle;
+-static corosync_cfg_state_notification_t cfg_buffer;
+ 
+ /* =::=::=::= CFG - Shutdown stuff =::=::=::= */
+ 
+@@ -143,14 +142,6 @@ cluster_connect_cfg(uint32_t * nodeid)
+ 
+     crm_debug("Our nodeid: %d", *nodeid);
+ 
+-    retries = 0;
+-    cs_repeat(retries, 30, rc = corosync_cfg_state_track(cfg_handle, 0, &cfg_buffer));
+-
+-    if (rc != CS_OK) {
+-        crm_err("corosync cfg stack_track error %d", rc);
+-        goto bail;
+-    }
+-
+     crm_debug("Adding fd=%d to mainloop", fd);
+     G_main_add_fd(G_PRIORITY_HIGH, fd, FALSE, pcmk_cfg_dispatch, &cfg_handle,
+                   cfg_connection_destroy);
+diff --git a/tools/report.collector b/tools/report.collector
+index 20203f6..4fdac3e 100644
+--- a/tools/report.collector
++++ b/tools/report.collector
+@@ -700,10 +700,9 @@ for l in $logfiles $EXTRA_LOGS; do
+     node_events `basename $l` > $EVENTS_F
+ 
+     # Link the first logfile to a standard name if it doesn't yet exist
+-    if [ -e $HALOG_F ]; then
+-        : nothing
+-    else
+-	ln -s `basename $l` $HALOG_F 
++    f=`basename $l`
++    if [ -e $f -a ! -e $HALOG_F ]; then
++	ln -s $f $HALOG_F 
+     fi
+ done
+ 
diff --git a/pacemaker.spec b/pacemaker.spec
index e846654..6162b5e 100644
--- a/pacemaker.spec
+++ b/pacemaker.spec
@@ -2,8 +2,8 @@
 %global uname hacluster
 %global pcmk_docdir %{_docdir}/%{name}
 
-%global specversion 2
-%global upstream_version bc7c125
+%global specversion 3
+%global upstream_version 7742926
 %global upstream_prefix ClusterLabs-pacemaker
 
 # Compatibility macros for distros (fedora) that don't provide Python macros by default
@@ -74,6 +74,7 @@ Group:         System Environment/Daemons
 # export VER={upstream_version}
 # wget --no-check-certificate -O ClusterLabs-pacemaker-${VER}.tar.gz https://github.com/ClusterLabs/pacemaker/tarball/${VER}
 Source0:       %{upstream_prefix}-%{upstream_version}.tar.gz
+Patch1:        pacemaker-hotfixes.patch
 BuildRoot:     %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 AutoReqProv:   on
 Requires(pre): cluster-glue
@@ -85,6 +86,10 @@ Requires:      python >= 2.4
 Conflicts:     heartbeat < 2.99
 Obsoletes:     rgmanager < 3.2.0
 Provides:      rgmanager >= 3.2.0
+%if !%{with heartbeat}
+Obsoletes:     heartbeat < 3.0.4
+Provides:      heartbeat >= 3.0.4
+%endif
 
 %if %{with snmp}
 Requires:      perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -116,7 +121,7 @@ BuildRequires: net-snmp-devel
 %endif
 
 %if %{with corosync}
-# Do not require corosync, the admin should select which stack to use and install it
+Requires:      corosync
 BuildRequires: corosynclib-devel
 %endif
 
@@ -236,6 +241,7 @@ manager for Linux-HA (Heartbeat) and/or Corosync.
 
 %prep
 %setup -q -n %{upstream_prefix}-%{upstream_version}
+%patch1 -p1
 
 # Force the local time
 #
@@ -468,6 +474,11 @@ fi
 %doc AUTHORS
 
 %changelog
+* Thu Feb 16 2012 Andrew Beekhof <andrew at beekhof.net> 1.1.7-0.3-7742926.git
+- New upstream tarball: 7742926
+- Additional Provides and Obsoletes directives to enable upgrading from heartbeat
+- Rebuild now that the Corosync CFG API has been removed 
+
 * Thu Feb 02 2012 Andrew Beekhof <andrew at beekhof.net> 1.1.7-0.2-bc7c125.git
 - Additional Provides and Obsoletes directives to enable upgrading from rgmanager
 
diff --git a/sources b/sources
index b5be63f..410e478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-693012e4e78f8dd014ce8d99efb97da8  ClusterLabs-pacemaker-bc7c125.tar.gz
+5556b11517f5b735659350f3ac9e02de  ClusterLabs-pacemaker-7742926.tar.gz