rpms/openais/devel openais-trunk.diff, 1.2, 1.3 openais.spec, 1.40, 1.41

[Fabio M. Di Nitto]

Author: fabbione

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

Modified Files:
	openais.spec 
Added Files:
	openais-trunk.diff 
Log Message:
Import fixes from upstream svn


openais-trunk.diff:

Index: openais-trunk.diff
===================================================================
RCS file: openais-trunk.diff
diff -N openais-trunk.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openais-trunk.diff	9 Mar 2009 10:08:07 -0000	1.3
@@ -0,0 +1,58 @@
+diff -Naurd openais-0.93.orig/services/amf.c openais-trunk/services/amf.c
+--- openais-0.93.orig/services/amf.c	2009-02-19 03:22:07.000000000 +0100
++++ openais-trunk/services/amf.c	2009-03-06 08:37:15.000000000 +0100
+@@ -2342,7 +2342,7 @@
+ {
+ 	struct res_lib_amf_response res_lib;
+ 	struct req_lib_amf_response *req_lib = msg;
+-	int multicast, send_ok;
++	int multicast;
+ 	SaAisErrorT retval;
+ 	SaUint32T interface;
+ 	SaNameT dn;
+@@ -2375,18 +2375,7 @@
+ 		req_exec.error = req_lib->error;
+ 		iovec.iov_base = (char *)&req_exec;
+ 		iovec.iov_len = sizeof (req_exec);
+-		send_ok = api->totem_send_ok (&iovec, 1);
+-
+-		if (send_ok) {
+-			if (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0) {
+-				goto end;
+-			} else {
+-				corosync_fatal_error (COROSYNC_FATAL_ERR);
+-			}
+-		} else {
+-			/* TOTEM queue is full, try again later */
+-			retval = SA_AIS_ERR_TRY_AGAIN;
+-		}
++		assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0);
+ 	}
+ 
+ send_response:
+diff -Naurd openais-0.93.orig/services/lck.c openais-trunk/services/lck.c
+--- openais-0.93.orig/services/lck.c	2009-02-19 03:22:07.000000000 +0100
++++ openais-trunk/services/lck.c	2009-03-06 08:37:15.000000000 +0100
+@@ -1126,10 +1126,7 @@
+ 	iovec.iov_base = (char *)&req_exec_lck_resourceclose;
+ 	iovec.iov_len = sizeof (req_exec_lck_resourceclose);
+ 
+-	if (api->totem_send_ok (&iovec, 1)) {
+-		assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0);
+-		return (0);
+-	}
++	assert (api->totem_mcast (&iovec, 1, TOTEM_AGREED) == 0);
+ 	return (-1);
+ }
+ 
+@@ -2235,9 +2232,7 @@
+ 		iovecs[0].iov_base = (char *)&req_exec_lck_resourceclose;
+ 		iovecs[0].iov_len = sizeof (req_exec_lck_resourceclose);
+ 
+-		if (api->totem_send_ok (iovecs, 1)) {
+-			assert (api->totem_mcast (iovecs, 1, TOTEM_AGREED) == 0);
+-		}
++		assert (api->totem_mcast (iovecs, 1, TOTEM_AGREED) == 0);
+ 	}
+ 	else {
+ 		res_lib_lck_resourceclose.header.size = sizeof (struct res_lib_lck_resourceclose);


Index: openais.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openais/devel/openais.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- openais.spec	3 Mar 2009 06:30:15 -0000	1.40
+++ openais.spec	9 Mar 2009 10:08:08 -0000	1.41
@@ -1,29 +1,31 @@
-## define alphatag svn1688
+%define alphatag svn1741
 
 Name: openais
 Summary: The openais Standards-Based Cluster Framework executive and APIs
 Version: 0.93
-Release: 1%{?alphatag:.%{alphatag}}%{?dist}
+Release: 2%{?alphatag:.%{alphatag}}%{?dist}
 License: BSD
 Group: System Environment/Base
 URL: http://developer.osdl.org/dev/openais/
 Source0: http://www.osdl.org/downloads/openais-%{version}/openais-%{version}.tar.gz
 Patch0: openais-bump-soname.diff
+Patch1: openais-trunk.diff
 
 # Runtime bits
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
-Requires: corosync >= 0.94-1
+Requires: corosync >= 0.94-3
 Requires: openaislib = %{version}-%{release}
 Conflicts: openais-devel <= 0.89
 
 # Setup/build bits
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: corosynclib-devel >= 0.94-1
+BuildRequires: corosynclib-devel >= 0.94-3
 
 %prep
 %setup -q -n openais-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 # -O3 required for performance reasons
@@ -140,6 +142,11 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Mar  9 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.93-2.svn1741
+- Import fixes from upstream:
+  * Updates for new totem interface (1737, 1738, 1739, 1741).
+  * Fix ipc connection (1740).
+
 * Tue Mar  3 2009 Fabio M. Di Nitto <fdinitto at redhat.com> - 0.93-1
 - New upstream release.
 - Bump Requires and BuildRequires to corosync 0.94-1.