rpms/corosync/devel corosync-trunk_r1767.diff, NONE, 1.1 corosync-trunk_r1774.diff, NONE, 1.1 corosync.spec, 1.14, 1.15 gcc-44-fix.diff, 1.1, NONE

[Fabio M. Di Nitto]

Author: fabbione

Update of /cvs/pkgs/rpms/corosync/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24360

Modified Files:
	corosync.spec 
Added Files:
	corosync-trunk_r1767.diff corosync-trunk_r1774.diff 
Removed Files:
	gcc-44-fix.diff 
Log Message:
Package clean up + add fix for quorum engine


corosync-trunk_r1767.diff:

--- NEW FILE corosync-trunk_r1767.diff ---
Index: exec/crypto.c
===================================================================
--- exec/crypto.c	(revision 1766)
+++ exec/crypto.c	(working copy)
@@ -37,8 +37,8 @@
 #define ENDIAN_LITTLE
 #elif _BYTE_ORDER == _BIG_ENDIAN
 #define ENDIAN_BIG
-#elif
-#warning "cannot detect byte order"
+#else
+#error "cannot detect byte order"
 #endif
 
 #if defined(COROSYNC_LINUX)

corosync-trunk_r1774.diff:

--- NEW FILE corosync-trunk_r1774.diff ---
Index: exec/vsf_quorum.c
===================================================================
--- exec/vsf_quorum.c	(revision 1773)
+++ exec/vsf_quorum.c	(revision 1774)
@@ -119,12 +119,14 @@
 	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) */
+	if (memcmp(&quorum_ring_id, ring_id, sizeof (quorum_ring_id))) {
+		sync_primary_callback_fn(view_list, view_list_entries,
+					 primary_designated, ring_id);
+	}
 	memcpy(quorum_view_list, view_list, sizeof(unsigned int)*view_list_entries);
 
-	/* Tell sync() */
-	sync_primary_callback_fn(view_list, view_list_entries,
-				 primary_designated, &quorum_ring_id);
-
 	/* Tell internal listeners */
 	send_internal_notification();
 


Index: corosync.spec
===================================================================
RCS file: /cvs/pkgs/rpms/corosync/devel/corosync.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- corosync.spec	19 Feb 2009 08:56:08 -0000	1.14
+++ corosync.spec	23 Feb 2009 09:32:39 -0000	1.15
@@ -3,12 +3,13 @@
 Name: corosync
 Summary: The Corosync Cluster Engine and Application Programming Interfaces
 Version: 0.93
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?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: gcc-44-fix.diff
+Patch0: corosync-trunk_r1767.diff
+Patch1: corosync-trunk_r1774.diff
 
 # Runtime bits
 Requires: corosynclib = %{version}-%{release}
@@ -25,6 +26,7 @@
 %prep
 %setup -q -n corosync-%{version}
 %patch0 -p0
+%patch1 -p0
 
 %build
 
@@ -186,6 +188,10 @@
 %{_mandir}/man8/votequorum_overview.8*
 
 %changelog
+* Mon Feb 23 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.93-2
+- Rename gcc-4.4 patch to match svn commit (r1767).
+- Backport patch from trunk (commit r1774) to fix quorum engine.
+
 * Thu Feb 19 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.93-1
 - New upstream release.
 - Drop alphatag from spec file.


--- gcc-44-fix.diff DELETED ---