From cdf706edf8ad399c617f094ec028ecfef2cb9745 Mon Sep 17 00:00:00 2001
From: Fabio M. Di Nitto <fabbione@fedoraproject.org>
Date: Mar 10 2009 11:34:31 +0000
Subject: Cherry pick changes from upstream to unbreak some basic functionalities


---

diff --git a/corosync-1807.diff b/corosync-1807.diff
new file mode 100644
index 0000000..1b6a643
--- /dev/null
+++ b/corosync-1807.diff
@@ -0,0 +1,20 @@
+diff -Naurd corosync-trunk.orig/exec/vsf_quorum.c corosync-trunk/exec/vsf_quorum.c
+--- corosync-trunk.orig/exec/vsf_quorum.c	2009-02-25 12:14:47.000000000 +0100
++++ corosync-trunk/exec/vsf_quorum.c	2009-03-10 09:51:09.000000000 +0100
+@@ -116,8 +116,6 @@
+ 		log_printf (LOG_LEVEL_NOTICE, "This node is within the non-primary component and will NOT provide any services.\n");
+ 	}
+ 
+-	memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id));
+-
+ 	quorum_view_list_entries = view_list_entries;
+ 
+ 	/* Tell sync() only if there is a new ring_id (ie this is not a 'fake' quorum event) */
+@@ -125,6 +123,7 @@
+ 		sync_primary_callback_fn(view_list, view_list_entries,
+ 					 primary_designated, ring_id);
+ 	}
++	memcpy(&quorum_ring_id, ring_id, sizeof (quorum_ring_id));
+ 	memcpy(quorum_view_list, view_list, sizeof(unsigned int)*view_list_entries);
+ 
+ 	/* Tell internal listeners */
diff --git a/corosync.spec b/corosync.spec
index 1079dab..d863129 100644
--- a/corosync.spec
+++ b/corosync.spec
@@ -1,15 +1,16 @@
-%define alphatag svn1794
+%define alphatag svn1797
 
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 0.94
-Release: 3%{?alphatag:.%{alphatag}}%{?dist}
+Release: 4%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://www.openais.org
 Source0: http://developer.osdl.org/dev/openais/downloads/corosync-%{version}/corosync-%{version}.tar.gz
 Patch0: corosync-bump-soname.diff
 Patch1: corosync-trunk.diff
+Patch2: corosync-1807.diff
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -27,6 +28,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %setup -q -n corosync-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 
@@ -190,6 +192,13 @@ The Corosync Cluster Engine APIs.
 %{_mandir}/man8/votequorum_overview.8*
 
 %changelog
+* Tue Mar 10 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.94-4.svn1797
+- Import fixes from upstream:
+  * Cleanup logsys format init around to use default settings (1795)
+  * logsys_format_set should use its own internal copy of format_buffer (1796)
+  * Add logsys_format_get to logsys API (1797)
+- Cherry pick svn1807 to unbreak CPG.
+
 * Mon Mar  9 2009 Fabio M. Di Nitto <fdinitto@redhat.com> - 0.94-3.svn1794
 - Import fixes from upstream:
   * Add reserve/release feature to totem message queue space (1793)