Accepting request 84016 from network:ha-clustering:Factory

Update to version 1.4.1

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

baselibs.conf

@@ -0,0 +1,4 @@
+libcorosync4
+corosync-devel
+	requires -corosync-<targettype>
+	requires "libcorosync4-<targettype> = <version>"

corosync-1.3.0.tar.gz

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

corosync-1.4.1.tar.bz2

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

corosync-confexample-timestamp.patch

@@ -1,8 +1,8 @@
-Index: corosync-1.2.6/conf/corosync.conf.example
+Index: corosync-1.4.1/conf/corosync.conf.example
 ===================================================================
---- corosync-1.2.6.orig/conf/corosync.conf.example
+--- corosync-1.4.1.orig/conf/corosync.conf.example
-+++ corosync-1.2.6/conf/corosync.conf.example
++++ corosync-1.4.1/conf/corosync.conf.example
-@@ -20,7 +20,7 @@ logging {
+@@ -21,7 +21,7 @@ logging {
  	to_syslog: yes
  	logfile: /var/log/cluster/corosync.log
  	debug: off

corosync-revert-cs2429.patch

@@ -1,8 +1,9 @@
 Only in corosync-1.2.0/exec: cscope.out
-diff -ur corosync-1.2.0.orig//exec/totemip.c corosync-1.2.0/exec/totemip.c
+Index: corosync-1.4.1/exec/totemip.c
---- corosync-1.2.0.orig//exec/totemip.c	2009-12-08 01:25:45.000000000 +0100
+===================================================================
-+++ corosync-1.2.0/exec/totemip.c	2010-03-04 19:32:22.049615000 +0100
+--- corosync-1.4.1.orig/exec/totemip.c
-@@ -376,9 +376,6 @@
++++ corosync-1.4.1/exec/totemip.c
+@@ -396,9 +396,6 @@ int totemip_iface_check(struct totem_ip_
  			 */
  			totemip_sockaddr_to_totemip_convert((struct sockaddr_storage *)sockaddr_in, boundto);
  			boundto->nodeid = sockaddr_in->sin_addr.s_addr;
@@ -12,7 +13,7 @@ diff -ur corosync-1.2.0.orig//exec/totemip.c corosync-1.2.0/exec/totemip.c
  
  			if (ioctl(id_fd, SIOCGLIFFLAGS, &lifreq[i]) < 0) {
  				printf ("couldn't do ioctl\n");
-@@ -609,9 +606,6 @@
+@@ -648,9 +645,6 @@ int totemip_iface_check(struct totem_ip_
  					if (ipaddr.family == AF_INET && ipaddr.nodeid == 0) {
  						unsigned int nodeid = 0;
  						memcpy (&nodeid, ipaddr.addr, sizeof (int));
@@ -22,11 +23,11 @@ diff -ur corosync-1.2.0.orig//exec/totemip.c corosync-1.2.0/exec/totemip.c
  						if (mask_high_bit) {
  							nodeid &= 0x7FFFFFFF;
  						}
-Only in corosync-1.2.0/exec: totemip.c.orig
+Index: corosync-1.4.1/test/testcpg.c
-diff -ur corosync-1.2.0.orig//test/testcpg.c corosync-1.2.0/test/testcpg.c
+===================================================================
---- corosync-1.2.0.orig//test/testcpg.c	2009-09-20 08:04:02.000000000 +0200
+--- corosync-1.4.1.orig/test/testcpg.c
-+++ corosync-1.2.0/test/testcpg.c	2010-03-04 19:30:03.590982000 +0100
++++ corosync-1.4.1/test/testcpg.c
-@@ -48,7 +48,6 @@
+@@ -49,7 +49,6 @@
  
  #include <corosync/corotypes.h>
  #include <corosync/cpg.h>
@@ -34,7 +35,7 @@ diff -ur corosync-1.2.0.orig//test/testcpg.c corosync-1.2.0/test/testcpg.c
  
  static int quit = 0;
  static int show_ip = 0;
-@@ -62,24 +61,6 @@
+@@ -63,24 +62,6 @@ static void print_cpgname (const struct
  	}
  }
  
@@ -59,7 +60,7 @@ diff -ur corosync-1.2.0.orig//test/testcpg.c corosync-1.2.0/test/testcpg.c
  static void DeliverCallback (
  	cpg_handle_t handle,
  	const struct cpg_name *groupName,
-@@ -88,9 +69,18 @@
+@@ -89,9 +70,18 @@ static void DeliverCallback (
  	void *msg,
  	size_t msg_len)
  {
@@ -80,7 +81,7 @@ diff -ur corosync-1.2.0.orig//test/testcpg.c corosync-1.2.0/test/testcpg.c
  }
  
  static void ConfchgCallback (
-@@ -101,27 +91,51 @@
+@@ -102,27 +92,51 @@ static void ConfchgCallback (
  	const struct cpg_address *joined_list, size_t joined_list_entries)
  {
  	int i;

corosync-trunk-reset-pause-timestamp-on-events.patch

@@ -1,95 +0,0 @@
-Index: exec/totemsrp.c
-===================================================================
---- corosync-1.2.1/exec/totemsrp.c	(revision 2662)
-+++ corosync-1.2.1/exec/totemsrp.c	(working copy)
-@@ -3427,6 +3427,7 @@
- 				cancel_heartbeat_timeout(instance);
- 			}
- 
-+			timer_function_pause_timeout (instance);
- 			return (0); /* discard token */
- 		}
- 
-@@ -3451,6 +3452,7 @@
- 				cancel_heartbeat_timeout(instance);
- 			}
- 
-+			timer_function_pause_timeout (instance);
- 			return (0); /* discard token */
- 		}
- 
-@@ -3605,6 +3607,7 @@
- 		cancel_heartbeat_timeout(instance);
- 	}
- 
-+	timer_function_pause_timeout (instance);
- 	return (0);
- }
- 
-@@ -3775,6 +3778,7 @@
- 				memb_set_merge (&mcast_header.system_from, 1,
- 					instance->my_proc_list, &instance->my_proc_list_entries);
- 				memb_state_gather_enter (instance, 8);
-+				timer_function_pause_timeout (instance);
- 				return (0);
- 			}
- 			break;
-@@ -3789,6 +3793,7 @@
- 			instance->stats.rx_msg_dropped++;
- 			break;
- 		}
-+		timer_function_pause_timeout (instance);
- 		return (0);
- 	}
- 
-@@ -3831,6 +3836,7 @@
- 	}
- 
- /* TODO remove from retrans message queue for old ring in recovery state */
-+	timer_function_pause_timeout (instance);
- 	return (0);
- }
- 
-@@ -3856,6 +3862,7 @@
- 	if (memcmp (&instance->my_ring_id, &memb_merge_detect.ring_id,
- 		sizeof (struct memb_ring_id)) == 0) {
- 
-+		timer_function_pause_timeout (instance);
- 		return (0);
- 	}
- 
-@@ -3891,6 +3898,8 @@
- 		/* do nothing in recovery */
- 		break;
- 	}
-+
-+	timer_function_pause_timeout (instance);
- 	return (0);
- }
- 
-@@ -4161,6 +4170,7 @@
- 			}
- 			break;
- 	}
-+	timer_function_pause_timeout (instance);
- 	return (0);
- }
- 
-@@ -4242,6 +4252,8 @@
- 			}
- 			break;
- 	}
-+
-+	timer_function_pause_timeout (instance);
- 	return (0);
- }
- 
-@@ -4261,6 +4273,8 @@
- 			timer_function_token_retransmit_timeout (instance);
- 		}
- 	}
-+
-+	timer_function_pause_timeout (instance);
- 	return (0);
- }
- 

