Accepting request 214997 from network:ha-clustering:Factory

update corosync to 2.3.3 (forwarded request 214541 from zhonglidong)

OBS-URL: https://build.opensuse.org/request/show/214997
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=22

corosync-2.3.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2602753bcf1a3bd33a0afb185c52373d1ab84ada53818626acfca56213072142
-size 409078

corosync-2.3.3.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c60a007c9abc5163809cd7b6c431f137c3459abf13a5755a580c2bd2c4b141d1
+size 411719

corosync-conf-example.patch

@@ -0,0 +1,44 @@
+Index: corosync-2.3.2/conf/corosync.conf.example
+===================================================================
+--- corosync-2.3.2.orig/conf/corosync.conf.example
++++ corosync-2.3.2/conf/corosync.conf.example
+@@ -9,6 +9,12 @@ totem {
+ 	crypto_cipher: none
+ 	crypto_hash: none
+ 
++	# Limit generated nodeids to 31-bits (positive signed integers)
++	# you would set it to 'yes', the new option 'new' means wiping 
++	# off the highest bit in network order to avoid possible nodeid
++	# conflicting.
++	clear_node_high_bit: yes
++
+ 	# interface: define at least one interface to communicate
+ 	# over. If you define more than one interface stanza, you must
+ 	# also set rrp_mode.
+@@ -77,5 +83,5 @@ logging {
+ quorum {
+ 	# Enable and configure quorum subsystem (default: off)
+ 	# see also corosync.conf.5 and votequorum.5
+-	#provider: corosync_votequorum
++	provider: corosync_votequorum
+ }
+Index: corosync-2.3.2/conf/corosync.conf.example.udpu
+===================================================================
+--- corosync-2.3.2.orig/conf/corosync.conf.example.udpu
++++ corosync-2.3.2/conf/corosync.conf.example.udpu
+@@ -5,6 +5,8 @@ totem {
+ 	crypto_cipher: none
+ 	crypto_hash: none
+ 
++	clear_node_high_bit: yes
++
+ 	interface {
+ 		ringnumber: 0
+ 		bindnetaddr: 10.16.35.0
+@@ -54,5 +56,5 @@ nodelist {
+ quorum {
+ 	# Enable and configure quorum subsystem (default: off)
+ 	# see also corosync.conf.5 and votequorum.5
+-	#provider: corosync_votequorum
++	provider: corosync_votequorum
+ }

corosync-cts-api-error.patch

@@ -0,0 +1,17 @@
+Index: corosync-2.3.2/cts/corolab.py
+===================================================================
+--- corosync-2.3.2.orig/cts/corolab.py
++++ corosync-2.3.2/cts/corolab.py
+@@ -308,10 +308,10 @@ if __name__ == '__main__':
+     elif Environment["all-once"] or NumIter == 0: 
+         NumIter = len(Tests)
+         scenario = AllOnce(
+-            cm, [ InitClusterManager(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests)
++            cm, [ BootCluster(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests)
+     else:
+         scenario = RandomTests(
+-            cm, [ InitClusterManager(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests)
++            cm, [ BootCluster(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests)
+ 
+     Environment.log(">>>>>>>>>>>>>>>> BEGINNING " + repr(NumIter) + " TESTS ")
+     Environment.log("Stack:            %s" % Environment["Stack"])

corosync.changes

@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Tue Jan 21 07:48:22 UTC 2014 - xli@suse.com
+
+- Update to corosync 2.3.3
+- Properly check result of symlink
+- Fix cppchecks warning
+- Close devnull file handler
+- votequorum: Add missing man pages
+- totem: Drop invalid join msg in operational state
+- systemd unit: Make sure network is really up
+- votequorum: Improve/add documentation for quorum device API
+- votequorum: Add persistent expected_votes tracking.
+- Upstream version cs: 45dd9861ff78362068d214cf520006a1b26376cd 
+
+-------------------------------------------------------------------
+Thu Jan  9 09:14:50 UTC 2014 - xli@suse.com
+
+- Add patch to fix cts api wrong issue 
+  + corosync-cts-api-error.patch
+- Add patch to change default settings of conf.example
+  + corosync-conf-example.patch 
+
 -------------------------------------------------------------------
 Thu Dec 12 06:35:17 UTC 2013 - xli@suse.com
 
@@ -10,7 +32,7 @@ Thu Dec 12 06:35:17 UTC 2013 - xli@suse.com
 - totemiba: Fix parameters position for poll_add
 - totemiba: Del channel fd from poll before destroy
 - totemiba: Properly allocate RDMA buffers
-- Upsteam version cs: 7014f10123a634cf026491edc9a09d6044106116
+- Upstream version cs: 7014f10123a634cf026491edc9a09d6044106116
 
 -------------------------------------------------------------------
 Fri Nov 29 21:49:07 UTC 2013 - lmb@suse.com

corosync.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -44,12 +44,14 @@ Name:           corosync
 Summary:        The Corosync Cluster Engine and Application Programming Interfaces
 License:        BSD-3-Clause
 Group:          Productivity/Clustering/HA
-Version:        2.3.2
+Version:        2.3.3
 Release:        0
 Url:            http://www.corosync.org
 Source0:        %{name}-%{version}.tar.gz
 Source2:        baselibs.conf
 Patch1:         corosync-init-lockfile-path-error.patch
+Patch2:         corosync-cts-api-error.patch
+Patch3:         corosync-conf-example.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. No, we do not
 # provide openais on purpose, the package has been deleted.
@@ -96,6 +98,8 @@ Requires:       libxslt
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1