From dea99888c1ac0f25035b676c83355c78ed54e578a376538e3b6e4a2992739892 Mon Sep 17 00:00:00 2001
From: xia li <xli@suse.com>
Date: Fri, 17 Jan 2014 08:11:20 +0000
Subject: [PATCH] Accepting request 214141 from
 home:lisaseraph:branches:network:ha-clustering:Factory

add patches to fix cts api wrong issues

OBS-URL: https://build.opensuse.org/request/show/214141
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=44
---
 corosync-conf-example.patch  | 44 ++++++++++++++++++++++++++++++++++++
 corosync-cts-api-error.patch | 17 ++++++++++++++
 corosync.changes             |  8 +++++++
 corosync.spec                |  6 ++++-
 4 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 corosync-conf-example.patch
 create mode 100644 corosync-cts-api-error.patch

diff --git a/corosync-conf-example.patch b/corosync-conf-example.patch
new file mode 100644
index 0000000..fe710e0
--- /dev/null
+++ b/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
+ }
diff --git a/corosync-cts-api-error.patch b/corosync-cts-api-error.patch
new file mode 100644
index 0000000..5c91ef8
--- /dev/null
+++ b/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"])
diff --git a/corosync.changes b/corosync.changes
index 981aa4e..faeaab2 100644
--- a/corosync.changes
+++ b/corosync.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
 
diff --git a/corosync.spec b/corosync.spec
index 11fbdb9..10992de 100644
--- a/corosync.spec
+++ b/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
@@ -50,6 +50,8 @@ 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