Hello community, here is the log from the commit of package corosync for openSUSE:Factory checked in at 2012-02-16 12:19:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/corosync (Old) and /work/SRC/openSUSE:Factory/.corosync.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "corosync", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/corosync/corosync.changes 2011-09-23 01:54:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes 2012-02-16 12:19:13.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Feb 5 11:44:40 UTC 2012 - [email protected] + +- Send CPG_REASON_PROCDOWN when really needed (bnc#740343) + +------------------------------------------------------------------- New: ---- corosync-cpg-procdown.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ corosync.spec ++++++ --- /var/tmp/diff_new_pack.9EZYs6/_old 2012-02-16 12:19:14.000000000 +0100 +++ /var/tmp/diff_new_pack.9EZYs6/_new 2012-02-16 12:19:15.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package corosync # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %if 0%{?sles_version} == 11 %ifnarch s390 s390x %define buildib 1 @@ -27,16 +26,17 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 1.4.1 -Release: 0 License: BSD-3-Clause Group: Productivity/Clustering/HA +Version: 1.4.1 +Release: 0 Url: http://www.corosync.org 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 Patch4: corosync.conf.example.patch +Patch5: corosync-cpg-procdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Runtime bits Requires: libcorosync4 = %{version}-%{release} @@ -47,11 +47,14 @@ %define buildtrunk 1 %{?_with_buildtrunk: %define buildtrunk 1} %if 0%{?buildtrunk} == 1 -BuildRequires: autoconf automake +BuildRequires: autoconf +BuildRequires: automake %endif -BuildRequires: mozilla-nss mozilla-nss-devel +BuildRequires: mozilla-nss +BuildRequires: mozilla-nss-devel %if 0%{?buildib} == 1 -BuildRequires: libibverbs-devel librdmacm-devel +BuildRequires: libibverbs-devel +BuildRequires: librdmacm-devel %endif BuildRequires: pkg-config @@ -60,6 +63,7 @@ %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 %build %if 0%{?buildtrunk} == 1 @@ -149,7 +153,6 @@ %{_mandir}/man5/corosync.conf.5* %package -n libcorosync4 -License: BSD-3-Clause Summary: The Corosync Cluster Engine Libraries Group: Productivity/Clustering/HA Conflicts: corosync < 0.92-7 @@ -181,7 +184,6 @@ %postun -n libcorosync4 -p /sbin/ldconfig %package -n libcorosync-devel -License: BSD-3-Clause Summary: The Corosync Cluster Engine Development Kit Group: Productivity/Clustering/HA Requires: libcorosync4 = %{version}-%{release} ++++++ corosync-cpg-procdown.patch ++++++ Index: corosync-1.4.1/services/cpg.c =================================================================== --- corosync-1.4.1.orig/services/cpg.c +++ corosync-1.4.1/services/cpg.c @@ -870,7 +870,7 @@ static int cpg_lib_exit_fn (void *conn) log_printf(LOGSYS_LEVEL_DEBUG, "exit_fn for conn=%p\n", conn); - if (cpd->group_name.length > 0) { + if (cpd->group_name.length > 0 && cpd->cpd_state != CPD_STATE_LEAVE_STARTED) { result = cpg_node_joinleave_send (cpd->pid, &cpd->group_name, MESSAGE_REQ_EXEC_CPG_PROCLEAVE, CONFCHG_CPG_REASON_PROCDOWN); if (result == -1) { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