corosync.changes

@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Tue Sep 20 13:15:22 UTC 2011 - tserong@suse.com
+
+- Changes since corosync 1.4.1 stable release:
+* Resolve a deadlock between the timer and serialize locks.
+* totemconfig: change minimum RRP threshold
+* Ignore memb_join messages during flush operations
+* rrp: Higher threshold in passive mode for mcast (bnc#712037)
+* rrp: Handle endless loop if all ifaces are faulty (bnc#712037)
+* A CPG client can sometimes lockup if the local node is in the downlist
+* Handle errors from totem_mcast
+* coroipcc: use malloc for path in service_connect
+* Version cs: 23112099e1c2b620e6976ca099d2b9afc80721aa
+- corosync 1.4.1 stable release:
+* main: let poll really stop before totempg_finalize
+* totemsrp: fix buffer overflows for large clusters (> 100 nodes)
+* rrp: Handle rollower in passive rrp properly
+* rrp: handle rollover in active rrp properly
+* totemconfig: Change default FAIL_TO_RECV_CONST
+* Fix problem where corosync will segfault if there are gaps in recovery
+  queue
+* cpgtool/cfgtool: print list of IP with space between items
+* RRP: redundant ring automatic recovery (fate#310284)
+* fix typos in cpg_mcast_joined.3 and cpg_zcb_mcast_joined.3
+* Remove spinlocks
+* confdb: Resolve dispatch deadlock
+* RRP: Fix ring initialization issue for UDPU mode
+* crypto: rng_make_prng prevent buf overflow
+* cpg: do_proc_join change list_slice to list_add
+* totemudp: memset of proper size
+* coroipcs: init buf in coroipcs_handler_dispatch
+* iazc: Reduce number of mem alloc and memcpy
+* coroipcc: Fix unhandled BSD EOF in coroipcc_dispatch_get()
+* cpg: fix sync master selection when one node paused
+* totemsrp: Enhance mcast failure detection
+* coroipcs: Deny connect to service without initfn
+* Add ipc_refcnt to message_handler_req_{exec, lib}_cfg_ringreenable()
+- corosync 1.3.1 release:
+* corosync crashing when a network becomes disrupted and then restored
+  (bnc#685241)
+* Align IPC on 8 byte boundaries for performance and avoid bus errors.
+* Provide better checking of the message type.
+* totemsrp: free messages originated in recovery rather then rely on
+  messages_free
+* Resolve abort during simulatenous stopping of at least 4 nodes.
+* Don't assert when ring id file is less then 8 bytes (possibly after
+  local fs problems).
+* Handle delayed multicast packets that occur with switches.
+* CPG: make sure coroipcc_service_disconnect() is always called.
+* Fix abort when token is lost in RECOVERY state (bnc#677779)
+
+-------------------------------------------------------------------
+Sat Sep 17 23:53:47 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Add baselibs configuration
+
 -------------------------------------------------------------------
 Tue Feb  8 13:03:11 UTC 2011 - tserong@novell.com
 

corosync.conf.example.patch

@@ -1,8 +1,8 @@
-Index: corosync-1.2.1/conf/corosync.conf.example
+Index: corosync-1.4.1/conf/corosync.conf.example
 ===================================================================
---- corosync-1.2.1.orig/conf/corosync.conf.example
+--- corosync-1.4.1.orig/conf/corosync.conf.example
-+++ corosync-1.2.1/conf/corosync.conf.example
++++ corosync-1.4.1/conf/corosync.conf.example
-@@ -1,32 +1,78 @@
+@@ -1,10 +1,57 @@
  # Please read the corosync.conf.5 manual page
  compatibility: whitetank
  
@@ -61,41 +61,17 @@ Index: corosync-1.2.1/conf/corosync.conf.example
 +	# nodeid:	1234
 +
  	interface {
--		ringnumber: 0
+ 		ringnumber: 0
--		bindnetaddr: 192.168.1.1
+ 		bindnetaddr: 192.168.1.1
--		mcastaddr: 226.94.1.1
+@@ -17,9 +64,9 @@ totem {
--		mcastport: 5405
-+		ringnumber:	0
-+
-+		# The following values need to be set based on your environment
-+		bindnetaddr:	192.168.1.0
-+		mcastaddr:	226.94.1.1
-+		mcastport:	5405
- 	}
- }
- 
  logging {
--	fileline: off
+ 	fileline: off
--	to_stderr: no
+ 	to_stderr: no
 -	to_logfile: yes
--	to_syslog: yes
++	to_logfile: no
+ 	to_syslog: yes
 -	logfile: /var/log/cluster/corosync.log
--	debug: off
--	timestamp: off
--	logger_subsys {
--		subsys: AMF
--		debug: off
--	}
-+	fileline:	off
-+	to_stderr:	no
-+	to_logfile:	no
-+	to_syslog:	yes
 +	syslog_facility: daemon
-+	debug:		off
+ 	debug: off
-+	timestamp:	off
+ 	timestamp: off
- }
+ 	logger_subsys {
- 
- amf {
- 	mode: disabled
- }
-+

corosync.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %if 0%{?sles_version} == 11 
 %ifnarch s390 s390x 
@@ -28,15 +27,15 @@
 
 Name:           corosync
 Summary:        The Corosync Cluster Engine and Application Programming Interfaces
-Version:        1.3.0
+Version:        1.4.1
-Release:        1
+Release:        0
 License:        BSD3c
-Group:          System Environment/Base
+Group:          Productivity/Clustering/HA
-Url:            http://www.openais.org
+Url:            http://www.corosync.org
-Source0:        http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
+Source0:        http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.bz2
+Source2:        baselibs.conf
 Patch1:         corosync-confexample-timestamp.patch
 Patch2:         corosync-revert-cs2429.patch
-Patch3:         corosync-trunk-reset-pause-timestamp-on-events.patch
 Patch4:         corosync.conf.example.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Runtime bits
@@ -45,9 +44,9 @@ Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Conflicts:      openais <= 0.89, libopenais2 <= 0.89, libopenais-devel <= 0.89
-%define buildtrunk 0
+%define buildtrunk 1
 %{?_with_buildtrunk: %define buildtrunk 1}
-%if %{buildtrunk}
+%if 0%{?buildtrunk} == 1
 BuildRequires:  autoconf automake
 %endif
 BuildRequires:  mozilla-nss mozilla-nss-devel
@@ -60,11 +59,10 @@ BuildRequires:  pkg-config
 %setup -q -n %{name}-%{version}
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 %build
-%if %{buildtrunk}
+%if 0%{?buildtrunk} == 1
 ./autogen.sh
 %endif
 %if 0%{?buildib} == 1
@@ -89,6 +87,9 @@ make install DESTDIR=%{buildroot}
 #ln -sf ../../etc/init.d/corosync %{buildroot}%{_sbindir}/rccorosync
 #%endif
 rm -f %{buildroot}%{_initrddir}/corosync
+rm -f %{buildroot}%{_initrddir}/corosync-notifyd
+rm -f %{buildroot}/usr/sbin/corosync-notifyd
+rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
@@ -97,9 +98,6 @@ rm -rf %{buildroot}%{_docdir}/*
 # the docdir is /usr/share/doc/<pkg> in the configuration
 rm -rf %{buildroot}%{_datadir}/doc/*
 
-%clean
-rm -rf %{buildroot}
-
 %description
 This package contains the Corosync Cluster Engine Executive, several
 default APIs and libraries, default configuration files, and an init
@@ -153,7 +151,7 @@ script.
 %package -n libcorosync4
 License:        BSD3c
 Summary:        The Corosync Cluster Engine Libraries
-Group:          System Environment/Libraries
+Group:          Productivity/Clustering/HA
 Conflicts:      corosync < 0.92-7
 Requires:       %{name} = %{version}-%{release}
 
@@ -185,7 +183,7 @@ This package contains corosync libraries.
 %package -n libcorosync-devel
 License:        BSD3c
 Summary:        The Corosync Cluster Engine Development Kit
-Group:          Development/Libraries
+Group:          Productivity/Clustering/HA
 Requires:       libcorosync4 = %{version}-%{release}
 Requires:       pkgconfig