commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2020-11-02 09:37:57

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.3463 (New)


Package is "corosync"

Mon Nov  2 09:37:57 2020 rev:70 rq:844530 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2020-09-03 
01:12:02.368424689 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new.3463/corosync.changes  
2020-11-02 09:38:10.585482286 +0100
@@ -1,0 +2,9 @@
+Tue Oct 27 14:25:29 UTC 2020 - Aleksei Burlakov 
+
+- (Again) Fix bsc#1163460 Corosync does not support link-local IPv6 addresses
+   Added: bug-1163460-totemip-Add-support-for-sin6_scope_id.patch
+
+   Reason: This time the path will NOT cause problems when doing rolling
+upgrade, see bsc#1168771
+
+---

New:

  bug-1163460-totemip-Add-support-for-sin6_scope_id.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.Q7T9WK/_old  2020-11-02 09:38:11.773483426 +0100
+++ /var/tmp/diff_new_pack.Q7T9WK/_new  2020-11-02 09:38:11.777483430 +0100
@@ -63,6 +63,7 @@
 Patch8: corosync-init-lockfile-path-error.patch
 Patch9: corosync-start-stop-level.patch
 Patch10:bug-1166899-quorumtool-Fix-exit-status-codes.patch
+Patch11:bug-1163460-totemip-Add-support-for-sin6_scope_id.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -138,6 +139,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %if %{with runautogen}

++ bug-1163460-totemip-Add-support-for-sin6_scope_id.patch ++
>From d963c2ab6cac0bf18355159afd815c0eb78e4aa8 Mon Sep 17 00:00:00 2001
From: Jan Friesse 
Date: Mon, 27 Jul 2020 16:10:54 +0200
Subject: [PATCH] totemip: Add support for sin6_scope_id

sin6_scope_id is not present in totemip structure making impossible to
use link-local ipv6 address.

Patch adds new call totemip_totemip_to_sockaddr_convert_with_scopeid
which can be instructed to fill scope id. This function calls
totemip_getif_scopeid which walks local addresses and returns
scope id if interface matches.

Main difference between this patch and
934c47ed4384daf2819c26306bebba3225807499 is fact, that totemip
structure keeps unchanged so corosync stays wire compatible.

This makes corosync work with link-local addresses fine for both UDPU
and UDP transport as long as there is only one matching interface with
this patch.

Big thanks to Aleksei Burlakov  who brought idea
(and implementation) of using totemip_getif_scopeid.

Signed-off-by: Jan Friesse 
Reviewed-by: Christine Caulfield 
---
 exec/totemip.c   | 69 ++--
 exec/totemudp.c  |  7 ++--
 exec/totemudpu.c |  6 ++-
 include/corosync/totem/totemip.h |  4 ++
 4 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/exec/totemip.c b/exec/totemip.c
index f89c70a04..4f08f5375 100644
--- a/exec/totemip.c
+++ b/exec/totemip.c
@@ -50,6 +50,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -267,11 +268,58 @@ const char *totemip_print(const struct totem_ip_address 
*addr)
return (inet_ntop(addr->family, addr->addr, buf, sizeof(buf)));
 }
 
-/* Make a totem_ip_address into a usable sockaddr_storage */
-int totemip_totemip_to_sockaddr_convert(struct totem_ip_address *ip_addr,
-   uint16_t port, struct sockaddr_storage 
*saddr, int *addrlen)
+static int totemip_getif_scopeid(const unsigned char *addr16, unsigned int 
*scopeid)
+{
+   struct ifaddrs *ifa;
+   const struct sockaddr_in6 *sin6;
+   const socklen_t addr_len = sizeof(struct in6_addr);
+   int rc = -1; // 0 = found 1 match; -1 = found 0 matches; -2 = found >1 
matches
+   struct ifaddrs *totemip_getif_scopeid_ifap;
+
+   if (getifaddrs(_getif_scopeid_ifap) != 0) {
+   return (-1);
+   }
+
+   for (ifa = totemip_getif_scopeid_ifap; ifa; ifa = ifa->ifa_next) {
+   if (ifa->ifa_addr == NULL || ifa->ifa_netmask == NULL)
+   continue ;
+
+   if ((ifa->ifa_addr->sa_family != AF_INET6) ||
+   (ifa->ifa_netmask->sa_family != AF_INET6 &&
+ifa->ifa_netmask->sa_family != 0))
+   continue ;
+
+   sin6 = (const struct sockaddr_in6 *)ifa->ifa_addr;
+
+   if (memcmp(>sin6_addr, addr16, addr_len) == 0) {
+   *scopeid = sin6->sin6_scope_id;
+
+   if (rc == -1) {
+

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2020-09-03 01:11:35

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.3399 (New)


Package is "corosync"

Thu Sep  3 01:11:35 2020 rev:69 rq:830047 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2020-04-25 
20:17:57.448739460 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new.3399/corosync.changes  
2020-09-03 01:12:02.368424689 +0200
@@ -1,0 +2,5 @@
+Wed Aug 19 10:18:14 UTC 2020 - Dominique Leuenberger 
+
+- Stop mangling libexecdir: it's not needed at all.
+
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.T28EfC/_old  2020-09-03 01:12:03.216424972 +0200
+++ /var/tmp/diff_new_pack.T28EfC/_new  2020-09-03 01:12:03.220424974 +0200
@@ -42,9 +42,6 @@
 %define buildib 1
 %endif
 %endif
-%if 0%{?suse_version}
-%define _libexecdir %{_libdir}
-%endif
 
 Name:   corosync
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
@@ -287,7 +284,8 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE SECURITY
+%doc SECURITY
+%license LICENSE
 %{_sbindir}/corosync
 %{_sbindir}/corosync-keygen
 %{_sbindir}/corosync-cmapctl

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2020-04-25 20:16:03

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.2738 (New)


Package is "corosync"

Sat Apr 25 20:16:03 2020 rev:68 rq:796299 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2020-03-25 
23:42:40.587981435 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new.2738/corosync.changes  
2020-04-25 20:17:57.448739460 +0200
@@ -1,0 +2,8 @@
+Wed Apr 22 14:13:26 UTC 2020 - XinLiang 
+
+- Revoke the patch bug-1163460-totemip-Add-support-for-sin6_scope_id.patch
+  Deleted: bug-1163460-totemip-Add-support-for-sin6_scope_id.patch
+
+  Reason: That path will cause problems while doing rolling upgrade, see 
bsc#1168771
+
+---

Old:

  bug-1163460-totemip-Add-support-for-sin6_scope_id.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.K1DKy3/_old  2020-04-25 20:17:58.988742635 +0200
+++ /var/tmp/diff_new_pack.K1DKy3/_new  2020-04-25 20:17:58.992742643 +0200
@@ -66,7 +66,6 @@
 Patch8: corosync-init-lockfile-path-error.patch
 Patch9: corosync-start-stop-level.patch
 Patch10:bug-1166899-quorumtool-Fix-exit-status-codes.patch
-Patch11:bug-1163460-totemip-Add-support-for-sin6_scope_id.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -142,7 +141,6 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
-%patch11 -p1
 
 %build
 %if %{with runautogen}

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2020-03-25 23:42:28

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.3160 (New)


Package is "corosync"

Wed Mar 25 23:42:28 2020 rev:67 rq:786911 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2020-03-14 
09:54:06.115055590 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new.3160/corosync.changes  
2020-03-25 23:42:40.587981435 +0100
@@ -1,0 +2,12 @@
+Fri Mar 20 14:07:26 UTC 2020 - XinLiang 
+
+- Fix bsc#1163460 Corosync does not support link-local IPv6 addresses
+  Added: bug-1163460-totemip-Add-support-for-sin6_scope_id.patch 
+
+---
+Wed Mar 18 02:47:13 UTC 2020 - XinLiang 
+
+- Fix bsc#1166899, return value of "corosync-quorumtool -s" was not correct
+  Added: bug-1166899-quorumtool-Fix-exit-status-codes.patch
+
+---

New:

  bug-1163460-totemip-Add-support-for-sin6_scope_id.patch
  bug-1166899-quorumtool-Fix-exit-status-codes.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.rkm3Oo/_old  2020-03-25 23:42:41.703981800 +0100
+++ /var/tmp/diff_new_pack.rkm3Oo/_new  2020-03-25 23:42:41.707981801 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -52,7 +52,7 @@
 Group:  Productivity/Clustering/HA
 Version:2.4.5
 Release:0
-Url:http://corosync.github.io/corosync/
+URL:http://corosync.github.io/corosync/
 # source should be Souce code.tar.gz, 
https://github.com/corosync/corosync/archive/vX.X.X.tar.gz
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
@@ -65,6 +65,8 @@
 Patch7: corosync-2.3.4-fix-bashisms.patch
 Patch8: corosync-init-lockfile-path-error.patch
 Patch9: corosync-start-stop-level.patch
+Patch10:bug-1166899-quorumtool-Fix-exit-status-codes.patch
+Patch11:bug-1163460-totemip-Add-support-for-sin6_scope_id.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -139,6 +141,8 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 %build
 %if %{with runautogen}

++ bug-1163460-totemip-Add-support-for-sin6_scope_id.patch ++
>From 36938e24a8d03f9b8fc97768ed08df36e63f61d0 Mon Sep 17 00:00:00 2001
From: liangxin1300 
Date: Mon, 17 Feb 2020 22:24:31 +0800
Subject: [PATCH] totemip: Add support for sin6_scope_id

sin6_scope_id was not present in totemip structure making impossible to
use link-local ipv6 address.

Patch adds sin6_scope_id and changes convert/copy functions to use it
(formally also comparator functions should be changed, but it seems to
cause more harm and it is not really needed).

This makes corosync work with link-local addresses fine for both UDPU
and UDP transport as long as interface specification is used (so
fe80:::::%eth0).

(backported from master 934c47ed4384daf2819c26306bebba3225807499)

Signed-off-by: liangxin1300 
Reviewed-by: Jan Friesse 
---
 exec/totemip.c   | 15 +++
 include/corosync/coroapi.h   |  1 +
 include/corosync/totem/totemip.h |  1 +
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/exec/totemip.c b/exec/totemip.c
index 28a88365..d8130831 100644
--- a/exec/totemip.c
+++ b/exec/totemip.c
@@ -247,7 +247,7 @@ int totemip_totemip_to_sockaddr_convert(struct 
totem_ip_address *ip_addr,
 #endif
sin->sin6_family = ip_addr->family;
sin->sin6_port = ntohs(port);
-   sin->sin6_scope_id = 2;
+   sin->sin6_scope_id = ip_addr->sin6_scope_id;
memcpy(>sin6_addr, ip_addr->addr, sizeof(struct in6_addr));
 
*addrlen = sizeof(struct sockaddr_in6);
@@ -282,10 +282,13 @@ int totemip_parse(struct totem_ip_address *totemip, const 
char *addr, int family
sa6 = (struct sockaddr_in6 *)ainfo->ai_addr;
totemip->family = ainfo->ai_family;
 
-   if (ainfo->ai_family == AF_INET)
+   if (ainfo->ai_family == AF_INET) {
memcpy(totemip->addr, >sin_addr, sizeof(struct in_addr));
-   else
+   totemip->sin6_scope_id = 0;
+   } else {
memcpy(totemip->addr, >sin6_addr, sizeof(struct in6_addr));
+   

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2020-03-14 09:54:04

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.3160 (New)


Package is "corosync"

Sat Mar 14 09:54:04 2020 rev:66 rq:783591 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2019-11-18 
20:07:32.909678556 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new.3160/corosync.changes  
2020-03-14 09:54:06.115055590 +0100
@@ -1,0 +2,6 @@
+Fri Jan  3 11:30:41 UTC 2020 - matthias.gerst...@suse.com
+
+- Don't package sysconfig file in tmpfiles.d, it's a bug. Instead correctly
+  add it to /etc/sysconfig, invoking fillup accordingly.
+
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.ZWHlVd/_old  2020-03-14 09:54:06.875056148 +0100
+++ /var/tmp/diff_new_pack.ZWHlVd/_new  2020-03-14 09:54:06.875056148 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX 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,6 +15,7 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir /var/adm/fillup-templates
@@ -213,11 +214,9 @@
 rm -rf %{buildroot}%{_docdir}/*
 #remove init scripts for corosync, corosync-qdevice, corosync-qnetd
 rm -rf init/corosync init/corosync-qnetd init/corosync-qdevice
-mkdir -p  %{buildroot}/usr/lib/tmpfiles.d/
 mkdir -p  %{buildroot}/usr/share/doc/packages/corosync/
 mkdir -p  %{buildroot}%{_fillupdir}/
 mkdir -p  %{buildroot}%{_sysconfdir}/init.d/
-install -m 0644 tools/corosync-notifyd.sysconfig.example  
%{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
 install -m 0644 conf/corosync.conf.example* 
%{buildroot}/usr/share/doc/packages/corosync/
 mkdir -p %{buildroot}/usr/lib/corosync
 install -m 0755 init/upgrade.sh %{buildroot}/usr/lib/corosync
@@ -226,6 +225,8 @@
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 init/corosync.sysconfig.example \
%{buildroot}%{_fillupdir}/sysconfig.corosync
+install -m 0644 tools/corosync-notifyd.sysconfig.example \
+   %{buildroot}%{_fillupdir}/sysconfig.corosync-notifyd
 rm -rf %{buildroot}%{localstatedir}/run/
 %if %{with qdevices}
 install -m 644 init/corosync-qdevice.sysconfig.example \
@@ -256,6 +257,7 @@
 %post
 /usr/lib/corosync/upgrade.sh
 %{fillup_only -n corosync}
+%{fillup_only -n corosync-notifyd}
 # Upgrade
 if [ $1 -eq 2 ]; then
 # restore configured /etc/sysconfig/corosync(bsc#1155792)
@@ -311,7 +313,7 @@
 /usr/lib/corosync/upgrade.sh
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example.udpu
-%config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd
+%config(noreplace) %{_fillupdir}/sysconfig.corosync-notifyd
 %config(noreplace) %{_fillupdir}/sysconfig.corosync
 
 %if %{with dbus}

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2019-11-18 20:07:28

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.26869 (New)


Package is "corosync"

Mon Nov 18 20:07:28 2019 rev:65 rq:749107 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2019-11-13 
13:13:44.158786241 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new.26869/corosync.changes 
2019-11-18 20:07:32.909678556 +0100
@@ -6,0 +7 @@
+   Store the tmp file to a more security directory



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.x1allH/_old  2019-11-18 20:07:33.817678101 +0100
+++ /var/tmp/diff_new_pack.x1allH/_new  2019-11-18 20:07:33.821678098 +0100
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
 #Compat macro for new _fillupdir macro introduced in Nov 2017
 %if ! %{defined _fillupdir}
   %define _fillupdir /var/adm/fillup-templates
@@ -258,9 +257,9 @@
 /usr/lib/corosync/upgrade.sh
 %{fillup_only -n corosync}
 # Upgrade
-if [ $1 -eq 2 ] ; then
+if [ $1 -eq 2 ]; then
 # restore configured /etc/sysconfig/corosync(bsc#1155792)
-install -m 0644 %{_sysconfdir}/sysconfig/corosync /tmp/.sysconfig.corosync
+cp %{_sysconfdir}/sysconfig/corosync %{_fillupdir}/tmp.corosync_sysconfig
 fi
 
 %service_add_post corosync.service corosync-notifyd.service
@@ -278,8 +277,8 @@
 fi
 
 %posttrans
-if [ ! -f %{_sysconfdir}/sysconfig/corosync ] ; then
-install -m 0644 /tmp/.sysconfig.corosync %{_sysconfdir}/sysconfig/corosync
+if [ ! -f %{_sysconfdir}/sysconfig/corosync ]; then
+mv %{_fillupdir}/tmp.corosync_sysconfig %{_sysconfdir}/sysconfig/corosync
 fi
 
 %files
@@ -583,8 +582,8 @@
 %post -n corosync-qdevice
 %{fillup_only -n corosync-qdevice}
 # Upgrade
-if [ $1 -eq 2 ] ; then
-install -m 0644 %{_sysconfdir}/sysconfig/corosync-qdevice 
/tmp/.sysconfig.corosync-qdevice
+if [ $1 -eq 2 ]; then
+cp %{_sysconfdir}/sysconfig/corosync-qdevice 
%{_fillupdir}/tmp.corosync-qdevice_sysconfig
 fi
 
 %if %{sles_version} > 0
@@ -607,8 +606,8 @@
 fi
 
 %posttrans -n corosync-qdevice
-if [ ! -f %{_sysconfdir}/sysconfig/corosync-qdevice ] ; then
-install -m 0644 /tmp/.sysconfig.corosync-qdevice 
%{_sysconfdir}/sysconfig/corosync-qdevice
+if [ ! -f %{_sysconfdir}/sysconfig/corosync-qdevice ]; then
+mv %{_fillupdir}/tmp.corosync-qdevice_sysconfig 
%{_sysconfdir}/sysconfig/corosync-qdevice
 fi
 
 %files -n corosync-qdevice
@@ -664,8 +663,8 @@
 %endif
 %{fillup_only -n corosync-qnetd}
 # Upgrade
-if [ $1 -eq 2 ] ; then
-install -m 0644 %{_sysconfdir}/sysconfig/corosync-qnetd 
/tmp/.sysconfig.corosync-qnetd
+if [ $1 -eq 2 ]; then
+cp %{_sysconfdir}/sysconfig/corosync-qnetd 
%{_fillupdir}/tmp.corosync-qnetd_sysconfig
 fi
 
 %service_add_post corosync-qnetd.service
@@ -685,8 +684,8 @@
 fi
 
 %posttrans -n corosync-qnetd
-if [ ! -f %{_sysconfdir}/sysconfig/corosync-qnetd ] ; then
-install -m 0644 /tmp/.sysconfig.corosync-qnetd 
%{_sysconfdir}/sysconfig/corosync-qnetd
+if [ ! -f %{_sysconfdir}/sysconfig/corosync-qnetd ]; then
+mv %{_fillupdir}/tmp.corosync-qnetd_sysconfig 
%{_sysconfdir}/sysconfig/corosync-qnetd
 fi
 
 %files -n corosync-qnetd

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2019-11-13 13:13:42

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.2990 (New)


Package is "corosync"

Wed Nov 13 13:13:42 2019 rev:64 rq:747294 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2019-10-28 
16:44:16.760541590 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new.2990/corosync.changes  
2019-11-13 13:13:44.158786241 +0100
@@ -1,0 +2,7 @@
+Thu Nov  7 06:26:20 UTC 2019 - Yuan Ren 
+
+- Packaging bug updating Corosync(bsc#1155792)
+   Some noisy output from Tumbleweed caused by RPM macro not fairly used
+   Make sure corosync sysconfig keep original configured firstly(bsc1153502)
+   
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.78PeYv/_old  2019-11-13 13:13:45.366787498 +0100
+++ /var/tmp/diff_new_pack.78PeYv/_new  2019-11-13 13:13:45.366787498 +0100
@@ -256,8 +256,13 @@
 
 %post
 /usr/lib/corosync/upgrade.sh
-%tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd
-%{fillup_and_insserv -n corosync}
+%{fillup_only -n corosync}
+# Upgrade
+if [ $1 -eq 2 ] ; then
+# restore configured /etc/sysconfig/corosync(bsc#1155792)
+install -m 0644 %{_sysconfdir}/sysconfig/corosync /tmp/.sysconfig.corosync
+fi
+
 %service_add_post corosync.service corosync-notifyd.service
 
 rm -rf  %{_sysconfdir}/corosync/corosync.conf.example 
%{_sysconfdir}/corosync/corosync.conf.example.unicast
@@ -268,8 +273,13 @@
 %service_del_preun corosync.service corosync-notifyd.service
 
 %postun
-if [ -f /etc/sysconfig/corosync ]; then
-rm /etc/sysconfig/corosync
+if [ -f %{_sysconfdir}/sysconfig/corosync ]; then
+rm %{_sysconfdir}/sysconfig/corosync
+fi
+
+%posttrans
+if [ ! -f %{_sysconfdir}/sysconfig/corosync ] ; then
+install -m 0644 /tmp/.sysconfig.corosync %{_sysconfdir}/sysconfig/corosync
 fi
 
 %files
@@ -571,7 +581,12 @@
 %service_add_pre corosync-qdevice.service
 
 %post -n corosync-qdevice
-%{fillup_and_insserv -n corosync-qdevice}
+%{fillup_only -n corosync-qdevice}
+# Upgrade
+if [ $1 -eq 2 ] ; then
+install -m 0644 %{_sysconfdir}/sysconfig/corosync-qdevice 
/tmp/.sysconfig.corosync-qdevice
+fi
+
 %if %{sles_version} > 0
 ln -s /run/corosync-qdevice /var/run/
 %endif
@@ -584,11 +599,17 @@
 unlink /var/run/corosync-qdevice
 %endif
 
+%service_del_postun corosync-qdevice.service
+
 %postun -n corosync-qdevice
-if [ -f /etc/sysconfig/corosync-qdevice ]; then
-rm /etc/sysconfig/corosync-qdevice
+if [ -f %{_sysconfdir}/sysconfig/corosync-qdevice ]; then
+rm %{_sysconfdir}/sysconfig/corosync-qdevice
+fi
+
+%posttrans -n corosync-qdevice
+if [ ! -f %{_sysconfdir}/sysconfig/corosync-qdevice ] ; then
+install -m 0644 /tmp/.sysconfig.corosync-qdevice 
%{_sysconfdir}/sysconfig/corosync-qdevice
 fi
-%service_del_postun corosync-qdevice.service
 
 %files -n corosync-qdevice
 %defattr(-,root,root,-)
@@ -641,7 +662,11 @@
 %if %{sles_version} > 0
 ln -s /run/corosync-qnetd /var/run/
 %endif
-%{fillup_and_insserv -n corosync-qnetd}
+%{fillup_only -n corosync-qnetd}
+# Upgrade
+if [ $1 -eq 2 ] ; then
+install -m 0644 %{_sysconfdir}/sysconfig/corosync-qnetd 
/tmp/.sysconfig.corosync-qnetd
+fi
 
 %service_add_post corosync-qnetd.service
 
@@ -652,11 +677,17 @@
 unlink /var/run/corosync-qnetd
 %endif
 
+%service_del_postun corosync-qnetd.service
+
 %postun -n corosync-qnetd
-if [ -f /etc/sysconfig/corosync-qnetd ];then
-rm /etc/sysconfig/corosync-qnetd
+if [ -f %{_sysconfdir}/sysconfig/corosync-qnetd ]; then
+rm %{_sysconfdir}/sysconfig/corosync-qnetd
+fi
+
+%posttrans -n corosync-qnetd
+if [ ! -f %{_sysconfdir}/sysconfig/corosync-qnetd ] ; then
+install -m 0644 /tmp/.sysconfig.corosync-qnetd 
%{_sysconfdir}/sysconfig/corosync-qnetd
 fi
-%service_del_postun corosync-qnetd.service
 
 %files -n corosync-qnetd
 %defattr(-,root,root,-)

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2019-10-28 16:44:15

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.2990 (New)


Package is "corosync"

Mon Oct 28 16:44:15 2019 rev:63 rq:742115 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2019-10-22 
15:36:39.249117284 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new.2990/corosync.changes  
2019-10-28 16:44:16.760541590 +0100
@@ -28 +28 @@
-   0012-cpg-inform-clients-about-left-nodes-during-pause.patch
+   0012-cpg-Inform-clients-about-left-nodes-during-pause.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.TqYiKi/_old  2019-10-28 16:44:17.292542267 +0100
+++ /var/tmp/diff_new_pack.TqYiKi/_new  2019-10-28 16:44:17.292542267 +0100
@@ -53,6 +53,7 @@
 Version:2.4.5
 Release:0
 Url:http://corosync.github.io/corosync/
+# source should be Souce code.tar.gz, 
https://github.com/corosync/corosync/archive/vX.X.X.tar.gz
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
 Patch1: 
upstream-afd97d7884940_coroapi-Use-size_t-for-private_data_size.patch

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2019-10-22 15:36:37

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.2352 (New)


Package is "corosync"

Tue Oct 22 15:36:37 2019 rev:62 rq:736413 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2019-08-24 
18:41:34.653785206 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new.2352/corosync.changes  
2019-10-22 15:36:39.249117284 +0200
@@ -1,0 +2,6 @@
+Wed Oct  9 07:55:48 UTC 2019 - Yuan Ren 
+
+- Replace corosync-2.4.5.tar.gz with a clean source.tar.gz(bsc#1144200) 
+   The reason is some binaries left in corosync-2.4.5.tar.gz
+
+---



Other differences:
--
++ corosync-2.4.5.tar.gz ++
 87763 lines of diff (skipped)

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2019-08-24 18:41:33

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.7948 (New)


Package is "corosync"

Sat Aug 24 18:41:33 2019 rev:61 rq:724897 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2019-08-15 
15:42:20.899210042 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new.7948/corosync.changes  
2019-08-24 18:41:34.653785206 +0200
@@ -2,2 +2 @@
-
-Fri Aug  2 09:39:35 UTC 2019 - Yuan Ren 
+Fri Aug 16 09:50:28 UTC 2019 - Yuan Ren 
@@ -9,23 +8,24 @@
-Add:0001-disable-build-html-docs.patch
-Add:bsc#1083561-upgrade-from-1-x-y.patch
-Add:0002-Fix-compile-warnings-with-GCC-7.2.1.patch
-Remove: disable-build-html-docs.patch
-Remove: 0001-coroapi-Use-size_t-for-private_data_size.patch
-Remove: 0002-fix-ifdown-udp.patch
-Remove: 0003-fix-tmpfiles-create.patch
-Remove: 0004-mark-corosync-as-a-static-service.patch
-Remove: 0005-do-not-convert-empty-uid-gid-to-0.patch
-Remove: 0006-Fix-compile-warnings-with-GCC-7.2.1.patch
-Remove: 0007-add-config-for-corosync-qnetd.patch
-Remove: 0008-bsc#1083561-upgrade-from-1-x-y.patch
-Remove: 0009-bsc#1088619-add-version.patch
-Remove: 0010-qdevice-net-instance.c-optarg-should-be-str.patch
-Remove: 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch
-Remove: 0012-cpg-Inform-clients-about-left-nodes-during-pause.patch
-Remove: bnc#872651-stop-cluster.patch
-Remove: bnc#882449-corosync-conf-example.patch
-Remove: bsc#1001164-corosync.conf-example.patch
-Remove: bsc#1141536-corosync-qdevice-Nss-new-database-files.patch
-Remove: corosync-2.3.4-fix-bashisms.patch
-Remove: corosync-init-lockfile-path-error.patch
-Remove: corosync-start-stop-level.patch
+   
+   Added:
+   corosync-2.4.5.tar.gz
+   bug-1001164_corosync.conf-example.patch
+   corosync-init-lockfile-path-error.patch
+   Deleted:
+   corosync-2.4.4.tar.gz
+   0003-fix-tmpfiles-create.patch
+   0004-mark-corosync-as-a-static-service.patch
+   0005-do-not-convert-empty-uid-gid-to-0.patch
+   0007-add-config-for-corosync-qnetd.patch
+   0009-bsc#1088619-add-version.patch
+   0010-qdevice-net-instance.c-optarg-should-be-str.patch
+   0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch
+   0012-cpg-inform-clients-about-left-nodes-during-pause.patch
+   bnc#872651-stop-cluster.patch
+   disable-build-html-docs.patch
+   Renamed:
+   0001-coroapi-Use-size_t-for-private_data_size.patch -> 
upstream-afd97d7884940_coroapi-Use-size_t-for-private_data_size.patch 
+   0006-Fix-compile-warnings-with-GCC-7.2.1.patch -> 
Fix-compile-warnings-with-GCC-7.2.1.patch
+   0008-bsc#1083561-upgrade-from-1-x-y.patch -> 
bug-1083561_upgrade-from-1-x-y.patch
+   bnc#882449-corosync-conf-example.patch -> 
bug-882449_corosync-conf-example.patch
+   0002-fix-ifdown-udp.patch -> bug-1032634_fix-ifdown-udp.patch
+   bsc#1001164-corosync.conf-example.patch -> 
bug-1001164_corosync.conf-example.patch

Old:

  0001-disable-build-html-docs.patch
  0002-Fix-compile-warnings-with-GCC-7.2.1.patch
  bsc#1083561-upgrade-from-1-x-y.patch

New:

  Fix-compile-warnings-with-GCC-7.2.1.patch
  bug-1001164_corosync.conf-example.patch
  bug-1032634_fix-ifdown-udp.patch
  bug-1083561_upgrade-from-1-x-y.patch
  bug-882449_corosync-conf-example.patch
  corosync-2.3.4-fix-bashisms.patch
  corosync-init-lockfile-path-error.patch
  corosync-start-stop-level.patch
  upstream-afd97d7884940_coroapi-Use-size_t-for-private_data_size.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.Mkr5nQ/_old  2019-08-24 18:41:35.437785131 +0200
+++ /var/tmp/diff_new_pack.Mkr5nQ/_new  2019-08-24 18:41:35.441785130 +0200
@@ -55,9 +55,15 @@
 Url:http://corosync.github.io/corosync/
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
-Patch1: bsc#1083561-upgrade-from-1-x-y.patch
-Patch2: 0001-disable-build-html-docs.patch
-Patch3: 0002-Fix-compile-warnings-with-GCC-7.2.1.patch
+Patch1: 
upstream-afd97d7884940_coroapi-Use-size_t-for-private_data_size.patch
+Patch2:Fix-compile-warnings-with-GCC-7.2.1.patch
+Patch3:bug-1083561_upgrade-from-1-x-y.patch
+Patch4:bug-882449_corosync-conf-example.patch
+Patch5:bug-1032634_fix-ifdown-udp.patch
+Patch6:bug-1001164_corosync.conf-example.patch
+Patch7:corosync-2.3.4-fix-bashisms.patch
+Patch8:

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2019-08-15 15:42:19

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new.9556 (New)


Package is "corosync"

Thu Aug 15 15:42:19 2019 rev:60 rq:721955 version:2.4.5

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-05-04 
11:25:46.863951274 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new.9556/corosync.changes  
2019-08-15 15:42:20.899210042 +0200
@@ -1,0 +2,32 @@
+
+Fri Aug  2 09:39:35 UTC 2019 - Yuan Ren 
+
+-  corosync-2.4.5 upgrade(bsc#1144200)
+block_unlisted_ips block package from ips not in nodelist
+Qnetd now supports updated NSS database format
+Partly fixed problem with ifdown (only for UDPU)
+Add:0001-disable-build-html-docs.patch
+Add:bsc#1083561-upgrade-from-1-x-y.patch
+Add:0002-Fix-compile-warnings-with-GCC-7.2.1.patch
+Remove: disable-build-html-docs.patch
+Remove: 0001-coroapi-Use-size_t-for-private_data_size.patch
+Remove: 0002-fix-ifdown-udp.patch
+Remove: 0003-fix-tmpfiles-create.patch
+Remove: 0004-mark-corosync-as-a-static-service.patch
+Remove: 0005-do-not-convert-empty-uid-gid-to-0.patch
+Remove: 0006-Fix-compile-warnings-with-GCC-7.2.1.patch
+Remove: 0007-add-config-for-corosync-qnetd.patch
+Remove: 0008-bsc#1083561-upgrade-from-1-x-y.patch
+Remove: 0009-bsc#1088619-add-version.patch
+Remove: 0010-qdevice-net-instance.c-optarg-should-be-str.patch
+Remove: 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch
+Remove: 0012-cpg-Inform-clients-about-left-nodes-during-pause.patch
+Remove: bnc#872651-stop-cluster.patch
+Remove: bnc#882449-corosync-conf-example.patch
+Remove: bsc#1001164-corosync.conf-example.patch
+Remove: bsc#1141536-corosync-qdevice-Nss-new-database-files.patch
+Remove: corosync-2.3.4-fix-bashisms.patch
+Remove: corosync-init-lockfile-path-error.patch
+Remove: corosync-start-stop-level.patch
+
+---

Old:

  0001-coroapi-Use-size_t-for-private_data_size.patch
  0002-fix-ifdown-udp.patch
  0003-fix-tmpfiles-create.patch
  0004-mark-corosync-as-a-static-service.patch
  0005-do-not-convert-empty-uid-gid-to-0.patch
  0006-Fix-compile-warnings-with-GCC-7.2.1.patch
  0007-add-config-for-corosync-qnetd.patch
  0008-bsc#1083561-upgrade-from-1-x-y.patch
  0009-bsc#1088619-add-version.patch
  0010-qdevice-net-instance.c-optarg-should-be-str.patch
  0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch
  0012-cpg-Inform-clients-about-left-nodes-during-pause.patch
  bnc#872651-stop-cluster.patch
  bnc#882449-corosync-conf-example.patch
  bsc#1001164-corosync.conf-example.patch
  corosync-2.3.4-fix-bashisms.patch
  corosync-2.4.4.tar.gz
  corosync-init-lockfile-path-error.patch
  corosync-start-stop-level.patch
  disable-build-html-docs.patch

New:

  0001-disable-build-html-docs.patch
  0002-Fix-compile-warnings-with-GCC-7.2.1.patch
  bsc#1083561-upgrade-from-1-x-y.patch
  corosync-2.4.5.tar.gz



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.GjVtdA/_old  2019-08-15 15:42:21.411209923 +0200
+++ /var/tmp/diff_new_pack.GjVtdA/_new  2019-08-15 15:42:21.411209923 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -50,30 +50,14 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:2.4.4
+Version:2.4.5
 Release:0
 Url:http://corosync.github.io/corosync/
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
-Patch1: corosync-init-lockfile-path-error.patch
-Patch2: bnc#872651-stop-cluster.patch
-Patch3: bnc#882449-corosync-conf-example.patch
-Patch4: corosync-2.3.4-fix-bashisms.patch
-Patch5: bsc#1001164-corosync.conf-example.patch
-Patch6: corosync-start-stop-level.patch
-Patch7: disable-build-html-docs.patch
-Patch8: 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-05-04 11:25:44

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Fri May  4 11:25:44 2018 rev:59 rq:602894 version:2.4.4

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-04-30 
22:51:19.125143219 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-05-04 
11:25:46.863951274 +0200
@@ -1,0 +2,6 @@
+Wed May  2 02:36:56 UTC 2018 - b...@suse.com
+
+- cpg: Inform clients about left nodes during pause(bsc#1091593)
+Added: 0012-cpg-Inform-clients-about-left-nodes-during-pause.patch
+
+---

New:

  0012-cpg-Inform-clients-about-left-nodes-during-pause.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.176VXL/_old  2018-05-04 11:25:47.639922811 +0200
+++ /var/tmp/diff_new_pack.176VXL/_new  2018-05-04 11:25:47.643922665 +0200
@@ -73,6 +73,7 @@
 Patch16:0009-bsc#1088619-add-version.patch
 Patch17:0010-qdevice-net-instance.c-optarg-should-be-str.patch
 Patch18:0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch
+Patch19:0012-cpg-Inform-clients-about-left-nodes-during-pause.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -156,6 +157,7 @@
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 %if %{with runautogen}

++ 0012-cpg-Inform-clients-about-left-nodes-during-pause.patch ++
Subject: [PATCH] cpg: Inform clients about left nodes during pause

Patch tries to fix incorrect behaviour during following test-case:
- 3 nodes
- Node 1 is paused
- Node 2 and 3 detects node 1 as failed and informs CPG clients
- Node 1 is unpaused
- Node 1 clients are informed about new membership, but not about Node 1
  being paused, so from Node 1 point-of-view, Node 2 and 3 failure

Solution is to:
- Remove downlist master choose and always choose local node downlist.
  For Node 1 in example above, downlist contains Node 2 and 3.
- Keep code which informs clients about left nodes
- Use joinlist as a authoritative source of nodes/clients which exists
  in membership

---
 exec/cpg.c | 164 +
 1 file changed, 11 insertions(+), 153 deletions(-)

diff --git a/exec/cpg.c b/exec/cpg.c
index 78ac1e9e..b851cba3 100644
--- a/exec/cpg.c
+++ b/exec/cpg.c
@@ -139,13 +139,6 @@ enum cpg_sync_state {
CPGSYNC_JOINLIST
 };
 
-enum cpg_downlist_state_e {
-   CPG_DOWNLIST_NONE,
-   CPG_DOWNLIST_WAITING_FOR_MESSAGES,
-   CPG_DOWNLIST_APPLYING,
-};
-static enum cpg_downlist_state_e downlist_state;
-static struct list_head downlist_messages_head;
 static struct list_head joinlist_messages_head;
 
 struct cpg_pd {
@@ -295,9 +288,7 @@ static int cpg_exec_send_downlist(void);
 
 static int cpg_exec_send_joinlist(void);
 
-static void downlist_messages_delete (void);
-
-static void downlist_master_choose_and_send (void);
+static void downlist_inform_clients (void);
 
 static void joinlist_inform_clients (void);
 
@@ -499,14 +490,6 @@ struct req_exec_cpg_downlist {
mar_uint32_t nodeids[PROCESSOR_COUNT_MAX]  __attribute__((aligned(8)));
 };
 
-struct downlist_msg {
-   mar_uint32_t sender_nodeid;
-   mar_uint32_t old_members __attribute__((aligned(8)));
-   mar_uint32_t left_nodes __attribute__((aligned(8)));
-   mar_uint32_t nodeids[PROCESSOR_COUNT_MAX]  __attribute__((aligned(8)));
-   struct list_head list;
-};
-
 struct joinlist_msg {
mar_uint32_t sender_nodeid;
uint32_t pid;
@@ -566,8 +549,6 @@ static void cpg_sync_init (
last_sync_ring_id.nodeid = ring_id->rep.nodeid;
last_sync_ring_id.seq = ring_id->seq;
 
-   downlist_state = CPG_DOWNLIST_WAITING_FOR_MESSAGES;
-
entries = 0;
/*
 * Determine list of nodeids for downlist message
@@ -611,14 +592,10 @@ static void cpg_sync_activate (void)
my_member_list_entries * sizeof (unsigned int));
my_old_member_list_entries = my_member_list_entries;
 
-   if (downlist_state == CPG_DOWNLIST_WAITING_FOR_MESSAGES) {
-   downlist_master_choose_and_send ();
-   }
+   downlist_inform_clients ();
 
joinlist_inform_clients ();
 
-   downlist_messages_delete ();
-   downlist_state = CPG_DOWNLIST_NONE;
joinlist_messages_delete ();
 
notify_lib_totem_membership (NULL, my_member_list_entries, 
my_member_list);
@@ -626,8 +603,7 @@ static void cpg_sync_activate 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-04-30 22:51:15

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Mon Apr 30 22:51:15 2018 rev:58 rq:601110 version:2.4.4

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-04-22 
14:34:42.503674637 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-04-30 
22:51:19.125143219 +0200
@@ -1,0 +2,6 @@
+Thu Apr 26 06:43:54 UTC 2018 - b...@suse.com
+
+- NSS_NoDB_Init: the parameter is reserved, must be NULL(bsc#1090996)
+Added: 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch
+
+---

New:

  0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.cgW6f4/_old  2018-04-30 22:51:19.857116512 +0200
+++ /var/tmp/diff_new_pack.cgW6f4/_new  2018-04-30 22:51:19.857116512 +0200
@@ -72,6 +72,7 @@
 Patch15:0008-bsc#1083561-upgrade-from-1-x-y.patch
 Patch16:0009-bsc#1088619-add-version.patch
 Patch17:0010-qdevice-net-instance.c-optarg-should-be-str.patch
+Patch18:0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -154,6 +155,7 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
 
 %build
 %if %{with runautogen}

++ 0011-NSS_NoDB_Init-the-parameter-is-reserved-must-be-NULL.patch ++
>From 4f6a22ae78055da7b89e237ea6bf6449610a1b90 Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Thu, 26 Apr 2018 14:30:31 +0800
Subject: [PATCH] NSS_NoDB_Init: the parameter is reserved, must be NULL

---
 cts/agents/cpg_test_agent.c | 2 +-
 exec/totemcrypto.c  | 2 +-
 test/cpgverify.c| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cts/agents/cpg_test_agent.c b/cts/agents/cpg_test_agent.c
index 0837c69c..9ac9b4c2 100644
--- a/cts/agents/cpg_test_agent.c
+++ b/cts/agents/cpg_test_agent.c
@@ -788,7 +788,7 @@ main(int argc, char *argv[])
list_init (_log_head);
list_init (_chg_log_head);
 
-   if (NSS_NoDB_Init(".") != SECSuccess) {
+   if (NSS_NoDB_Init(NULL) != SECSuccess) {
qb_log(LOG_ERR, "Couldn't initialize nss");
exit (0);
}
diff --git a/exec/totemcrypto.c b/exec/totemcrypto.c
index 64246c98..b35683f9 100644
--- a/exec/totemcrypto.c
+++ b/exec/totemcrypto.c
@@ -670,7 +670,7 @@ static int init_nss_db(struct crypto_instance *instance)
return 0;
}
 
-   if (NSS_NoDB_Init(".") != SECSuccess) {
+   if (NSS_NoDB_Init(NULL) != SECSuccess) {
log_printf(instance->log_level_security, "NSS DB initialization 
failed (err %d)",
   PR_GetError());
return -1;
diff --git a/test/cpgverify.c b/test/cpgverify.c
index 928eff33..0462a34d 100644
--- a/test/cpgverify.c
+++ b/test/cpgverify.c
@@ -137,7 +137,7 @@ int main (int argc, char *argv[])
exit (0);
}
 
-   if (NSS_NoDB_Init(".") != SECSuccess) {
+   if (NSS_NoDB_Init(NULL) != SECSuccess) {
printf ("Couldn't initialize nss\n");
exit (0);
}
-- 
2.13.6

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-04-22 14:34:39

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Sun Apr 22 14:34:39 2018 rev:57 rq:598465 version:2.4.4

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-04-17 
11:13:22.706056309 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-04-22 
14:34:42.503674637 +0200
@@ -1,0 +2,78 @@
+Tue Apr 17 10:19:52 UTC 2018 - b...@suse.com
+
+- corosync-2.4.4 is available now(bsc#1089836)
+  man:fix in corosync-qdevice.8
+  quorumtool: remove duplicated help message
+  cfg: nodeid should be unsigned int
+  coroparse: Use readdir instead of readdir_r
+  wd: fix snprintf warnings
+  Fix compile errors in qdevice on FreeBSD
+  qdevice: mv free(str) after port validation
+  Fix various typos
+  Fix typo: recomended -> recommended
+  man: support SOURCE_DATE_EPOCH
+  configure: add --with-initconfigdir option
+  Use static case blocks to determine distro flavor
+  Use RuntimeDirectory instead of tmpfiles.d
+  coroparse: Do not convert empty uid, gid to 0
+  sam: Fix snprintf compiler warnings
+  quorumtool: Use full buffer size in snprintf
+  man: Add note about qdevice parallel cmds start
+  sync: Remove unneeded determine sync code
+  sync: Call sync_init of all services at once
+  corosync.conf: publicize nodelist.node.name
+  totemudp[u]: Drop truncated packets on receive
+  logging: Make blackbox configurable
+  logging: Close before and open blackbox after fork
+  init: Quote subshell result properly
+  blackbox: Quote subshell result properly
+  qdevice: quote certutils scripts properly
+  sam_test_agent: Remove unused assignment
+  qdevice: Fix NULL pointer dereference
+  quorumtool: Don't set our_flags without v_handle
+  qdevice: Nodelist is set into string not array
+  qdevice: Check if user_data can be dereferenced
+  qdevice: Add safer wrapper of strtoll
+  qdevice: Replace strtol by strtonum
+  qnetd: Replace strtol by strtonum
+  main: Set errno before calling of strtol
+  totemcrypto: Implement bad crypto header guess
+  cpg: Use list_del instead of qb_list_del
+  totemcrypto: Check length of the packet
+  totemsrp: Implement sanity checks of received msgs
+  totemsrp: Check join and leave msg length
+  totemudp: Check lenght of message to sent
+  qdevice msgio: Fix reading of msg longer than i32
+  logsys: Avoid redundant callsite section checking
+  man: corosync-qdevice: fix formatting vs. punctuation
+  man: corosync-qdevice: some more stylistics
+  man: fix cpg_mcast_joined.3.in
+  libcpg: Fix issue with partial big packet assembly
+  totempg: Fix fragmentation segfault
+  totempg: use iovec[i].iov_len instead of copy_len
+  totempg: Fix corrupted messages
+  cpg: Handle fragmented message sending interrupt
+  corosync.aug: Add missing options
+  systemd: Delete unnecessary soft_margin
+
+Added:
+corosync-2.4.4.tar.gz
+0010-qdevice-net-instance.c-optarg-should-be-str.patch
+Deleted:
+0007-sync-Call-sync_init-of-all-services-at-once.patch
+0008-wd-fix-snprintf-warnings.patch
+0009-add-config-for-corosync-qnetd.patch
+0010-qdevice-mv-free-str-after-port-validation.patch
+0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch
+0012-totemudp-u-Drop-truncated-packets-on-receive.patch
+0013-logging-Make-blackbox-configurable.patch
+0014-logging-Close-before-and-open-blackbox-after-fork.patch
+0015-coverity-fixes.patch
+0018-bsc#1089346-corosync-Integer-overflow-in-totemcrypto.patch
+corosync-2.4.3.tar.gz
+Renamed:
+0009-add-config-for-corosync-qnetd.patch -> 
0007-add-config-for-corosync-qnetd.patch
+0016-bsc#1083561-upgrade-from-1-x-y.patch -> 
0008-bsc#1083561-upgrade-from-1-x-y.patch
+0017-bsc#1088619-add-version.patch -> 
0009-bsc#1088619-add-version.patch
+
+---

Old:

  0007-sync-Call-sync_init-of-all-services-at-once.patch
  0008-wd-fix-snprintf-warnings.patch
  0009-add-config-for-corosync-qnetd.patch
  0010-qdevice-mv-free-str-after-port-validation.patch
  0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch
  0012-totemudp-u-Drop-truncated-packets-on-receive.patch
  0013-logging-Make-blackbox-configurable.patch
  0014-logging-Close-before-and-open-blackbox-after-fork.patch
  0015-coverity-fixes.patch
  0016-bsc#1083561-upgrade-from-1-x-y.patch
  

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-04-17 11:13:19

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Tue Apr 17 11:13:19 2018 rev:56 rq:596062 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-03-12 
12:07:42.900070524 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-04-17 
11:13:22.706056309 +0200
@@ -1,0 +2,12 @@
+Fri Apr 13 05:17:10 UTC 2018 - b...@suse.com
+
+-  (CVE-2018-1084) VUL-0: CVE-2018-1084: corosync: Integer overflow in 
totemcrypto(bsc#1089346)
+Added: 0018-bsc#1089346-corosync-Integer-overflow-in-totemcrypto.patch
+
+---
+Tue Apr 10 02:46:08 UTC 2018 - b...@suse.com
+
+- UNKNOWN version in corosync pkg-config(bsc#1088619)
+Added: 0017-bsc#1088619-add-version.patch
+
+---

New:

  0017-bsc#1088619-add-version.patch
  0018-bsc#1089346-corosync-Integer-overflow-in-totemcrypto.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.L0D7FR/_old  2018-04-17 11:13:23.394024042 +0200
+++ /var/tmp/diff_new_pack.L0D7FR/_new  2018-04-17 11:13:23.398023855 +0200
@@ -78,6 +78,8 @@
 Patch21:0014-logging-Close-before-and-open-blackbox-after-fork.patch
 Patch22:0015-coverity-fixes.patch
 Patch23:0016-bsc#1083561-upgrade-from-1-x-y.patch
+Patch24:0017-bsc#1088619-add-version.patch
+Patch25:0018-bsc#1089346-corosync-Integer-overflow-in-totemcrypto.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -166,6 +168,8 @@
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 %build
 %if %{with runautogen}

++ 0017-bsc#1088619-add-version.patch ++
--- /dev/null 2018-04-10 08:30:37.121221591 +0800
+++ corosync-2.4.3/.tarball-version 2018-04-10 18:30:37.907779088 +0800
@@ -0,0 +1 @@
+2.4.3
++ 0018-bsc#1089346-corosync-Integer-overflow-in-totemcrypto.patch ++
--- corosync-2.4.3.orig/exec/totemcrypto.c  2017-10-20 20:40:19.0 
+0800
+++ corosync-2.4.3/exec/totemcrypto.c   2018-04-13 13:01:02.864922963 +0800
@@ -736,6 +736,11 @@
unsigned char   tmp_hash[hash_len[instance->crypto_hash_type]];
int datalen = *buf_len - 
hash_len[instance->crypto_hash_type];
 
+   if (*buf_len <= hash_len[instance->crypto_hash_type]) {
+   log_printf(instance->log_level_security, "Received 
message is too short...  ignoring");
+   return -1;
+   }
+
if (calculate_nss_hash(instance, buf, datalen, tmp_hash) < 0) {
return -1;
}
@@ -845,6 +850,11 @@
 {
struct crypto_config_header *cch = (struct crypto_config_header *)buf;
 
+   if (*buf_len <= sizeof(struct crypto_config_header)) {
+   log_printf(instance->log_level_security, "Received message is 
too short...  ignoring");
+   return (-1);
+   }
+
if (cch->crypto_cipher_type != CRYPTO_CIPHER_TYPE_2_3) {
log_printf(instance->log_level_security,
   "Incoming packet has different crypto type. 
Rejecting");

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-03-12 12:07:41

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Mon Mar 12 12:07:41 2018 rev:55 rq:584184 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-03-07 
10:30:37.011267111 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-03-12 
12:07:42.900070524 +0100
@@ -1,0 +2,6 @@
+Thu Mar  8 06:19:09 UTC 2018 - b...@suse.com
+
+- [Build 489.1] Corosync is not working after upgrade from sle11sp4-ha to 
sle15-ha(bsc#1083561) 
+Added: 0016-bsc#1083561-upgrade-from-1-x-y.patch
+
+---

New:

  0016-bsc#1083561-upgrade-from-1-x-y.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.DAdpOL/_old  2018-03-12 12:07:45.431979772 +0100
+++ /var/tmp/diff_new_pack.DAdpOL/_new  2018-03-12 12:07:45.435979629 +0100
@@ -77,6 +77,7 @@
 Patch20:0013-logging-Make-blackbox-configurable.patch
 Patch21:0014-logging-Close-before-and-open-blackbox-after-fork.patch
 Patch22:0015-coverity-fixes.patch
+Patch23:0016-bsc#1083561-upgrade-from-1-x-y.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -164,6 +165,7 @@
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
+%patch23 -p1
 
 %build
 %if %{with runautogen}
@@ -245,6 +247,8 @@
 mkdir -p  %{buildroot}%{_sysconfdir}/init.d/
 install -m 0644 tools/corosync-notifyd.sysconfig.example  
%{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
 install -m 0644 conf/corosync.conf.example* 
%{buildroot}/usr/share/doc/packages/corosync/
+mkdir -p %{buildroot}/usr/lib/corosync
+install -m 0755 init/upgrade.sh %{buildroot}/usr/lib/corosync
 rm -rf %{buildroot}/etc/corosync/corosync.conf.example*
 rm -rf %{buildroot}/etc/logrotate.d/
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
@@ -280,6 +284,7 @@
 %service_add_pre corosync.service corosync-notifyd.service
 
 %post
+/usr/lib/corosync/upgrade.sh
 %tmpfiles_create /usr/lib/tmpfiles.d/corosync-notifyd
 %{fillup_and_insserv -n corosync}
 %service_add_post corosync.service corosync-notifyd.service
@@ -322,6 +327,8 @@
 %dir %{_sysconfdir}/corosync
 %dir %{_sysconfdir}/corosync/uidgid.d
 %dir %{_datadir}/doc/corosync/
+%dir /usr/lib/corosync/
+/usr/lib/corosync/upgrade.sh
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example.udpu
 %config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd

++ 0016-bsc#1083561-upgrade-from-1-x-y.patch ++
>From 374895340ebaa41bee26a2c2272bc9e3906ede22 Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Thu, 8 Mar 2018 13:34:54 +0800
Subject: [PATCH] add init-upgrade.patch

---
 init/upgrade.sh | 18 ++
 1 file changed, 18 insertions(+)
 create mode 100644 init/upgrade.sh

diff --git a/init/upgrade.sh b/init/upgrade.sh
new file mode 100644
index ..774aece9
--- /dev/null
+++ b/init/upgrade.sh
@@ -0,0 +1,18 @@
+#! /bin/bash
+CONFIG_FILE=/etc/corosync/corosync.conf
+CONFIG_FILE_OLD=/etc/corosync/corosync.conf.old
+
+if [ -f $CONFIG_FILE ]; then
+cp $CONFIG_FILE $CONFIG_FILE_OLD
+#lots of operations
+sed -i "/amf\ *{/,/\ *}/d" $CONFIG_FILE && \
+sed -i "/aisexec\ *{/,/\ *}/d" $CONFIG_FILE && \
+sed -i "/service\ *{/,/\ *}/d" $CONFIG_FILE && \
+#sed -i "/token:/,/max_messages:/d" $CONFIG_FILE && \
+sed -i "s/AMF/QUORUM/g" $CONFIG_FILE
+if [ $? -ne 0 ]; then
+cp $CONFIG_FILE_OLD $CONFIG_FILE
+else
+rm $CONFIG_FILE_OLD
+fi
+fi
-- 
2.13.6

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-03-07 10:30:34

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Wed Mar  7 10:30:34 2018 rev:54 rq:582537 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-02-03 
15:41:07.369237681 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-03-07 
10:30:37.011267111 +0100
@@ -1,0 +2,6 @@
+Mon Mar  5 08:24:30 UTC 2018 - b...@suse.com
+
+- some coverity fixes for corosync on upstream(bsc#1083895)
+Added: 0015-coverity-fixes.patch
+
+---

New:

  0015-coverity-fixes.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.oYXbP9/_old  2018-03-07 10:30:38.111227433 +0100
+++ /var/tmp/diff_new_pack.oYXbP9/_new  2018-03-07 10:30:38.115227290 +0100
@@ -76,6 +76,7 @@
 Patch19:0012-totemudp-u-Drop-truncated-packets-on-receive.patch
 Patch20:0013-logging-Make-blackbox-configurable.patch
 Patch21:0014-logging-Close-before-and-open-blackbox-after-fork.patch
+Patch22:0015-coverity-fixes.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -162,6 +163,7 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 %if %{with runautogen}

++ 0015-coverity-fixes.patch ++
 999 lines (skipped)

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-02-03 15:41:04

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Sat Feb  3 15:41:04 2018 rev:53 rq:571271 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-01-16 
09:33:30.822559884 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-02-03 
15:41:07.369237681 +0100
@@ -1,0 +2,16 @@
+Wed Jan 31 05:59:06 UTC 2018 - b...@suse.com
+
+- corosync exposes itself for a self-crash under rare circumstance(bsc#1078412)
+Added: 0013-logging-Make-blackbox-configurable.patch
+   0014-logging-Close-before-and-open-blackbox-after-fork.patch
+
+Modified: remove unncessary git commit messages
+   0001-coroapi-Use-size_t-for-private_data_size.patch
+   0002-fix-ifdown-udp.patch
+   0005-do-not-convert-empty-uid-gid-to-0.patch
+   0008-wd-fix-snprintf-warnings.patch
+   0010-qdevice-mv-free-str-after-port-validation.patch
+   0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch
+   0012-totemudp-u-Drop-truncated-packets-on-receive.patch
+
+---

New:

  0013-logging-Make-blackbox-configurable.patch
  0014-logging-Close-before-and-open-blackbox-after-fork.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.SRqLuH/_old  2018-02-03 15:41:08.541182943 +0100
+++ /var/tmp/diff_new_pack.SRqLuH/_new  2018-02-03 15:41:08.557182196 +0100
@@ -74,6 +74,8 @@
 Patch17:0010-qdevice-mv-free-str-after-port-validation.patch
 Patch18:0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch
 Patch19:0012-totemudp-u-Drop-truncated-packets-on-receive.patch
+Patch20:0013-logging-Make-blackbox-configurable.patch
+Patch21:0014-logging-Close-before-and-open-blackbox-after-fork.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -158,6 +160,8 @@
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
 
 %build
 %if %{with runautogen}

++ 0001-coroapi-Use-size_t-for-private_data_size.patch ++
--- /var/tmp/diff_new_pack.SRqLuH/_old  2018-02-03 15:41:08.645178086 +0100
+++ /var/tmp/diff_new_pack.SRqLuH/_new  2018-02-03 15:41:08.645178086 +0100
@@ -1,19 +1,3 @@
-From afd97d788494007462b95a237161310af4c6e233 Mon Sep 17 00:00:00 2001
-From: Michael Jones 
-Date: Thu, 25 May 2017 13:29:19 -0500
-Subject: [PATCH 6/6] coroapi: Use size_t for private_data_size
-
-Unsigned int and size_t represent two different concepts.
-
-Same problem was present in ipc_glue.
-
-Signed-off-by: Michael Jones 
-Reviewed-by: Jan Friesse 

- exec/ipc_glue.c| 2 +-
- include/corosync/coroapi.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
 diff --git a/exec/ipc_glue.c b/exec/ipc_glue.c
 index d0a25d98..8b34d495 100644
 --- a/exec/ipc_glue.c

++ 0002-fix-ifdown-udp.patch ++
--- /var/tmp/diff_new_pack.SRqLuH/_old  2018-02-03 15:41:08.661177338 +0100
+++ /var/tmp/diff_new_pack.SRqLuH/_new  2018-02-03 15:41:08.661177338 +0100
@@ -1,22 +1,3 @@
-From 790794bc1f654fd1b4c8c2904c8d5c60374b99c1 Mon Sep 17 00:00:00 2001
-From: Jan Friesse 
-Date: Mon, 31 Jul 2017 18:05:18 +0200
-Subject: [PATCH] totemudp: Add local loop support for unicast msgs
-
-This patch intends to solve long time ifdown corosync problem. Idea is
-to use multicast local socket also for sending unicast messages.
-Together with testing what is current bind state it's possible to keep
-pretending existence of old IP address instead of rebinding to localhost
-what breaks a lot things badly.
-
-Heavilly based on Yu, Zou  work. Also big thanks
-to Bin Liu  for testing and bringing some ideas.
-
-Signed-off-by: Jan Friesse 

- exec/totemudp.c | 215 +---
- 1 file changed, 128 insertions(+), 87 deletions(-)
-
 diff --git a/exec/totemudp.c b/exec/totemudp.c
 index 31d05704..47830e4b 100644
 --- a/exec/totemudp.c

++ 0005-do-not-convert-empty-uid-gid-to-0.patch ++
--- /var/tmp/diff_new_pack.SRqLuH/_old  2018-02-03 15:41:08.701175470 +0100
+++ /var/tmp/diff_new_pack.SRqLuH/_new  2018-02-03 15:41:08.701175470 +0100
@@ -1,12 +1,3 @@
-From a7a13690db8fc7508177138265c6930fa11ade3e Mon Sep 17 00:00:00 2001
-From: Bin Liu 
-Date: Tue, 21 Nov 2017 11:03:10 +0800

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-01-16 09:33:29

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Tue Jan 16 09:33:29 2018 rev:52 rq:563236 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2018-01-03 
13:38:39.824728422 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-01-16 
09:33:30.822559884 +0100
@@ -1,0 +2,12 @@
+Wed Jan 10 02:36:24 UTC 2018 - b...@suse.com
+
+- totemudp[u]: Drop truncated packets on receive(bsc#1075300)
+Added: 0012-totemudp-u-Drop-truncated-packets-on-receive.patch
+
+---
+Thu Jan  4 04:36:41 UTC 2018 - b...@suse.com
+
+- issue with partial packets assembly when multiple nodes are sending big 
packets(bsc#1074929) 
+Added: 0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch
+
+---

New:

  0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch
  0012-totemudp-u-Drop-truncated-packets-on-receive.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.b5vSp4/_old  2018-01-16 09:33:31.686519461 +0100
+++ /var/tmp/diff_new_pack.b5vSp4/_new  2018-01-16 09:33:31.690519274 +0100
@@ -72,6 +72,8 @@
 Patch15:0008-wd-fix-snprintf-warnings.patch
 Patch16:0009-add-config-for-corosync-qnetd.patch
 Patch17:0010-qdevice-mv-free-str-after-port-validation.patch
+Patch18:0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch
+Patch19:0012-totemudp-u-Drop-truncated-packets-on-receive.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -154,6 +156,8 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 %if %{with runautogen}

++ 0011-libcpg-Fix-issue-with-partial-big-packet-assembly.patch ++
>From 86579ff5f8f8d93e3173731bdf632827d4d1c711 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rytis=20Karpu=C5=A1ka?= 
Date: Thu, 28 Dec 2017 15:17:12 +0200
Subject: [PATCH 1/2] libcpg: Fix issue with partial big packet assembly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Packet assembly is done seperately for each nodeid, pid pair,
therefore multiple packets are not mixed into single buffer.

(backported from master c9dd11772cd6660d7651b6781df963efa914652e)

Signed-off-by: Rytis Karpuška 
Reviewed-by: Jan Friesse 
Reviewed-by: Christine Caulfield 
---
 lib/cpg.c | 96 ++-
 1 file changed, 76 insertions(+), 20 deletions(-)

diff --git a/lib/cpg.c b/lib/cpg.c
index c831390b..a0e662f0 100644
--- a/lib/cpg.c
+++ b/lib/cpg.c
@@ -80,6 +80,15 @@
  */
 #define CPG_MEMORY_MAP_UMASK   077
 
+struct cpg_assembly_data
+{
+   struct list_head list;
+   uint32_t nodeid;
+   uint32_t pid;
+   char *assembly_buf;
+   uint32_t assembly_buf_ptr;
+};
+
 struct cpg_inst {
qb_ipcc_connection_t *c;
int finalize;
@@ -89,14 +98,8 @@ struct cpg_inst {
cpg_model_v1_data_t model_v1_data;
};
struct list_head iteration_list_head;
-uint32_t max_msg_size;
-char *assembly_buf;
-uint32_t assembly_buf_ptr;
-int assembling; /* Flag that says we have started assembling a message.
-* It's here to catch the situation 
where a node joins
-* the cluster/group in the middle of a 
CPG message send
-* so we don't pass on a partial 
message to the client.
-*/
+   uint32_t max_msg_size;
+   struct list_head assembly_list_head;
 };
 static void cpg_inst_free (void *inst);
 
@@ -231,6 +234,8 @@ cs_error_t cpg_model_initialize (
 
list_init(_inst->iteration_list_head);
 
+   list_init(_inst->assembly_list_head);
+
hdb_handle_put (_handle_t_db, *handle);
 
return (CS_OK);
@@ -382,6 +387,8 @@ cs_error_t cpg_dispatch (
struct cpg_address left_list[CPG_MEMBERS_MAX];
struct cpg_address joined_list[CPG_MEMBERS_MAX];
struct cpg_name group_name;
+   struct cpg_assembly_data *assembly_data;
+   struct list_head *iter, *tmp_iter;
mar_cpg_address_t *left_list_start;
mar_cpg_address_t *joined_list_start;
unsigned int i;
@@ -471,32 +478,63 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2018-01-03 13:38:37

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Wed Jan  3 13:38:37 2018 rev:51 rq:561247 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-12-08 
12:55:01.806794557 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2018-01-03 
13:38:39.824728422 +0100
@@ -1,0 +2,12 @@
+Tue Jan  2 06:15:29 UTC 2018 - b...@suse.com
+
+- qdevice failed to run(bsc#1074276)
+Added: 0010-qdevice-mv-free-str-after-port-validation.patch
+
+---
+Wed Dec 27 05:49:39 UTC 2017 - b...@suse.com
+
+- add support for corosync-qdevice in yast2-cluster and bootstrap(bsc#1070961)
+Added: 0009-add-config-for-corosync-qnetd.patch
+
+---

New:

  0009-add-config-for-corosync-qnetd.patch
  0010-qdevice-mv-free-str-after-port-validation.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.W6aMIQ/_old  2018-01-03 13:38:40.584475443 +0100
+++ /var/tmp/diff_new_pack.W6aMIQ/_new  2018-01-03 13:38:40.588474112 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -70,6 +70,8 @@
 Patch13:0006-Fix-compile-warnings-with-GCC-7.2.1.patch
 Patch14:0007-sync-Call-sync_init-of-all-services-at-once.patch
 Patch15:0008-wd-fix-snprintf-warnings.patch
+Patch16:0009-add-config-for-corosync-qnetd.patch
+Patch17:0010-qdevice-mv-free-str-after-port-validation.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -150,6 +152,8 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
+%patch17 -p1
 
 %build
 %if %{with runautogen}

++ 0009-add-config-for-corosync-qnetd.patch ++
--- corosync-2.4.3.orig/init/corosync-qnetd.sysconfig.example2017-09-21 
23:14:59.0 +0800
+++ corosync-2.4.3/init/corosync-qnetd.sysconfig.example2017-12-27 
13:39:01.024262758 +0800
@@ -3,7 +3,7 @@
 # COROSYNC_QNETD_OPTIONS specifies options passed to corosync-qnetd command
 # (default is no options).
 # See "man corosync-qnetd" for detailed descriptions of the options.
-COROSYNC_QNETD_OPTIONS=""
+COROSYNC_QNETD_OPTIONS="-4 -l 0.0.0.0 -p 5403 -s off"
 
 # COROSYNC_QNETD_RUNAS specifies user under which qnetd daemon should be 
running
 # (not set or empty is default and means "user who executes init script")
++ 0010-qdevice-mv-free-str-after-port-validation.patch ++
>From 60d419917ac5a64abe8539bedb9fd57af1451ff5 Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Wed, 27 Dec 2017 18:21:34 +0800
Subject: [PATCH] qdevice: mv free(str) after port validation

in the previous code of qdevice_net_instance_init_from_cmap:
   host_port = strtol(str, , 10);

   free(str);

   if (host_port <= 0 || host_port > ((uint16_t)~0) || *ep != '\0')

before free, *ep is '\0'. But after free, *ep changed to 'U', so mv
free behind the comparison.
---
 qdevices/qdevice-net-instance.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/qdevices/qdevice-net-instance.c b/qdevices/qdevice-net-instance.c
index 7adcaa3f..e4b7b04d 100644
--- a/qdevices/qdevice-net-instance.c
+++ b/qdevices/qdevice-net-instance.c
@@ -274,12 +274,12 @@ qdevice_net_instance_init_from_cmap(struct 
qdevice_instance *instance)
if (cmap_get_string(cmap_handle, "quorum.device.net.port", ) == 
CS_OK) {
host_port = strtol(str, , 10);
 
-   free(str);
-
if (host_port <= 0 || host_port > ((uint16_t)~0) || *ep != 
'\0') {
qdevice_log(LOG_ERR, "quorum.device.net.port must be in 
range 0-65535");
+   free(str);
goto error_free_host_addr;
}
+   free(str);
} else {
host_port = QNETD_DEFAULT_HOST_PORT;
}
-- 
2.13.6

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-12-08 12:54:58

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Fri Dec  8 12:54:58 2017 rev:50 rq:548541 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-11-30 
12:39:29.406791982 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-12-08 
12:55:01.806794557 +0100
@@ -1,0 +2,6 @@
+Tue Dec  5 06:13:13 UTC 2017 - b...@suse.com
+
+- wd: gcc shows snprintf warnings(bsc#1071187)  
+Added: 0008-wd-fix-snprintf-warnings.patch
+
+---

New:

  0008-wd-fix-snprintf-warnings.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.B9pHWU/_old  2017-12-08 12:55:03.062749198 +0100
+++ /var/tmp/diff_new_pack.B9pHWU/_new  2017-12-08 12:55:03.066749053 +0100
@@ -69,6 +69,7 @@
 Patch12:0005-do-not-convert-empty-uid-gid-to-0.patch
 Patch13:0006-Fix-compile-warnings-with-GCC-7.2.1.patch
 Patch14:0007-sync-Call-sync_init-of-all-services-at-once.patch
+Patch15:0008-wd-fix-snprintf-warnings.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -148,6 +149,7 @@
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 %if %{with runautogen}

++ 0008-wd-fix-snprintf-warnings.patch ++
>From 0906e5717cce87ac8db25ac9a335a63530dba839 Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Fri, 1 Dec 2017 10:58:50 +0800
Subject: [PATCH] wd: fix snprintf warnings

When running ./configure --enable-watchdog, gcc 7.2.1 will report
warnings for snprintf. This patch fixes the warnings.

Signed-off-by: Bin Liu 
Reviewed-by: Jan Friesse 
---
 exec/wd.c | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/exec/wd.c b/exec/wd.c
index 8d0734c9..042d2046 100644
--- a/exec/wd.c
+++ b/exec/wd.c
@@ -221,15 +221,15 @@ static int32_t wd_resource_state_is_ok (struct resource 
*ref)
uint64_t allowed_period;
char key_name[ICMAP_KEYNAME_MAXLEN];
 
-   snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"last_updated");
-   if (icmap_get_uint64(key_name, _updated) != CS_OK) {
+   if ((snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"last_updated") >= ICMAP_KEYNAME_MAXLEN) ||
+   (icmap_get_uint64(key_name, _updated) != CS_OK)) {
/* key does not exist.
*/
return CS_FALSE;
}
 
-   snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"state");
-   if (icmap_get_string(key_name, ) != CS_OK || strcmp(state, 
"disabled") == 0) {
+   if ((snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"state") >= ICMAP_KEYNAME_MAXLEN) ||
+   (icmap_get_string(key_name, ) != CS_OK || strcmp(state, 
"disabled") == 0)) {
/* key does not exist.
*/
if (state != NULL)
@@ -279,8 +279,8 @@ static void wd_config_changed (struct cs_fsm* fsm, int32_t 
event, void * data)
 
next_timeout = ref->check_timeout;
 
-   snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"poll_period");
-   if (icmap_get_uint64(ref->res_path, _value) == CS_OK) {
+   if ((snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"poll_period") >= ICMAP_KEYNAME_MAXLEN) ||
+   (icmap_get_uint64(ref->res_path, _value) == CS_OK)) {
if (tmp_value >= WD_MIN_TIMEOUT_MS && tmp_value <= 
WD_MAX_TIMEOUT_MS) {
log_printf (LOGSYS_LEVEL_DEBUG,
"poll_period changing from:%"PRIu64" to 
%"PRIu64".",
@@ -299,8 +299,8 @@ static void wd_config_changed (struct cs_fsm* fsm, int32_t 
event, void * data)
}
}
 
-   snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"recovery");
-   if (icmap_get_string(key_name, >recovery) != CS_OK) {
+   if ((snprintf(key_name, ICMAP_KEYNAME_MAXLEN, "%s%s", ref->res_path, 
"recovery") >= ICMAP_KEYNAME_MAXLEN) ||
+   (icmap_get_string(key_name, >recovery) != CS_OK)) {
/* key does not exist.
 */
log_printf (LOGSYS_LEVEL_WARNING,
@@ -308,8 +308,8 @@ static void wd_config_changed (struct cs_fsm* fsm, int32_t 
event, void * data)
cs_fsm_state_set(>fsm, WD_S_STOPPED, ref, wd_fsm_cb);
return;
}
-   

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-11-30 12:39:27

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Thu Nov 30 12:39:27 2017 rev:49 rq:545009 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-11-23 
09:34:07.971022032 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-11-30 
12:39:29.406791982 +0100
@@ -1,0 +2,6 @@
+Thu Nov 23 13:48:33 UTC 2017 - rbr...@suse.com
+
+- Replace references to /var/adm/fillup-templates with new 
+  %_fillupdir macro (boo#1069468)
+
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.TL3fTx/_old  2017-11-30 12:39:30.334758240 +0100
+++ /var/tmp/diff_new_pack.TL3fTx/_new  2017-11-30 12:39:30.334758240 +0100
@@ -16,6 +16,11 @@
 #
 
 
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+  %define _fillupdir /var/adm/fillup-templates
+%endif
+
 # Conditionals
 # Invoke "rpmbuild --without " or "rpmbuild --with "
 # to disable or enable specific features
@@ -220,7 +225,7 @@
 rm -rf init/corosync init/corosync-qnetd init/corosync-qdevice
 mkdir -p  %{buildroot}/usr/lib/tmpfiles.d/
 mkdir -p  %{buildroot}/usr/share/doc/packages/corosync/
-mkdir -p  %{buildroot}/var/adm/fillup-templates/
+mkdir -p  %{buildroot}%{_fillupdir}/
 mkdir -p  %{buildroot}%{_sysconfdir}/init.d/
 install -m 0644 tools/corosync-notifyd.sysconfig.example  
%{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
 install -m 0644 conf/corosync.conf.example* 
%{buildroot}/usr/share/doc/packages/corosync/
@@ -228,17 +233,17 @@
 rm -rf %{buildroot}/etc/logrotate.d/
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 install -m 644 init/corosync.sysconfig.example \
-   %{buildroot}/var/adm/fillup-templates/sysconfig.corosync
+   %{buildroot}%{_fillupdir}/sysconfig.corosync
 rm -rf %{buildroot}%{localstatedir}/run/
 %if %{with qdevices}
 install -m 644 init/corosync-qdevice.sysconfig.example \
-   %{buildroot}/var/adm/fillup-templates/sysconfig.corosync-qdevice
+   %{buildroot}%{_fillupdir}/sysconfig.corosync-qdevice
 install -m 770 -d %{buildroot}/run/corosync-qdevice
 %endif
 
 %if %{with qnetd}
 install -m 644 init/corosync-qnetd.sysconfig.example \
-   %{buildroot}/var/adm/fillup-templates/sysconfig.corosync-qnetd
+   %{buildroot}%{_fillupdir}/sysconfig.corosync-qnetd
 install -m 770 -d %{buildroot}/run/corosync-qnetd
 %if %{with systemd}
 sed -i -e 's/^#User=/User=/' \
@@ -304,7 +309,7 @@
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example
 %config(noreplace) /usr/share/doc/packages/corosync/corosync.conf.example.udpu
 %config(noreplace) /usr/lib/tmpfiles.d/corosync-notifyd
-%config(noreplace) /var/adm/fillup-templates/sysconfig.corosync
+%config(noreplace) %{_fillupdir}/sysconfig.corosync
 
 %if %{with dbus}
 %{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
@@ -600,7 +605,7 @@
 %{_sbindir}/corosync-qdevice
 %{_sbindir}/corosync-qdevice-net-certutil
 %{_sbindir}/corosync-qdevice-tool
-%config(noreplace) /var/adm/fillup-templates/sysconfig.corosync-qdevice
+%config(noreplace) %{_fillupdir}/sysconfig.corosync-qdevice
 %if %{with systemd}
 %{_unitdir}/corosync-qdevice.service
 %{_sbindir}/rccorosync-qdevice
@@ -668,7 +673,7 @@
 %{_bindir}/corosync-qnetd
 %{_bindir}/corosync-qnetd-certutil
 %{_bindir}/corosync-qnetd-tool
-%config(noreplace) /var/adm/fillup-templates/sysconfig.corosync-qnetd
+%config(noreplace) %{_fillupdir}/sysconfig.corosync-qnetd
 %if %{with systemd}
 %{_unitdir}/corosync-qnetd.service
 %{_sbindir}/rccorosync-qnetd

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-11-23 09:34:05

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Thu Nov 23 09:34:05 2017 rev:48 rq:544014 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-11-20 
17:02:27.940150543 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-11-23 
09:34:07.971022032 +0100
@@ -18,0 +19,2 @@
+Modified: 0005-do-not-convert-empty-uid-gid-to-0.patch, 
+check whether the uid, gid is empty before calling strtol



Other differences:
--
++ 0005-do-not-convert-empty-uid-gid-to-0.patch ++
--- /var/tmp/diff_new_pack.NGnMhT/_old  2017-11-23 09:34:08.630997952 +0100
+++ /var/tmp/diff_new_pack.NGnMhT/_new  2017-11-23 09:34:08.630997952 +0100
@@ -1,34 +1,42 @@
-From 34e3accfcbf1d5dd08468f0e7a8aa6ceb0a7828e Mon Sep 17 00:00:00 2001
+From a7a13690db8fc7508177138265c6930fa11ade3e Mon Sep 17 00:00:00 2001
 From: Bin Liu 
-Date: Mon, 6 Nov 2017 16:59:30 +0800
-Subject: [PATCH] do not convert empty uid, gid to 0
+Date: Tue, 21 Nov 2017 11:03:10 +0800
+Subject: [PATCH] do not convert empty uid gid to 0
 
 ---
- exec/coroparse.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ exec/coroparse.c | 12 
+ 1 file changed, 12 insertions(+)
 
 diff --git a/exec/coroparse.c b/exec/coroparse.c
-index 374ed7dd..f27ead1a 100644
+index 374ed7dd..ac654a11 100644
 --- a/exec/coroparse.c
 +++ b/exec/coroparse.c
-@@ -140,7 +140,7 @@ static int uid_determine (const char *req_user)
+@@ -139,6 +139,12 @@ static int uid_determine (const char *req_user)
+   long int id;
char *ep;
  
++  if(*req_user == '\0') {
++  sprintf (error_string_response,
++ "The user can not be empty, please read the 
documentation.");
++  return (-1);
++  }
++
id = strtol(req_user, , 10);
--  if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
-+  if (*req_user != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
+   if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id);
-   }
- 
-@@ -194,7 +194,7 @@ static int gid_determine (const char *req_group)
+@@ -193,6 +199,12 @@ static int gid_determine (const char *req_group)
+   long int id;
char *ep;
  
++  if(*req_group == '\0') {
++  sprintf (error_string_response,
++  "The group can not be empty, please read the 
documentation.");
++  return (-1);
++  }
++
id = strtol(req_group, , 10);
--  if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
-+  if (*req_group != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
+   if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id);
-   }
- 
 -- 
 2.13.6
 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-11-20 17:02:19

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Mon Nov 20 17:02:19 2017 rev:47 rq:542519 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-11-10 
14:43:03.083203378 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-11-20 
17:02:27.940150543 +0100
@@ -1,0 +2,6 @@
+Fri Nov 17 02:54:23 UTC 2017 - b...@suse.com
+
+- corosync race condition when node leaves immediately after 
joining(bsc#1067958)
+Added: 0007-sync-Call-sync_init-of-all-services-at-once.patch
+
+---

New:

  0007-sync-Call-sync_init-of-all-services-at-once.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.HFysBh/_old  2017-11-20 17:02:29.192105212 +0100
+++ /var/tmp/diff_new_pack.HFysBh/_new  2017-11-20 17:02:29.196105067 +0100
@@ -63,6 +63,7 @@
 Patch11:0004-mark-corosync-as-a-static-service.patch
 Patch12:0005-do-not-convert-empty-uid-gid-to-0.patch
 Patch13:0006-Fix-compile-warnings-with-GCC-7.2.1.patch
+Patch14:0007-sync-Call-sync_init-of-all-services-at-once.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -141,6 +142,7 @@
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %build
 %if %{with runautogen}

++ 0007-sync-Call-sync_init-of-all-services-at-once.patch ++
This patch solves situation which can happen very rearly:
- Node B is running
- Node A is started and tries to create singleton membership. It also
  initialize service S which tries to send message during initialization
- Just before node A finished move to operational state, it gets
  Node B multicast message so moves to gather state
- Node A and B creates membership and moves to operational state and
  sync is started
- Node A and B receives message sent by node A during initialization of
  service S
- Node A exits before sync of service is finished

In this situation, node B may never execute sync_init for
service S. So node B service S is not aware of existence of node A but
it received message from it.

Similar situation can theoretically also happen during merge.

Solution is to change flow of sync, so now it looks like:

- Build service_list
- Call sync_init for all local services
- Send service_list
- Receive service_list from all members and send barier
- For all services:
  - Receive barier
  - Call sync_activate if this is not first service
  - Call sync_process for next service or finish sync if previous
this service is the last one
  - Send barier

---
 exec/sync.c | 174 +++-
 1 file changed, 44 insertions(+), 130 deletions(-)

diff --git a/exec/sync.c b/exec/sync.c
index 283634a8..1efa3577 100644
--- a/exec/sync.c
+++ b/exec/sync.c
@@ -62,10 +62,8 @@ LOGSYS_DECLARE_SUBSYS ("SYNC");
 
 #define MESSAGE_REQ_SYNC_BARRIER 0
 #define MESSAGE_REQ_SYNC_SERVICE_BUILD 1
-#define MESSAGE_REQ_SYNC_MEMB_DETERMINE 2
 
 enum sync_process_state {
-   INIT,
PROCESS,
ACTIVATE
 };
@@ -96,11 +94,6 @@ struct processor_entry {
int received;
 };
 
-struct req_exec_memb_determine_message {
-   struct qb_ipc_request_header header __attribute__((aligned(8)));
-   struct memb_ring_id ring_id __attribute__((aligned(8)));
-};
-
 struct req_exec_service_build_message {
struct qb_ipc_request_header header __attribute__((aligned(8)));
struct memb_ring_id ring_id __attribute__((aligned(8)));
@@ -117,14 +110,6 @@ static enum sync_state my_state = SYNC_BARRIER;
 
 static struct memb_ring_id my_ring_id;
 
-static struct memb_ring_id my_memb_determine_ring_id;
-
-static int my_memb_determine = 0;
-
-static unsigned int my_memb_determine_list[PROCESSOR_COUNT_MAX];
-
-static unsigned int my_memb_determine_list_entries = 0;
-
 static int my_processing_idx = 0;
 
 static hdb_handle_t my_schedwrk_handle;
@@ -157,6 +142,8 @@ static int schedwrk_processor (const void *context);
 
 static void sync_process_enter (void);
 
+static void sync_process_call_init (void);
+
 static struct totempg_group sync_group = {
 .group  = "sync",
 .group_len  = 4
@@ -234,7 +221,6 @@ static void sync_barrier_handler (unsigned int nodeid, 
const void *msg)
 
my_processing_idx += 1;
if (my_service_list_entries == my_processing_idx) {
-   my_memb_determine_list_entries = 0;

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-11-10 14:43:01

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Fri Nov 10 14:43:01 2017 rev:46 rq:540403 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-10-25 
17:44:36.275628688 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-11-10 
14:43:03.083203378 +0100
@@ -1,0 +2,13 @@
+Thu Nov  9 03:06:36 UTC 2017 - b...@suse.com
+
+- gcc: snprintf gives warning: ‘%s’ directive output may be truncated writing
+   8 bytes into a region of size between 1 and 255(bsc#1066090)
+Added: 0006-Fix-compile-warnings-with-GCC-7.2.1.patch
+
+---
+Mon Nov  6 09:14:55 UTC 2017 - b...@suse.com
+
+- coroparse: uidgid with empty uid or gid results into add uid 0(bsc#1066585) 
+Added: 0005-do-not-convert-empty-uid-gid-to-0.patch
+
+---

New:

  0005-do-not-convert-empty-uid-gid-to-0.patch
  0006-Fix-compile-warnings-with-GCC-7.2.1.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.tzTChi/_old  2017-11-10 14:43:04.511151759 +0100
+++ /var/tmp/diff_new_pack.tzTChi/_new  2017-11-10 14:43:04.515151614 +0100
@@ -61,6 +61,8 @@
 Patch9: 0002-fix-ifdown-udp.patch
 Patch10:0003-fix-tmpfiles-create.patch
 Patch11:0004-mark-corosync-as-a-static-service.patch
+Patch12:0005-do-not-convert-empty-uid-gid-to-0.patch
+Patch13:0006-Fix-compile-warnings-with-GCC-7.2.1.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -137,6 +139,8 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 %if %{with runautogen}

++ 0005-do-not-convert-empty-uid-gid-to-0.patch ++
>From 34e3accfcbf1d5dd08468f0e7a8aa6ceb0a7828e Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Mon, 6 Nov 2017 16:59:30 +0800
Subject: [PATCH] do not convert empty uid, gid to 0

---
 exec/coroparse.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exec/coroparse.c b/exec/coroparse.c
index 374ed7dd..f27ead1a 100644
--- a/exec/coroparse.c
+++ b/exec/coroparse.c
@@ -140,7 +140,7 @@ static int uid_determine (const char *req_user)
char *ep;
 
id = strtol(req_user, , 10);
-   if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
+   if (*req_user != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id);
}
 
@@ -194,7 +194,7 @@ static int gid_determine (const char *req_group)
char *ep;
 
id = strtol(req_group, , 10);
-   if (*ep == '\0' && id >= 0 && id <= UINT_MAX) {
+   if (*req_group != '\0' && *ep == '\0' && id >= 0 && id <= UINT_MAX) {
return (id);
}
 
-- 
2.13.6

++ 0006-Fix-compile-warnings-with-GCC-7.2.1.patch ++
1. sam: Fix snprintf compiler warnings
2. cpg_test_agent: Fix snprintf compiler warnings
3. quorumtool: Use full buffer size in snprintf
4. readdir_r is deprecated in glibc 2.24 in favor of readdir
---
 cts/agents/cpg_test_agent.c |  8 
 exec/coroparse.c| 18 +++---
 lib/sam.c   | 36 
 tools/corosync-quorumtool.c |  2 +-
 4 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/cts/agents/cpg_test_agent.c b/cts/agents/cpg_test_agent.c
index 0837c69c..2224141c 100644
--- a/cts/agents/cpg_test_agent.c
+++ b/cts/agents/cpg_test_agent.c
@@ -211,8 +211,8 @@ static void config_change_callback (
if (record_config_events_g > 0) {
log_pt = malloc (sizeof(log_entry_t));
list_init (_pt->list);
-   snprintf (log_pt->log, LOG_STR_SIZE, "%s,%u,%u,left",
-   groupName->value, 
left_list[i].nodeid,left_list[i].pid);
+   assert(snprintf (log_pt->log, LOG_STR_SIZE, 
"%s,%u,%u,left",
+   groupName->value, 
left_list[i].nodeid,left_list[i].pid) < LOG_STR_SIZE);
list_add_tail(_pt->list, _chg_log_head);
qb_log (LOG_INFO, "cpg event %s", log_pt->log);
}
@@ -221,8 +221,8 @@ static void config_change_callback (
if (record_config_events_g > 0) {
log_pt = malloc (sizeof(log_entry_t));
list_init (_pt->list);
-   snprintf (log_pt->log, LOG_STR_SIZE, 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-10-25 17:44:34

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Wed Oct 25 17:44:34 2017 rev:45 rq:536230 version:2.4.3

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-10-02 
16:51:59.469024660 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-10-25 
17:44:36.275628688 +0200
@@ -1,0 +2,79 @@
+Mon Oct 23 03:12:42 UTC 2017 - b...@suse.com
+
+- Upgrade corosync-2.4.2 to corosync-2.4.3(fate#321385)
+doc: document watchdog_device parameter
+Main: Call mlockall after fork
+Totempg: remove duplicate memcpy in mcast_msg func
+Qdevice: fix spell errors in qdevice
+logconfig: Do not overwrite logger_subsys priority
+totemconfig: Prefer nodelist over bindnetaddr
+cpghum: Fix printf of size_t variable
+Qnetd lms: Use UTILS_PRI_RING_ID printf format str
+wd: Report error when close of wd fails
+votequorum: Don't update expected_votes display if value is too high
+votequorum: simplify reconfigure message handling
+quorumtool: Add option to show all node addresses
+main: Don't ask libqb to handle segv, it doesn't work
+man: Document -a option to corosync-quorumtool
+main: use syslog & printf directly for early log messages
+votequorum: make atb consistent on nodelist reload
+Fix typo: Destorying -> Destroying
+init: Add doc URIs to the systemd service files
+wd: fix typo
+corosync.conf.5: Fix watchdog documentation
+corosync.conf.5: add warning about slow watchdogs
+wd: remove extra capitalization typo
+corosync.conf.5: watchdog support is conditional
+notifyd: Add the community name to an SNMP trap
+Logsys: Change logsys syslog_priority priority
+totemrrp: Fix situation when all rings are faulty
+main: Display reason why cluster cannot be formed
+totem: Propagate totem initialization failure
+totemcrypto: Refactor symmetric key importing
+totemcrypto: Use different method to import key
+main: Add option to set priority
+main: Add support for libcgroup
+totemcrypto: Fix compiler warning
+cmap: Remove noop highest config version check
+qdevice: Add support for heuristics
+Spec: drop unneeded dependency
+Spec: make internal dependencies arch-qualified
+cmap: don't shutdown highest config_version node
+totemudp: Remove memb_join discarding
+Spec: fix arch-qualified dependencies
+Include fcntl.h for F_* and O_* defines
+totemudp: Retry if bind fails
+Remove deprecated doxygen flags
+man: Fix typos in man page
+man: Modify man-page according to command usage
+Remove redundant header file inclusion
+upstart: Add softdog module loading example
+
+Added:
+corosync-2.4.3.tar.gz
+Removed:
+corosync-2.4.2.tar.gz
+bsc#1047860-add-version.patch
+0001-Logsys-Change-logsys-syslog_priority-priority.patch
+0001-logconfig.c-make-logging.syslog_priority-and-logging.patch
+0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch
+0002-Main-call-mlock-after-fork.patch
+0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch
+0004-main-Display-reason-why-cluster-cannot-be-formed.patch
+0005-votequorum-Report-errors-from-votequorum_exec_send_r.patch
+0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
+0008-main.c-add-option-to-set-priority.patch
+0009-totem-Propagate-totem-initialization-failure.patch
+
+Modified:
+bsc#1047860-add-version.patch: change version to 2.4.3
+corosync.changes: add changelogs
+corosync.spec: remove unnecessary patches
+
+Renamed:
+0006-coroapi-Use-size_t-for-private_data_size.patch -> 
0001-coroapi-Use-size_t-for-private_data_size.patch
+0010-fix-ifdown-udp.patch -> 0002-fix-ifdown-udp.patch
+0011-fix-tmpfiles-create.patch -> 0003-fix-tmpfiles-create.patch
+0012-mark-corosync-as-a-static-service.patch -> 
0004-mark-corosync-as-a-static-service.patch
+
+---

Old:

  0001-Logsys-Change-logsys-syslog_priority-priority.patch
  0001-logconfig.c-make-logging.syslog_priority-and-logging.patch
  0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch
  0002-Main-call-mlock-after-fork.patch
  0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch
  

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-10-02 16:51:57

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Mon Oct  2 16:51:57 2017 rev:44 rq:529075 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-09-25 
13:48:59.950774732 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-10-02 
16:51:59.469024660 +0200
@@ -1,0 +2,6 @@
+Thu Sep 28 06:15:35 UTC 2017 - b...@suse.com
+
+- wrong "service_del_postun corosync.service"(bsc#1060767)
+Modified: corosync.spec, remove service_del_postun in postun of corosync
+
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.rbEnzc/_old  2017-10-02 16:52:03.308485775 +0200
+++ /var/tmp/diff_new_pack.rbEnzc/_new  2017-10-02 16:52:03.308485775 +0200
@@ -290,7 +290,6 @@
 if [ -f /etc/sysconfig/corosync ]; then
 rm /etc/sysconfig/corosync
 fi
-%service_del_postun corosync.service corosync-notifyd.service
 
 %files
 %defattr(-,root,root,-)

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-09-25 13:48:59

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Mon Sep 25 13:48:59 2017 rev:43 rq:528214 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-09-04 
12:28:37.924390330 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-09-25 
13:48:59.950774732 +0200
@@ -1,0 +2,6 @@
+Tue Sep 12 14:40:51 UTC 2017 - jeng...@inai.de
+
+- Restore conformance to shared library packaging guideline.
+- Remove redundant cleaning in %install and %clean.
+
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.Nk6WpB/_old  2017-09-25 13:49:00.814653196 +0200
+++ /var/tmp/diff_new_pack.Nk6WpB/_new  2017-09-25 13:49:00.818652633 +0200
@@ -80,7 +80,14 @@
 Conflicts:  openais < 1.2
 
 # Runtime bits
-Requires:   libcorosync4 = %{version}-%{release}
+Requires:   libcfg6 = %{version}-%{release}
+Requires:   libcmap4 = %{version}-%{release}
+Requires:   libcorosync_common4 = %{version}-%{release}
+Requires:   libcpg4 = %{version}-%{release}
+Requires:   libquorum5 = %{version}-%{release}
+Requires:   libsam4 = %{version}-%{release}
+Requires:   libtotem_pg5 = %{version}-%{release}
+Requires:   libvotequorum8 = %{version}-%{release}
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
@@ -206,9 +213,7 @@
 make %{_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-
-make install DESTDIR=%{buildroot}
+%make_install
 
 %if %{with dbus}
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
@@ -262,9 +267,6 @@
 %endif
 %endif
 
-%clean
-rm -rf %{buildroot}
-
 %description
 This package contains the Corosync Cluster Engine Executive, several default
 APIs and libraries, default configuration files, and an init script.
@@ -379,40 +381,145 @@
 
 %endif
 
-# library
-#
-%package -n libcorosync4
-Summary:The Corosync Cluster Engine Libraries
+%package -n libcfg6
+Summary:Corosync configuration database library
+Group:  System/Libraries
+
+%description -n libcfg6
+This package contains the Corosync configuration database library.
+
+%package -n libcmap4
+Summary:Corosync configuration map library
+Group:  System/Libraries
+
+%description -n libcmap4
+The CMAP library is used to interact with the configuration database
+used by Corosync. The library provides a mechanism to
+create/chage/remove keys, iterate over them and track changes to
+keys.
+
+%package -n libcorosync_common4
+Summary:The Corosync Cluster Engine library
 # openais is indeed gone and should be uninstalled. Yes, we do not
 # provide libopenais on purpose, the package has been deleted.
 Group:  System/Libraries
 Obsoletes:  libopenais3 < 1.2
 Conflicts:  libopenais3 < 1.2
+Obsoletes:  libcorosync4 < %{version}-%{release}
+Provides:   libcorosync4 = %{version}-%{release}
 
-%description -n libcorosync4
-This package contains corosync libraries.
+%description -n libcorosync_common4
+This package contains the central Corosync library.
 
-%files -n libcorosync4
-%defattr(-,root,root,-)
-%doc LICENSE
+%package -n libcpg4
+Summary:Corosync group message API
+Group:  System/Libraries
+
+%description -n libcpg4
+A group message API called CPG, part of Corosync. This library is
+used to create distributed applications that operate properly during
+cluster partitions, merges, and faults.
+
+%package -n libquorum5
+Summary:Corosync quorum library
+Group:  System/Libraries
+
+%description -n libquorum5
+The quorum library is the external interface to the quorum service.
+This service is loaded into all nodes in a Corosync cluster and track
+the quorum status of a node.
+
+%package -n libsam4
+Summary:Corosync Simple Availability Manager API
+Group:  System/Libraries
+
+%description -n libsam4
+The SAM library provide a tool to check the health of an application.
+The main purpose of SAM is to restart a local process when it fails
+to respond to a healthcheck request in a configured time interval.
+
+%package -n libtotem_pg5
+Summary:Corosync Totem protocol 
+Group:  System/Libraries
+
+%description -n libtotem_pg5
+An implementation of the Totem Single Ring Ordering and Membership
+protocol providing the Extended Virtual Synchrony model for messaging
+and membership.
+
+%package -n libvotequorum8
+Summary:Corosync vote quorum library
+Group:  

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-09-04 12:28:36

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Mon Sep  4 12:28:36 2017 rev:42 rq:519300 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-08-24 
18:26:46.306006460 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-09-04 
12:28:37.924390330 +0200
@@ -1,0 +2,6 @@
+Tue Aug 29 07:50:16 UTC 2017 - b...@suse.com
+
+- corosync.service should be marked as a static service(bsc#1055585)
+Added: 0012-mark-corosync-as-a-static-service.patch
+
+---
@@ -21,0 +28 @@
+   3) remove macro tpmfiles_create define from corosync.spec.

New:

  0012-mark-corosync-as-a-static-service.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.arywkS/_old  2017-09-04 12:28:39.108223888 +0200
+++ /var/tmp/diff_new_pack.arywkS/_new  2017-09-04 12:28:39.116222763 +0200
@@ -32,10 +32,6 @@
 %bcond_without qdevices
 %bcond_without qnetd
 
-%if !%{defined tmpfiles_create}
-%define tmpfiles_create systemd-tmpfiles --create ||:
-%endif
-
 %if 0%{?sles_version} == 12
 %ifnarch s390 s390x
 %define buildib 1
@@ -75,6 +71,7 @@
 Patch19:0009-totem-Propagate-totem-initialization-failure.patch
 Patch20:0010-fix-ifdown-udp.patch
 Patch21:0011-fix-tmpfiles-create.patch
+Patch22:0012-mark-corosync-as-a-static-service.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -154,6 +151,7 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
 
 %build
 %if %{with runautogen}

++ 0012-mark-corosync-as-a-static-service.patch ++
--- corosync-2.4.2.orig/init/corosync.service.in2017-08-29 
15:47:18.131052520 +0800
+++ corosync-2.4.2/init/corosync.service.in 2017-08-29 15:46:24.949842298 
+0800
@@ -23,4 +23,4 @@
 #ExecStartPre=/sbin/modprobe softdog soft_margin=60
 
 [Install]
-WantedBy=multi-user.target
+#WantedBy=multi-user.target

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-08-24 18:26:45

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Thu Aug 24 18:26:45 2017 rev:41 rq:517168 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-07-21 
22:35:28.366599396 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-08-24 
18:26:46.306006460 +0200
@@ -1,0 +2,31 @@
+Tue Aug  8 08:17:27 UTC 2017 - jeng...@inai.de
+
+- Fix RPM groups.
+
+---
+Thu Aug  3 02:50:00 UTC 2017 - b...@suse.com
+
+- L3: corosync: assert(sender_node != NULL) fails after tearing down a network 
interface(bsc#1032634)
+Added: 0010-fix-ifdown-udp.patch 
+
+- Fix rpmlint warnings
+Added: 0011-fix-tmpfiles-create.patch
+
+---
+Thu Aug  3 02:49:21 UTC 2017 - b...@suse.com
+
+- some errors in spec file(bsc#1047862)
+   Modified:corosync.spec
+   1) as in openSUSE:factory, there are %define, but bcond_with coudld be 
toggled by osc command , change %define to %bcond_with and %bcond_without
+   2) change service_del_postun to service_del_preun, since service_del_postun 
is not a right macro
+ 
+
+---
+Mon Jul 31 02:54:49 UTC 2017 - b...@suse.com
+
+- make corosync.spec uniform (bsc#1051385)
+Modified: corosync.spec
+1. there are some lines are commented in corosync.spec, will define new 
macro to make these lines uncommented
+2. in former, xmlconf, rdma and snmp were disabled, these features are 
wrongly enabled, will disable them
+
+---

New:

  0010-fix-ifdown-udp.patch
  0011-fix-tmpfiles-create.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.zBmctc/_old  2017-08-24 18:26:47.529834038 +0200
+++ /var/tmp/diff_new_pack.zBmctc/_new  2017-08-24 18:26:47.533833475 +0200
@@ -16,22 +16,26 @@
 #
 
 
-#%global dirty dirty
-
 # Conditionals
 # Invoke "rpmbuild --without " or "rpmbuild --with "
 # to disable or enable specific features
-%define with_testagents 1
-%define with_watchdog 1
-#%define with_monitoring 0
-%define with_snmp 1
-#%define with_dbus 1
-%define with_rdma 1
-%define with_systemd 1
-%define with_xmlconf 1
-%define with_runautogen 1
-%define with_qdevices 1
-%define with_qnetd 1
+%bcond_without testagents
+%bcond_with watchdog
+%bcond_with monitoring
+%bcond_with snmp
+%bcond_with rdma
+%bcond_with dbus
+%bcond_with upstart
+%bcond_with xmlconf
+%bcond_without runautogen
+%bcond_without systemd
+%bcond_without qdevices
+%bcond_without qnetd
+
+%if !%{defined tmpfiles_create}
+%define tmpfiles_create systemd-tmpfiles --create ||:
+%endif
+
 %if 0%{?sles_version} == 12
 %ifnarch s390 s390x
 %define buildib 1
@@ -47,7 +51,6 @@
 Group:  Productivity/Clustering/HA
 Version:2.4.2
 Release:0
-#Release: 1%{?gitver}%{?dist}
 Url:http://corosync.github.io/corosync/
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
@@ -70,6 +73,8 @@
 Patch17:0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
 Patch18:0008-main.c-add-option-to-set-priority.patch
 Patch19:0009-totem-Propagate-totem-initialization-failure.patch
+Patch20:0010-fix-ifdown-udp.patch
+Patch21:0011-fix-tmpfiles-create.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -81,7 +86,6 @@
 Requires:   libcorosync4 = %{version}-%{release}
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
-Requires(post): %insserv_prereq  %fillup_prereq
 Requires(preun): /sbin/chkconfig
 Conflicts:  openais <= 0.89, openais-devel <= 0.89
 
@@ -91,37 +95,37 @@
 BuildRequires:  libqb-devel
 BuildRequires:  mozilla-nss-devel
 BuildRequires:  zlib-devel
-%if %{with_runautogen}
+%if %{with runautogen}
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
 %endif
-#%if %{with monitoring}
-#BuildRequires:  libstatgrab-devel
-#%endif
-%if %{with_rdma}
+%if %{with monitoring}
+BuildRequires:  libstatgrab-devel
+%endif
+%if %{with rdma}
 BuildRequires:  libibverbs-devel
 BuildRequires:  librdmacm-devel
 %endif
-%if %{with_snmp}
+%if %{with snmp}
 BuildRequires:  net-snmp-devel
 %endif
-#%if %{with dbus}
-#BuildRequires:  dbus-1-devel
-#%endif
-%if %{with_systemd}
+%if %{with dbus}
+BuildRequires:  dbus-1-devel
+%endif
+%if %{with systemd}
 BuildRequires:  

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-07-21 22:35:26

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Fri Jul 21 22:35:26 2017 rev:40 rq:509615 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-07-11 
08:23:34.974593701 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-07-21 
22:35:28.366599396 +0200
@@ -1,0 +2,17 @@
+Wed Jul 12 05:25:45 UTC 2017 - b...@suse.com
+
+-  some upstream fixes for corosync(bsc#1048259) 
+Added:
+bsc#1047860-add-version.patch
+0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
+0008-main.c-add-option-to-set-priority.patch
+0009-totem-Propagate-totem-initialization-failure.patch
+
+Removed:
+bnc#867767-add-version.patch
+0007-improve-corosync-keygen.patch(since this patch is not for corosync 
v2.x)
+
+Modified:
+corosync.spec, add judgement whether /etc/sysconfig/corosycn* exist before 
remove these files
+
+---

Old:

  0007-improve-corosync-keygen.patch
  bnc#867767-add-version.patch

New:

  0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
  0008-main.c-add-option-to-set-priority.patch
  0009-totem-Propagate-totem-initialization-failure.patch
  bsc#1047860-add-version.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.y0jKbu/_old  2017-07-21 22:35:29.102495586 +0200
+++ /var/tmp/diff_new_pack.y0jKbu/_new  2017-07-21 22:35:29.106495022 +0200
@@ -52,7 +52,7 @@
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
 Patch1: corosync-init-lockfile-path-error.patch
-Patch2: bnc#867767-add-version.patch
+Patch2: bsc#1047860-add-version.patch
 Patch3: bnc#872651-stop-cluster.patch
 Patch4: bnc#882449-corosync-conf-example.patch
 Patch5: corosync-2.3.4-fix-bashisms.patch
@@ -67,7 +67,9 @@
 Patch14:0004-main-Display-reason-why-cluster-cannot-be-formed.patch
 Patch15:0005-votequorum-Report-errors-from-votequorum_exec_send_r.patch
 Patch16:0006-coroapi-Use-size_t-for-private_data_size.patch
-Patch17:0007-improve-corosync-keygen.patch
+Patch17:0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch
+Patch18:0008-main.c-add-option-to-set-priority.patch
+Patch19:0009-totem-Propagate-totem-initialization-failure.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -144,6 +146,8 @@
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
 %build
 %if %{with_runautogen}
@@ -291,7 +295,9 @@
 %endif
 
 %postun
-rm /etc/sysconfig/corosync
+if [ -f /etc/sysconfig/corosync ]; then
+rm /etc/sysconfig/corosync
+fi
 %if %{with_systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
@@ -499,8 +505,8 @@
 %if %{sles_version} > 0
 ln -s /run/corosync-qdevice /var/run/
 %endif
-%if %{with_systemd} && 0%{?systemd_post:1}
-%systemd_post corosync-qdevice.service
+%if %{with_systemd}
+%service_add_post corosync-qdevice.service
 %endif
 
 %preun -n corosync-qdevice
@@ -517,11 +523,12 @@
 %endif
 
 %postun -n corosync-qdevice
-rm /etc/sysconfig/corosync-qdevice
+if [ -f /etc/sysconfig/corosync-qdevice ]; then
+rm /etc/sysconfig/corosync-qdevice
+fi
 %if %{with_systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
-#rm /etc/sysconfig/corosync-qdevice
 
 %files -n corosync-qdevice
 %defattr(-,root,root,-)
@@ -582,8 +589,8 @@
 ln -s /run/corosync-qnetd /var/run/
 %endif
 %{fillup_and_insserv -n corosync-qnetd}
-%if %{with_systemd} && 0%{?systemd_post:1}
-%systemd_post corosync-qnetd.service
+%if %{with_systemd}
+%service_add_post corosync-qnetd.service
 %endif
 
 %preun -n corosync-qnetd
@@ -600,11 +607,12 @@
 %endif
 
 %postun -n corosync-qnetd
-rm /etc/sysconfig/corosync-qnetd
+if [ -f /etc/sysconfig/corosync-qnetd ];then
+rm /etc/sysconfig/corosync-qnetd
+fi
 %if %{with_systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
-#rm /etc/sysconfig/corosync-qnetd
 
 %files -n corosync-qnetd
 %defattr(-,root,root,-)

++ 0007-Make-corosync-work-when-FIPS-mode-is-enabled.patch ++
--- corosync-2.4.2.orig/exec/totemcrypto.c  2016-11-08 00:39:12.0 
+0800
+++ corosync-2.4.2/exec/totemcrypto.c   2017-07-12 11:09:43.693227825 +0800
@@ -206,6 +206,13 @@
(const char *)format, ##args);  \
 } while (0);
 
+enum sym_key_type {
+   SYM_KEY_TYPE_CRYPT,
+   SYM_KEY_TYPE_HASH
+};
+
+#define MAX_WRAPPED_KEY_LEN128
+
 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-07-11 08:23:33

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Tue Jul 11 08:23:33 2017 rev:39 rq:509083 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-06-17 
10:19:59.033188730 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-07-11 
08:23:34.974593701 +0200
@@ -1,0 +2,15 @@
+Mon Jul 10 06:54:23 UTC 2017 - b...@suse.com
+
+- some errors in spec file(bsc#1047862)
+Modified:
+corosync.spec
+
+- improvement for corosync-keygen(bsc#1047861)
+Added:
+0007-improve-corosync-keygen.patch
+
+- 1047860corosync report wrong version number(bsc#1047860)
+Modified:
+bnc#867767-add-version.patch
+
+---

New:

  0007-improve-corosync-keygen.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.Vik2IP/_old  2017-07-11 08:23:35.714489349 +0200
+++ /var/tmp/diff_new_pack.Vik2IP/_new  2017-07-11 08:23:35.718488785 +0200
@@ -32,7 +32,6 @@
 %define with_runautogen 1
 %define with_qdevices 1
 %define with_qnetd 1
-
 %if 0%{?sles_version} == 12
 %ifnarch s390 s390x
 %define buildib 1
@@ -68,6 +67,7 @@
 Patch14:0004-main-Display-reason-why-cluster-cannot-be-formed.patch
 Patch15:0005-votequorum-Report-errors-from-votequorum_exec_send_r.patch
 Patch16:0006-coroapi-Use-size_t-for-private_data_size.patch
+Patch17:0007-improve-corosync-keygen.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -143,6 +143,7 @@
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %build
 %if %{with_runautogen}
@@ -261,14 +262,18 @@
 APIs and libraries, default configuration files, and an init script.
 
 %pre
-%if %{with_systemd} && 0%{?systemd_post:1}
-%service_add_pre corosync.service corosync-notifyd.service
+%if %{with_systemd}
+#%service_add_pre corosync.service corosync-notifyd.service
+#we do not use corosync-notifyd.service
+%service_add_pre corosync.service
 %endif
 
 %post
 %{fillup_and_insserv -n corosync}
-%if %{with_systemd} && 0%{?systemd_post:1}
-%service_add_post corosync.service corosync-notifyd.service
+%if %{with_systemd}
+#%service_add_post corosync.service corosync-notifyd.service
+#we do not use corosync-notifyd.service
+%service_add_post corosync.service
 %endif
 rm -rf  %{_sysconfdir}/corosync/corosync.conf.example 
%{_sysconfdir}/corosync/corosync.conf.example.unicast
 ln -s /usr/share/doc/packages/corosync/corosync.conf.example 
%{_sysconfdir}/corosync/
@@ -276,11 +281,8 @@
 
 %preun
 
-unlink %{_sysconfdir}/corosync/corosync.conf.example.unicast
-unlink %{_sysconfdir}/corosync/corosync.conf.example
-
-%if %{with_systemd} && 0%{?systemd_preun:1}
-%systemd_preun corosync.service
+%if %{with_systemd}
+%service_del_preun corosync.service
 %else
 if [ $1 -eq 0 ]; then
/sbin/service corosync stop &>/dev/null || :
@@ -289,10 +291,10 @@
 %endif
 
 %postun
+rm /etc/sysconfig/corosync
 %if %{with_systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
-rm /etc/sysconfig/corosync
 
 %files
 %defattr(-,root,root,-)
@@ -392,9 +394,9 @@
 #
 %package -n libcorosync4
 Summary:The Corosync Cluster Engine Libraries
-Group:  Productivity/Clustering/HA
 # openais is indeed gone and should be uninstalled. Yes, we do not
 # provide libopenais on purpose, the package has been deleted.
+Group:  Productivity/Clustering/HA
 Obsoletes:  libopenais3 < 1.2
 Conflicts:  libopenais3 < 1.2
 #Requires:   %{name} = %{version}-%{release}
@@ -502,8 +504,8 @@
 %endif
 
 %preun -n corosync-qdevice
-%if %{with_systemd} && 0%{?systemd_preun:1}
-%systemd_preun corosync-qdevice.service
+%if %{with_systemd}
+%service_del_preun corosync-qdevice.service
 %else
 if [ $1 -eq 0 ]; then
/sbin/service corosync-qdevice stop &>/dev/null || :
@@ -515,10 +517,11 @@
 %endif
 
 %postun -n corosync-qdevice
+rm /etc/sysconfig/corosync-qdevice
 %if %{with_systemd} && 0%{?systemd_postun:1}
 %systemd_postun
 %endif
-rm /etc/sysconfig/corosync-qdevice
+#rm /etc/sysconfig/corosync-qdevice
 
 %files -n corosync-qdevice
 %defattr(-,root,root,-)
@@ -584,8 +587,8 @@
 %endif
 
 %preun -n corosync-qnetd
-%if %{with_systemd} && 0%{?systemd_preun:1}
-%systemd_preun corosync-qnetd.service
+%if %{with_systemd}
+%service_del_preun corosync-qnetd.service
 %else
 if [ $1 -eq 0 ]; then
/sbin/service corosync-qnetd stop &>/dev/null || :
@@ -597,10 +600,11 @@
 %endif
 
 %postun -n corosync-qnetd
+rm 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-06-17 10:19:57

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Sat Jun 17 10:19:57 2017 rev:38 rq:501564 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-05-18 
20:44:47.453144630 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-06-17 
10:19:59.033188730 +0200
@@ -1,0 +2,15 @@
+Wed Jun  7 06:06:38 UTC 2017 - b...@suse.com
+
+-  some Fixes from upstream(bsc#1043045)
+Added: 
+0004-main-Display-reason-why-cluster-cannot-be-formed.patch
+0005-votequorum-Report-errors-from-votequorum_exec_send_r.patch
+0006-coroapi-Use-size_t-for-private_data_size.patch
+
+---
+Tue Jun  6 16:57:05 UTC 2017 - b...@suse.com
+[patch-lost-in-sle] Missing issues in openSUSE:Factory/corosync(bsc#1041587)
+   add change log for upgrading corosync to v2.3.6 and make this change log 
contain all records in SLE12 SP3
+   make the format consistent
+
+---
@@ -5 +20,2 @@
-   Added: 0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch
+Added: 
+0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch
@@ -11 +27,2 @@
-   Added: 0002-Main-call-mlock-after-fork.patch
+Added: 
+0002-Main-call-mlock-after-fork.patch
@@ -17,2 +34,5 @@
-   Added:0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch
-   removed: 0001-totemip.c-Fixed-Evicted-from-CPG-membership.patch
+Added:
+0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch
+
+Removed: 
+0001-totemip.c-Fixed-Evicted-from-CPG-membership.patch
@@ -24 +44 @@
-  added:
+Added:
@@ -32 +52,3 @@
-   added: disable-build-html-docs.patch
+Added: 
+   disable-build-html-docs.patch
+   
@@ -43,2 +65,10 @@
-  added: corosync-start-stop-level.patch
-  deleted: corosync-cts-api-error.patch
+Added: 
+corosync-start-stop-level.patch
+
+Deleted: 
+Config-Flag-config-uidgid-entries.patch
+cfg-Prevents-use-of-uninitialized-buffer.patch
+cts-Make-it-run-with-pacemaker-1.13.patch
+get_cluster_mcast_addr-error-is-not-fatal.patch
+totemsrp-Addition-of-the-log.patch
+
@@ -55,0 +86,2 @@
+---
+Thu Oct 15 05:19:36 UTC 2016 - b...@suse.com
@@ -57,18 +89,61 @@
-  corosync-v2.3.6
-CFG: Prevent CFG orignating messages during SYNC
-wd: fix setting of watchdog timeouts
-votequorum: Don't send multiple callbacks when nodes join
-cfgtool: Display nodeid as unsigned int
-quorum: Display node id as unsigned int.
-Check for fdatasync
-Fix detection of qb_log_thread_priority_set
-totempg: Fix memory leak
-cpg: Memory not unmapped in cpg_zcb_free
-cpg: Handle ipc error in cpg_zcb_alloc/free
-totemconfig: Explicitly pass IP version
-parser: Make config file parser more hierarchy
-logsys: fix TOTEM logging when corosync built out of tree
-wd: make watchdog device configurable
-schedwrk: Cleanup and make it work on PPC BE
-Reapply config defaults corosync.conf reload
-logconfig: Fix logging reload disabling logfiles
+upgrade corosync-v2.3.5 to corosync-v2.3.6, and backport patches from 
v2.4.2(FATE#322113, bsc#1020550)
+Added:
+Config-Flag-config-uidgid-entries.patch
+cfg-Prevents-use-of-uninitialized-buffer.patch
+cts-Make-it-run-with-pacemaker-1.13.patch
+get_cluster_mcast_addr-error-is-not-fatal.patch
+totemsrp-Addition-of-the-log.patch
+
+Removed:
+corosync-cts-api-error.patch
+
+v2.3.6
+- logconfig: Fix logging reload disabling logfiles
+- wd: Warn if values are out of range
+- parser: WD Read type correctly from corosync.conf
+- Add some more RO keys
+- Reapply config defaults corosync.conf reload
+- schedwrk: Cleanup and make it work on PPC BE
+- cmapctl: Handle corosync errors in print_key func
+- Adds doxygen stubs to include directory
+- Add clang-format configuration file
+- wd: make watchdog device configurable
+- logging: Use our own version of basename
+- logsys: fix TOTEM logging when corosync built out of tree
+- parser: Make config file parser more hierarchy
+- totemconfig: Explicitly pass IP version
+- cpg: Handle ipc error in cpg_zcb_alloc/free
+- cpg: Memory not unmapped in cpg_zcb_free
+- totempg: Fix memory leak
+- Fix spelling errors
+- Add section in manual title for cpg_zcb_free 3
+- Add section in manual title for cpg_zcb_alloc 3
+- Update corosync.spec source link
+- Update gitignore files
+- Remove all links to old ML
+- totemsrp: Fix clang warning (tautological compare)
+- configure.ac: Make location of .pc overrideable
+- Remove a few unused 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-05-18 20:44:43

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Thu May 18 20:44:43 2017 rev:37 rq:495135 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-04-18 
13:46:42.833759350 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-05-18 
20:44:47.453144630 +0200
@@ -1,0 +2,12 @@
+Tue May 16 03:05:05 UTC 2017 - b...@suse.com
+
+- totemrrp: Fix situation when all rings are faulty(bsc#1039215)
+   Added: 0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch
+
+---
+Tue May  9 04:17:35 UTC 2017 - b...@suse.com
+
+- calling mlockall before corosync_tty_detach is noop when corosync is 
executed as a daemon(bsc#1038147)
+   Added: 0002-Main-call-mlock-after-fork.patch
+
+---

New:

  0002-Main-call-mlock-after-fork.patch
  0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.uKgSPT/_old  2017-05-18 20:44:48.632978127 +0200
+++ /var/tmp/diff_new_pack.uKgSPT/_new  2017-05-18 20:44:48.636977562 +0200
@@ -63,6 +63,8 @@
 Patch9: 0001-Logsys-Change-logsys-syslog_priority-priority.patch
 Patch10:0001-logconfig.c-make-logging.syslog_priority-and-logging.patch
 Patch11:0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch
+Patch12:0002-Main-call-mlock-after-fork.patch
+Patch13:0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -133,6 +135,8 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 %if %{with_runautogen}

++ 0002-Main-call-mlock-after-fork.patch ++
>From 3b89acd59f5113edb23ba41e2ce67f9c3b2880fb Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Tue, 9 May 2017 11:17:51 +0800
Subject: [PATCH] Main: call mlock after fork

Man page of mlockall is clear:
Memory locks are not inherited by a child created via fork(2) and are
automatically removed (unlocked) during an execve(2) or when the
process terminates.

So calling mlockall before corosync_tty_detach is noop when corosync is
executed as a daemon (corosync -f was not affected).

This regression is caused by ed7d054
(setprio for logsys/qblog was correct, mlockall was not).

Solution is to move corosync_mlockall call on correct place.
---
 exec/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exec/main.c b/exec/main.c
index 7d2dcf7c..b3fce95b 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -1201,8 +1201,6 @@ int main (int argc, char **argv, char **envp)
corosync_setscheduler ();
}
 
-   corosync_mlockall ();
-
/*
 * Other signals are registered later via qb_loop_signal_add
 */
@@ -1329,6 +1327,8 @@ int main (int argc, char **argv, char **envp)
corosync_tty_detach ();
}
 
+corosync_mlockall();
+
corosync_poll_handle = qb_loop_create ();
 
memset(_pause_timeout_data, 0, 
sizeof(scheduler_pause_timeout_data));
-- 
2.12.0

++ 0003-totemrrp-Fix-situation-when-all-rings-are-faulty.patch ++
>From eaa92765f1226f16ddb58f1baf3494b817726cb4 Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Tue, 16 May 2017 10:49:23 +0800
Subject: [PATCH] totemrrp: Fix situation when all rings are faulty

Previously when all rings were marked as failed no message was sent via
any interface. This is problem because totemsrp relies on messages
delivered via localhost multicast loop socket so it never moved to
single node mode and it got stuck.

Solution is to send message via one of the interfaces (first one seems
to be obvious choice) if it was not sent via any interface.

Strictly speaking it should be enough to change just *_mcast_flush_send
functions, but changing others is just for sure.
---
 exec/totemrrp.c | 71 +
 1 file changed, 62 insertions(+), 9 deletions(-)

diff --git a/exec/totemrrp.c b/exec/totemrrp.c
index 0d9a58d5..15ba7766 100644
--- a/exec/totemrrp.c
+++ b/exec/totemrrp.c
@@ -1002,7 +1002,7 @@ static void passive_monitor (
}
 
/*
-* Max is larger then threshold -> start adjusting process
+* Max is larger than threshold -> start adjusting process
 */
if (max > PASSIVE_RECV_COUNT_THRESHOLD) {
 

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-04-18 13:46:39

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Tue Apr 18 13:46:39 2017 rev:36 rq:487285 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-03-20 
17:04:16.214708691 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-04-18 
13:46:42.833759350 +0200
@@ -1,0 +2,7 @@
+Mon Apr 10 06:42:51 UTC 2017 - b...@suse.com
+
+- [upgrade] Changing the pre-upgrade role for node failed(bsc#1030437)
+   Added:0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch
+   removed: 0001-totemip.c-Fixed-Evicted-from-CPG-membership.patch
+
+---

New:

  0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.T1r8sN/_old  2017-04-18 13:46:44.261557260 +0200
+++ /var/tmp/diff_new_pack.T1r8sN/_new  2017-04-18 13:46:44.261557260 +0200
@@ -62,6 +62,7 @@
 Patch8: disable-build-html-docs.patch
 Patch9: 0001-Logsys-Change-logsys-syslog_priority-priority.patch
 Patch10:0001-logconfig.c-make-logging.syslog_priority-and-logging.patch
+Patch11:0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -131,6 +132,7 @@
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %if %{with_runautogen}

++ 0001-totemconfig.c-Fixed-Evicted-from-CPG-membership.patch ++
>From 622a4a629346f3b52ecac140ab99fb3023dca8f9 Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Tue, 11 Apr 2017 16:57:55 +0800
Subject: [PATCH] totemconfig.c: Fixed Evicted from CPG membership

---
 exec/main.c|  4 
 exec/totemconfig.c | 13 -
 exec/totemconfig.h |  1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/exec/main.c b/exec/main.c
index 0ca5634a..f09b73cf 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -1261,6 +1261,10 @@ int main (int argc, char **argv, char **envp)
if (totem_config_warnings & TOTEM_CONFIG_WARNING_TOTEM_NODEID_IGNORED) {
log_printf (LOGSYS_LEVEL_WARNING, "nodeid appears both in totem 
section and nodelist. Nodelist one is used.");
}
+if (totem_config_warnings & TOTEM_CONFIG_BINDNETADDR_NODELIST_SET) {
+log_printf (LOGSYS_LEVEL_WARNING, "%s", "interface section bindnetaddr 
is used together with nodelist. "
+"Nodelist one is going to be used.");
+}
 
if (totem_config_warnings != 0) {
log_printf (LOGSYS_LEVEL_WARNING, "Please migrate config file 
to nodelist.");
diff --git a/exec/totemconfig.c b/exec/totemconfig.c
index f232ea8f..305a7fe4 100644
--- a/exec/totemconfig.c
+++ b/exec/totemconfig.c
@@ -975,7 +975,7 @@ extern int totem_config_read (
uint64_t *warnings)
 {
int res = 0;
-   char *str;
+   char *str, *ring0_addr_str;
unsigned int ringnumber = 0;
int member_count = 0;
icmap_iter_t iter, member_iter;
@@ -1048,6 +1048,17 @@ extern int totem_config_read (
 */
config_convert_nodelist_to_interface(totem_config);
} else {
+if (icmap_get_string("nodelist.node.0.ring0_addr", _addr_str) == 
CS_OK) {
+/*
+ * Both bindnetaddr and ring0_addr are set.
+ * Log warning information, and use nodelist instead
+ */
+*warnings |= TOTEM_CONFIG_BINDNETADDR_NODELIST_SET;
+
+config_convert_nodelist_to_interface(totem_config);
+
+free(ring0_addr_str);
+}
free(str);
}
 
diff --git a/exec/totemconfig.h b/exec/totemconfig.h
index 10607cc2..368ecabf 100644
--- a/exec/totemconfig.h
+++ b/exec/totemconfig.h
@@ -46,6 +46,7 @@
 #define TOTEM_CONFIG_WARNING_MEMBERS_IGNORED   (1<<1)
 #define TOTEM_CONFIG_WARNING_MEMBERS_DEPRECATED(1<<2)
 #define TOTEM_CONFIG_WARNING_TOTEM_NODEID_IGNORED  (1<<3)
+#define TOTEM_CONFIG_BINDNETADDR_NODELIST_SET (1<<4)
 
 extern int totem_config_read (
struct totem_config *totem_config,
-- 
2.12.0

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-03-20 17:04:13

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Mon Mar 20 17:04:13 2017 rev:35 rq:479176 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2017-03-03 
14:38:50.437885807 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-03-20 
17:04:16.214708691 +0100
@@ -2 +2 @@
-Tue Feb 28 04:52:04 UTC 2017 - b...@suse.com
+Tue Mar 14 07:14:58 UTC 2017 - b...@suse.com
@@ -6,0 +7 @@
+0001-logconfig.c-make-logging.syslog_priority-and-logging.patch

New:

  0001-logconfig.c-make-logging.syslog_priority-and-logging.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.SZx3qr/_old  2017-03-20 17:04:17.510525722 +0100
+++ /var/tmp/diff_new_pack.SZx3qr/_new  2017-03-20 17:04:17.514525157 +0100
@@ -61,6 +61,7 @@
 Patch7: corosync-start-stop-level.patch
 Patch8: disable-build-html-docs.patch
 Patch9: 0001-Logsys-Change-logsys-syslog_priority-priority.patch
+Patch10:0001-logconfig.c-make-logging.syslog_priority-and-logging.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -129,6 +130,7 @@
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %build
 %if %{with_runautogen}

++ 0001-logconfig.c-make-logging.syslog_priority-and-logging.patch ++
>From 5f47e2a8583995cdd80297d4493ce019b02edb14 Mon Sep 17 00:00:00 2001
From: Bin Liu 
Date: Fri, 10 Mar 2017 15:22:13 +0800
Subject: [PATCH] logconfig.c: make logging.syslog_priority and
 logging.logfile_priority to info

logfile_priority and syslog_priority could be modified by
logging.logger_subsys.{logfile_priority|syslog_priority}. which could
lead to the following output(which are at notice level):

corosync[21419]:   [QUORUM] Using quorum provider corosync_votequorum
corosync[21419]:   [QUORUM] Members[1]: 1084777643
corosync[21419]:   [QUORUM] This node is within the primary component
   and will provide service.
corosync[21419]:   [QUORUM] Members[3]: 1084777563 1084777584 1084777643

even the syslog_priority is warning. This patch could avoid the
overwrite.
---
 exec/logconfig.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/exec/logconfig.c b/exec/logconfig.c
index a4d348a..6d0bed6 100644
--- a/exec/logconfig.c
+++ b/exec/logconfig.c
@@ -401,7 +401,7 @@ static int corosync_main_config_set (
goto parse_error;
}
}
-   else {
+   else if(strcmp(key_name, "logging.syslog_priority") == 0){
if (logsys_config_syslog_priority_set(subsys,
  
logsys_priority_id_get("info")) < 0) {
error_reason = "unable to set syslog level";
@@ -449,7 +449,7 @@ static int corosync_main_config_set (
goto parse_error;
}
}
-   else {
+   else if(strcmp(key_name,"logging.logfile_priority") == 0){
if (logsys_config_logfile_priority_set(subsys,
  
logsys_priority_id_get("info")) < 0) {
error_reason = "unable to set syslog level";
-- 
2.6.6

commit corosync for openSUSE:Factory

[root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2017-03-03 14:38:23

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Fri Mar  3 14:38:23 2017 rev:34 rq:461232 version:2.4.2

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2016-12-09 
09:31:43.451747433 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2017-03-03 
14:38:50.437885807 +0100
@@ -1,0 +2,7 @@
+Tue Feb 28 04:52:04 UTC 2017 - b...@suse.com
+
+- L3-Question: corosync logging priority takes no effect(bsc#1023959)
+  added:
+0001-Logsys-Change-logsys-syslog_priority-priority.patch
+
+---

New:

  0001-Logsys-Change-logsys-syslog_priority-priority.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.KFy4RL/_old  2017-03-03 14:38:51.017803709 +0100
+++ /var/tmp/diff_new_pack.KFy4RL/_new  2017-03-03 14:38:51.021803143 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -60,6 +60,7 @@
 Patch6: bsc#1001164-corosync.conf-example.patch
 Patch7: corosync-start-stop-level.patch
 Patch8: disable-build-html-docs.patch
+Patch9: 0001-Logsys-Change-logsys-syslog_priority-priority.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -127,6 +128,7 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %if %{with_runautogen}

++ 0001-Logsys-Change-logsys-syslog_priority-priority.patch ++
>From 8b6bd86a55b8bda9f3a8ff67bdff908263976fa3 Mon Sep 17 00:00:00 2001
From: Jan Friesse 
Date: Fri, 24 Feb 2017 16:23:50 +0100
Subject: [PATCH] Logsys: Change logsys syslog_priority priority

LibQB adds default "*" syslog filter so we have to set syslog_priority
as low as possible so filters applied later in
_logsys_config_apply_per_file takes effect.

Signed-off-by: Jan Friesse 
---
 exec/main.c | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/exec/main.c b/exec/main.c
index 61bcd3d..2370a86 100644
--- a/exec/main.c
+++ b/exec/main.c
@@ -127,10 +127,15 @@
 #define IPC_LOGSYS_SIZE8192*128
 #endif
 
+/*
+ * LibQB adds default "*" syslog filter so we have to set syslog_priority as 
low
+ * as possible so filters applied later in _logsys_config_apply_per_file takes
+ * effect.
+ */
 LOGSYS_DECLARE_SYSTEM ("corosync",
LOGSYS_MODE_OUTPUT_STDERR | LOGSYS_MODE_OUTPUT_SYSLOG,
LOG_DAEMON,
-   LOG_INFO);
+   LOG_EMERG);
 
 LOGSYS_DECLARE_SUBSYS ("MAIN");
 
-- 
2.6.6

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2016-11-03 12:58:57

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2016-07-20 
09:16:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2016-11-03 
12:58:59.0 +0100
@@ -1,0 +2,50 @@
+Mon Oct 17 08:28:33 UTC 2016 - b...@suse.com
+
+- upgrade to corosync-2.4.1(bsc#1004967)
+  added: corosync-start-stop-level.patch
+  deleted: corosync-cts-api-error.patch
+  modified: bnc#867767-add-version.patch, change version to 2.4.1
+  corosync-2.4.1:
+Low: totemsrp: Addition of the log.
+cts: Make it run with pacemaker-1.13+
+Config: Flag config uidgid entries
+Spec: Qdevice require same version of corosync
+
+  corosync-2.4.0:
+qdevice and qnet
+config: get_cluster_mcast_addr error is not fatal
+some typo fixes
+
+  corosync-v2.3.6
+CFG: Prevent CFG orignating messages during SYNC
+wd: fix setting of watchdog timeouts
+votequorum: Don't send multiple callbacks when nodes join
+cfgtool: Display nodeid as unsigned int
+quorum: Display node id as unsigned int.
+Check for fdatasync
+Fix detection of qb_log_thread_priority_set
+totempg: Fix memory leak
+cpg: Memory not unmapped in cpg_zcb_free
+cpg: Handle ipc error in cpg_zcb_alloc/free
+totemconfig: Explicitly pass IP version
+parser: Make config file parser more hierarchy
+logsys: fix TOTEM logging when corosync built out of tree
+wd: make watchdog device configurable
+schedwrk: Cleanup and make it work on PPC BE
+Reapply config defaults corosync.conf reload
+logconfig: Fix logging reload disabling logfiles
+
+---
+Tue Sep 27 07:33:09 UTC 2016 - b...@suse.com
+
+- Default token timeout was 5000 ms in SLE 11 SP4, but is 1000 ms in SLE 
12(bsc#1001164)
+  Added: bsc#1001164-corosync.conf-example.patch
+
+---
+Wed Sep  7 07:35:12 UTC 2016 - b...@suse.com
+
+- Fix: [s390]Upgrade from SP1-GM + HA to SP2-RC2 +: Failed to start Corosync 
Cluster engine(bsc#996230)
+- modify corosync.spec to remove "chkconfig --add"
+- remove corosync-devel and require lines from baselibs.conf
+
+---
@@ -6,2 +56,2 @@
-Mon Aug 17 15:09:13 UTC 2015 - b...@suse.com(bnc#941910)
-- remove git files from tarball
+Mon Aug 17 15:09:13 UTC 2015 - b...@suse.com
+- remove git files from tarball(bnc#941910)
@@ -9,5 +58,0 @@

-Mon Jul 27 10:32:27 UTC 2015 - dims...@opensuse.org
-
-- BuildRequire pkgconfig(systemd) instead of systemd: this should
-  help avoid a build cycle.

Old:

  corosync-2.3.5.tar.gz
  corosync-cts-api-error.patch

New:

  bsc#1001164-corosync.conf-example.patch
  corosync-2.4.1.tar.gz
  corosync-start-stop-level.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.L3zQj5/_old  2016-11-03 12:59:00.0 +0100
+++ /var/tmp/diff_new_pack.L3zQj5/_new  2016-11-03 12:59:00.0 +0100
@@ -21,17 +21,17 @@
 # Conditionals
 # Invoke "rpmbuild --without " or "rpmbuild --with "
 # to disable or enable specific features
-%bcond_with testagents
 %define with_testagents1
-%bcond_with watchdog
-%bcond_with monitoring
-%bcond_with snmp
-%bcond_with rdma
+%define with_watchdog 1
+#%define with_monitoring 0
+%define with_snmp 1
+#%define with_dbus 1
+%define with_rdma 1
 %define with_systemd 1
-%bcond_with upstart
-%bcond_with xmlconf
-%bcond_with runautogen
+%define with_xmlconf 1
 %define with_runautogen 1
+%define with_qdevices 1
+%define with_qnetd 1
 
 %if 0%{?sles_version} == 12
 %ifnarch s390 s390x
@@ -46,17 +46,20 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:2.3.5
+Version:2.4.1
 Release:0
-Url:http://www.corosync.org
+#Release: 1%{?gitver}%{?dist}
+Url:http://corosync.github.io/corosync/
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
 Patch1: corosync-init-lockfile-path-error.patch
-Patch2: corosync-cts-api-error.patch
-Patch3: bnc#867767-add-version.patch
-Patch4: bnc#872651-stop-cluster.patch
-Patch5: bnc#882449-corosync-conf-example.patch
-Patch6: corosync-2.3.4-fix-bashisms.patch
+Patch2: 

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2016-07-20 09:16:47

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is "corosync"

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2015-08-21 
07:40:28.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2016-07-20 
09:16:50.0 +0200
@@ -1,0 +2,4 @@
+Thu Jul 14 07:59:03 UTC 2016 - b...@suse.com
+-  corosync process still exists when stop pacemaker service(bnc#988683) 
+
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.0h1rYK/_old  2016-07-20 09:16:51.0 +0200
+++ /var/tmp/diff_new_pack.0h1rYK/_new  2016-07-20 09:16:51.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -33,7 +33,7 @@
 %bcond_with runautogen
 %define with_runautogen 1
 
-%if 0%{?sles_version} == 11
+%if 0%{?sles_version} == 12
 %ifnarch s390 s390x
 %define buildib 1
 %endif
@@ -207,10 +207,6 @@
 %post
 %if %{with systemd} && 0%{?systemd_post:1}
 %service_add_post corosync.service corosync-notifyd.service
-%else
-if [ $1 -eq 1 ]; then
-   /sbin/chkconfig --add corosync || :
-fi
 %endif
 rm -rf  %{_sysconfdir}/corosync/corosync.conf.example 
%{_sysconfdir}/corosync/corosync.conf.example.unicast
 ln -s /usr/share/doc/packages/corosync/corosync.conf.example 
%{_sysconfdir}/corosync/

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2015-08-21 07:39:46

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2015-07-28 
11:41:50.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2015-08-21 
07:40:28.0 +0200
@@ -1,0 +2,4 @@
+Mon Aug 17 15:09:13 UTC 2015 - b...@suse.com(bnc#941910)
+- remove git files from tarball
+- modify corosync.spec to delete logrotate.d
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.KSgF8i/_old  2015-08-21 07:40:29.0 +0200
+++ /var/tmp/diff_new_pack.KSgF8i/_new  2015-08-21 07:40:29.0 +0200
@@ -190,6 +190,7 @@
 install -m 0644 tools/corosync-notifyd.sysconfig.example  
%{buildroot}/usr/lib/tmpfiles.d/corosync-notifyd
 install -m 0644 conf/corosync.conf.example* 
%{buildroot}/usr/share/doc/packages/corosync/
 rm -rf %{buildroot}/etc/corosync/corosync.conf.example*
+rm -rf %{buildroot}/etc/logrotate.d/
 
 %clean
 rm -rf %{buildroot}

++ corosync-2.3.5.tar.gz ++
/work/SRC/openSUSE:Factory/corosync/corosync-2.3.5.tar.gz 
/work/SRC/openSUSE:Factory/.corosync.new/corosync-2.3.5.tar.gz differ: char 5, 
line 1

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2015-07-28 11:41:47

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2014-11-24 
11:15:58.0 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2015-07-28 
11:41:50.0 +0200
@@ -1,0 +2,27 @@
+Mon Jul 27 10:32:27 UTC 2015 - dims...@opensuse.org
+
+- BuildRequire pkgconfig(systemd) instead of systemd: this should
+  help avoid a build cycle.
+
+---
+Wed Jul 21 15:12:26 UTC 2015 - b...@suse.com
+
+update from v2.3.3 to v2.3.5 (bnc#939328)
+v2.3.5
+- Log: Add logrotate configuration file
+- totemsrp: Improve logging of left/down nodes
+- totemconfig: Check for duplicate nodeids
+- Really add cpghum
+- cpg: Add support for messages larger than 1Mb
+- Handle adding and removing UDPU members atomically
+
+- add patches:
+  * corosync-cts-api-error.patch
+  * bnc#867767-add-version.patch
+
+---
+Wed Jul  1 17:30:22 UTC 2015 - b...@suse.com
+
+- mv the place of corosync.conf.example*(fate#318190)
+
+---
@@ -554 +580,0 @@
-

Old:

  corosync-2.3.4.tar.gz

New:

  bnc#867767-add-version.patch
  corosync-2.3.5.tar.gz
  corosync-cts-api-error.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.PUiH5o/_old  2015-07-28 11:41:50.0 +0200
+++ /var/tmp/diff_new_pack.PUiH5o/_new  2015-07-28 11:41:50.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,8 @@
 #
 
 
+#%global dirty dirty
+
 # Conditionals
 # Invoke rpmbuild --without feature or rpmbuild --with feature
 # to disable or enable specific features
@@ -44,22 +46,33 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:2.3.4
+Version:2.3.5
 Release:0
 Url:http://www.corosync.org
 Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
 Patch1: corosync-init-lockfile-path-error.patch
-Patch2: bnc#872651-stop-cluster.patch
-Patch3: bnc#882449-corosync-conf-example.patch
-Patch4: corosync-2.3.4-fix-bashisms.patch
+Patch2: corosync-cts-api-error.patch
+Patch3: bnc#867767-add-version.patch
+Patch4: bnc#872651-stop-cluster.patch
+Patch5: bnc#882449-corosync-conf-example.patch
+Patch6: corosync-2.3.4-fix-bashisms.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
 # provide openais on purpose, the package has been deleted.
-Obsoletes:  openais
-Conflicts:  openais
+Obsoletes:  openais  1.2
+Conflicts:  openais  1.2
+
 # Runtime bits
 Requires:   libcorosync4 = %{version}-%{release}
+Requires(pre): /usr/sbin/useradd
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/chkconfig
+Conflicts:  openais = 0.89, openais-devel = 0.89
+
+# Build bits
+
+Requires:   libcorosync4 = %{version}-%{release}
 #Requires(pre): /usr/sbin/useradd
 #Requires(post): /sbin/chkconfig
 #Requires(preun): /sbin/chkconfig
@@ -71,6 +84,7 @@
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
+
 %endif
 %if %{with monitoring}
 BuildRequires:  libstatgrab-devel
@@ -85,7 +99,7 @@
 %if %{with dbus}
 BuildRequires:  dbus-1-devel
 %endif
-%if %{with_systemd}
+%if %{with systemd}
 BuildRequires:  pkgconfig(systemd)
 Requires(post): systemd
 Requires(preun): systemd
@@ -101,11 +115,13 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %build
-#%if 0%{?buildtrunk} == 1
+%if %{with runautogen}
 ./autogen.sh
-#%endif
+%endif
 
 %if %{with rdma}
 export ibverbs_CFLAGS=-I/usr/include/infiniband \
@@ -114,7 +130,7 @@
 export rdmacm_LIBS=-lrdmacm \
 %endif
 %{configure} \
-%if %{with_testagents}
+%if %{with testagents}
--enable-testagents \
--enable-augeas \
--enable-debug \
@@ -128,10 +144,13 @@
 %if %{with snmp}
--enable-snmp \
 %endif
+%if %{with dbus}
+   --enable-dbus \
+%endif
 %if %{with rdma}
--enable-rdma \
 

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2014-11-24 11:15:51

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2014-09-10 
17:02:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2014-11-24 
11:15:58.0 +0100
@@ -1,0 +2,18 @@
+Wed Nov 19 22:24:13 UTC 2014 - dims...@opensuse.org
+
+- Replace systemd BuildRequires with pkgconfig(systemd): we do not
+  require the full installation / dep chain of systemd.
+
+---
+Mon Nov 17 04:01:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashisms in mem_leak_test.sh script
+- add patches:
+  * corosync-2.3.4-fix-bashisms.patch
+
+---
+Mon Nov 17 04:00:00 UTC 2014 - Led led...@gmail.com
+
+- fix bashism in preun script
+
+---

New:

  corosync-2.3.4-fix-bashisms.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.0TLIgR/_old  2014-11-24 11:16:00.0 +0100
+++ /var/tmp/diff_new_pack.0TLIgR/_new  2014-11-24 11:16:00.0 +0100
@@ -52,6 +52,7 @@
 Patch1: corosync-init-lockfile-path-error.patch
 Patch2: bnc#872651-stop-cluster.patch
 Patch3: bnc#882449-corosync-conf-example.patch
+Patch4: corosync-2.3.4-fix-bashisms.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
 # provide openais on purpose, the package has been deleted.
@@ -85,7 +86,7 @@
 BuildRequires:  dbus-1-devel
 %endif
 %if %{with_systemd}
-BuildRequires:  systemd
+BuildRequires:  pkgconfig(systemd)
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -99,6 +100,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1
@@ -199,7 +201,7 @@
 %service_del_preun corosync.service corosync-notifyd.service
 %else
 if [ $1 -eq 0 ]; then
-   /sbin/service corosync stop /dev/null || :
+   /sbin/service corosync stop /dev/null 21 ||:
/sbin/chkconfig --del corosync || :
 fi
 %endif

++ corosync-2.3.4-fix-bashisms.patch ++
diff -Ndur corosync-2.3.4/cts/agents/mem_leak_test.sh 
corosync-2.3.4-fix-bashisms/cts/agents/mem_leak_test.sh
--- corosync-2.3.4/cts/agents/mem_leak_test.sh  2014-08-12 10:27:36.0 
+0300
+++ corosync-2.3.4-fix-bashisms/cts/agents/mem_leak_test.sh 2014-11-17 
05:57:38.986640342 +0200
@@ -41,14 +41,14 @@
 find $f | sed s|\.|_|g | sed s|/|.|g | while read l
 do 
   echo $l.count u64 $COUNT  $temp_file
-  let COUNT=$COUNT+1
+  COUNT=$((COUNT + 1))
 done
 
 corosync-cmapctl -p $temp_file
 corosync-cmapctl -D usr
   done
   AFTER=$(get_mem $TYPE)
-  let DIFF=$AFTER - $BEFORE
+  DIFF=$((AFTER - BEFORE))
   rm -f $temp_file
   #echo $f diff $TYPE $DIFF
   echo $DIFF
@@ -76,11 +76,11 @@
   find /usr/bin | sed s|\.|_|g | sed s|/|.|g | while read l
   do 
 corosync-cmapctl -s $l u32 $COUNT
-let COUNT=$COUNT+1
+COUNT=$((COUNT + 1))
   done
   corosync-cmapctl -D usr
   AFTER=$(get_mem $TYPE)
-  let DIFF=$AFTER - $BEFORE
+  DIFF=$((AFTER - BEFORE))
   echo $DIFF
 
   exit 0
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2014-09-10 17:01:57

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2014-07-10 
14:54:55.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2014-09-10 
17:02:13.0 +0200
@@ -1,0 +2,74 @@
+Mon Sep  1 08:01:50 UTC 2014 - x...@suse.com
+
+- Update to corosync 2.3.4
+- Drop the obsoleted patches
+  - corosync-cts-api-error.patch
+  - bnc#867767-add-version.patch
+  - bnc#881142-fix-shm-leak.patch
+- quorumtool: Sort output by nodeid
+- YKD: Fix loading of YKD quorum module
+- corosync-quorumtool: add sort options
+- cleanup after test-driver
+- be consistent in using CPPFLAGS vs CFLAGS
+- totemsrp: Fix typo with cont gather
+- cpg: Refactor mh_req_exec_cpg_procleave
+- cpg: Make sure nodid is always logged as hex num
+- cpg: Make sure left nodes are really removed
+- mon: Make mon compilable with libstatgrab ver 0.9
+- mon: Fix comparsion typo
+- mon: Pass correct pointer to inst
+- mon: Make monitoring work
+- config: Handle totem_set_volatile_defaults errors
+- config: Allow dynamic change of token_coefficient
+- Log: Make reload of logging work
+- Really clear totemconfig nodes on reload
+- Add token_coefficient option
+- init: Make init script configurable
+- totemiba: Fix incorrect failed log message
+- logsys: Log error if blackbox cannot be created
+- logsys: Log warning if flightrecorder init fails
+- Introduce get_run_dir function
+- Move ringid store and load from totem library
+- coroparse: More strict numbers parsing
+- Doc: Enhance INSTALL file a bit
+- Make config.reload_in_progress key read only
+- Fix compiler warning introduced by previous patch
+- totemconfig: Free ifaddrs list
+- totemconfig: Make sure join timeout is less than consensus
+- totemconfig: Key change process dependencies
+- totemconfig: Log errors on key change and reload
+- totemconfig: totem_config_get_ip_version
+- totemconfig: refactor nodelist_to_interface func
+- corosync-keygen: Replace printf/exit call with err
+- votequorum: Add cmap key to reset wait_for_all
+- votequorum: Return current ring id in callback
+- votequorum: Add ring id to poll call
+- votequorum: Do not process events during reload
+- votequorum: Block sync until qdevice poll
+- votequorum: Make qdev timeout in sync configurable
+- votequorum: Properly initialize atb and atb_string
+- ipc: Process votequorum messages during sync
+- testvotequorum2: Opt for polling with old ringid
+- TODO: Remove TODO file
+- Makefile: Do not install TODO file
+- totem: Inform RRP about membership changes
+- totemnet: Add totemnet_member_set_active
+- totemrrp: Implement *_membership_changed
+- totemudpu: Implement member_set_active
+- totemudpu: Send msgs to all members occasionally
+- Cancel token holding while in retransmition
+- upstart: Make job conf file configurable
+- systemd: Config example for corosync wd service
+- Install doc: Correct a typo
+- init: change return value when starting corosync
+- Free object allocated at quorum_register_callback
+- corosync-cmapctl: Allow -p option to delete keys
+- Implement config file testing mode
+- Slightly rework corosync-keygen.
+- totemiba: Add multicast recovery
+- Indent: Remove space in negation of expression
+- Indent: Remove newline before else branch start
+- fix memory leak produced by 'corosync -v'
+- Handle SIGSEGV and SIGABRT signals
+
+---

Old:

  bnc#867767-add-version.patch
  bnc#881142-fix-shm-leak.patch
  corosync-2.3.3.tar.gz
  corosync-cts-api-error.patch

New:

  corosync-2.3.4.tar.gz



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.NaB6ZM/_old  2014-09-10 17:02:15.0 +0200
+++ /var/tmp/diff_new_pack.NaB6ZM/_new  2014-09-10 17:02:15.0 +0200
@@ -44,17 +44,14 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:2.3.3
+Version:2.3.4
 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: bnc#867767-add-version.patch
-Patch4: bnc#872651-stop-cluster.patch
-Patch5: bnc#881142-fix-shm-leak.patch
-Patch6: bnc#882449-corosync-conf-example.patch
+Patch2: bnc#872651-stop-cluster.patch
+Patch3: 

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2014-07-10 14:54:54

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2014-04-15 
07:35:24.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2014-07-10 
14:54:55.0 +0200
@@ -0,0 +1,20 @@
+---
+Thu Jul  3 05:07:13 UTC 2014 - lzh...@suse.com
+
+- comment out line: to_logfile:no (bnc#882449) 
+   work on patch bnc#882449-corosync-conf-example.patch
+
+---
+Wed Jul  2 05:48:47 UTC 2014 - y...@suse.com
+
+- Fixed shared memory leak.
+   + bnc#881142-fix-shm-leak.patch
+
+---
+Fri Jun 13 03:13:13 UTC 2014 - lzh...@suse.com
+
+- Update corosync.conf.example and corosync.conf.example.udpu(bnc#882449) 
+   - remove corosync-conf-example.patch
+   + add bnc#882449-corosync-conf-example.patch
+
+---

Old:

  corosync-conf-example.patch

New:

  bnc#881142-fix-shm-leak.patch
  bnc#882449-corosync-conf-example.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.vlKPcp/_old  2014-07-10 14:54:56.0 +0200
+++ /var/tmp/diff_new_pack.vlKPcp/_new  2014-07-10 14:54:56.0 +0200
@@ -51,9 +51,10 @@
 Source2:baselibs.conf
 Patch1: corosync-init-lockfile-path-error.patch
 Patch2: corosync-cts-api-error.patch
-Patch3: corosync-conf-example.patch
-Patch4: bnc#867767-add-version.patch
-Patch5: bnc#872651-stop-cluster.patch
+Patch3: bnc#867767-add-version.patch
+Patch4: bnc#872651-stop-cluster.patch
+Patch5: bnc#881142-fix-shm-leak.patch
+Patch6: bnc#882449-corosync-conf-example.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
 # provide openais on purpose, the package has been deleted.
@@ -103,6 +104,7 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1

++ bnc#881142-fix-shm-leak.patch ++
Index: corosync-2.3.3/exec/main.c
===
--- corosync-2.3.3.orig/exec/main.c
+++ corosync-2.3.3/exec/main.c
@@ -1107,6 +1107,7 @@ int main (int argc, char **argv, char **
case 'v':
printf (Corosync Cluster Engine, version 
'%s'\n, VERSION);
printf (Copyright (c) 2006-2009 Red Hat, 
Inc.\n);
+   logsys_system_fini();
return EXIT_SUCCESS;
 
break;
@@ -1117,6 +1118,7 @@ int main (int argc, char **argv, char **
-p : Does nothing.\n\
-r : Set round robin 
realtime scheduling \n\
-v : Display version and 
SVN revision of Corosync and exit.\n);
+   logsys_system_fini();
return EXIT_FAILURE;
}
}
@@ -1254,6 +1256,10 @@ int main (int argc, char **argv, char **
qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
SIGINT, NULL, sig_exit_handler, NULL);
qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
+   SIGSEGV, NULL, sigsegv_handler, NULL);
+   qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
+   SIGABRT, NULL, sigabrt_handler, NULL);
+   qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
SIGQUIT, NULL, sig_exit_handler, NULL);
qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH,
SIGTERM, NULL, sig_exit_handler, NULL);
++ bnc#882449-corosync-conf-example.patch ++
Index: corosync-2.3.3/conf/corosync.conf.example
===
--- corosync-2.3.3.orig/conf/corosync.conf.example
+++ corosync-2.3.3/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.
+   

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2014-04-15 07:35:23

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2014-03-18 
16:21:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2014-04-15 
07:35:24.0 +0200
@@ -0,0 +1,6 @@
+Fri Apr 11 06:50:17 UTC 2014 - lzh...@suse.com
+
+- Fix `systemctl stop pacemaker` leaves corosync running
+   + bnc#872651-stop-cluster.patch 
+- Ensure that libopenais3 is removed on update of corosync(bnc#872122)
+

New:

  bnc#872651-stop-cluster.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.J7TX4w/_old  2014-04-15 07:35:25.0 +0200
+++ /var/tmp/diff_new_pack.J7TX4w/_new  2014-04-15 07:35:25.0 +0200
@@ -53,8 +53,9 @@
 Patch2: corosync-cts-api-error.patch
 Patch3: corosync-conf-example.patch
 Patch4: bnc#867767-add-version.patch
+Patch5: bnc#872651-stop-cluster.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
-# openais is indeed gone and should be uninstalled. No, we do not
+# openais is indeed gone and should be uninstalled. Yes, we do not
 # provide openais on purpose, the package has been deleted.
 Obsoletes:  openais
 Conflicts:  openais
@@ -63,7 +64,6 @@
 #Requires(pre): /usr/sbin/useradd
 #Requires(post): /sbin/chkconfig
 #Requires(preun): /sbin/chkconfig
-#Conflicts:  openais = 0.89, openais-devel = 0.89
 
 BuildRequires:  libqb-devel
 BuildRequires:  mozilla-nss
@@ -102,6 +102,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1
@@ -154,15 +155,6 @@
 mkdir -p -m 0700 %{buildroot}/%{_sysconfdir}/dbus-1/system.d
 install -m 644 %{_builddir}/%{name}-%{version}/conf/corosync-signals.conf 
%{buildroot}/%{_sysconfdir}/dbus-1/system.d/corosync-signals.conf
 %endif
-# removed to discourage use of init.d/corosync (openais should be
-# used instead)
-#%if 0%{?suse_version}
-#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
 %if %{with_systemd}
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccorosync
 %endif
@@ -311,6 +303,9 @@
 %package -n libcorosync4
 Summary:The Corosync Cluster Engine Libraries
 Group:  Productivity/Clustering/HA
+# openais is indeed gone and should be uninstalled. Yes, we do not
+# provide openais on purpose, the package has been deleted.
+Obsoletes:  libopenais3
 #Requires:   %{name} = %{version}-%{release}
 
 %description -n libcorosync4

++ bnc#872651-stop-cluster.patch ++
Index: corosync-2.3.3/init/corosync.service.in
===
--- corosync-2.3.3.orig/init/corosync.service.in
+++ corosync-2.3.3/init/corosync.service.in
@@ -3,6 +3,7 @@ Description=Corosync Cluster Engine
 ConditionKernelCommandLine=!nocluster
 Requires=network-online.target
 After=network-online.target
+StopWhenUnneeded=yes
 
 [Service]
 ExecStart=@INITWRAPPERSDIR@/corosync start
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2014-03-18 16:21:23

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2014-01-30 
14:54:25.0 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2014-03-18 
16:21:35.0 +0100
@@ -1,0 +2,7 @@
+Wed Mar 12 08:41:21 UTC 2014 - lzh...@suse.com
+
+- Modify spec file:add symlink rccorosync to /usr/sbin/service (bnc#866057) 
+- Fix corosync -v show UNKNOW (bnc#867767) 
+   + bnc#867767-add-version.patch
+
+---

New:

  bnc#867767-add-version.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.q1Fxx8/_old  2014-03-18 16:21:37.0 +0100
+++ /var/tmp/diff_new_pack.q1Fxx8/_new  2014-03-18 16:21:37.0 +0100
@@ -52,6 +52,7 @@
 Patch1: corosync-init-lockfile-path-error.patch
 Patch2: corosync-cts-api-error.patch
 Patch3: corosync-conf-example.patch
+Patch4: bnc#867767-add-version.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.
@@ -100,6 +101,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1
@@ -161,6 +163,9 @@
 #rm -f %{buildroot}%{_initrddir}/corosync-notifyd
 #rm -f %{buildroot}/usr/sbin/corosync-notifyd
 #rm -f %{buildroot}/usr/share/man/man8/corosync-notifyd.8
+%if %{with_systemd}
+ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rccorosync
+%endif
 ## tree fixup
 # drop static libs
 rm -f %{buildroot}%{_libdir}/*.a
@@ -227,6 +232,9 @@
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
 %{_sbindir}/corosync-notifyd
+%if %{with_systemd}

 
+%{_sbindir}/rccorosync
+%endif
 %{_bindir}/corosync-blackbox
 %if %{with xmlconf}
 %{_bindir}/corosync-xmlproc

++ bnc#867767-add-version.patch ++
Index: corosync-2.3.3/.tarball-version
===
--- /dev/null
+++ corosync-2.3.3/.tarball-version
@@ -0,0 +1 @@
+2.3.3
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2014-01-30 14:54:24

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2014-01-07 
16:15:31.0 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2014-01-30 
14:54:25.0 +0100
@@ -1,0 +2,22 @@
+Tue Jan 21 07:48:22 UTC 2014 - x...@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 - x...@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 
+
+---
@@ -13 +35 @@
-- Upsteam version cs: 7014f10123a634cf026491edc9a09d6044106116
+- Upstream version cs: 7014f10123a634cf026491edc9a09d6044106116

Old:

  corosync-2.3.2.tar.gz

New:

  corosync-2.3.3.tar.gz
  corosync-conf-example.patch
  corosync-cts-api-error.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.EceRDm/_old  2014-01-30 14:54:26.0 +0100
+++ /var/tmp/diff_new_pack.EceRDm/_new  2014-01-30 14:54:26.0 +0100
@@ -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 @@
 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 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 #%if 0%{?buildtrunk} == 1

++ corosync-2.3.2.tar.gz - corosync-2.3.3.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/corosync-2.3.2/exec/cmap.c 
new/corosync-2.3.3/exec/cmap.c
--- old/corosync-2.3.2/exec/cmap.c  2013-11-26 15:39:34.0 +0100
+++ new/corosync-2.3.3/exec/cmap.c  2014-01-14 11:24:31.0 +0100
@@ -597,8 +597,8 @@
struct res_lib_cmap_iter_next res_lib_cmap_iter_next;
cs_error_t ret;
icmap_iter_t *iter;
-   size_t value_len;
-   icmap_value_types_t type;
+   size_t value_len = 0;
+   icmap_value_types_t type = 0;
const char *res = NULL;
struct cmap_conn_info *conn_info = (struct cmap_conn_info 
*)api-ipc_private_data_get (conn);
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/corosync-2.3.2/exec/coroparse.c 
new/corosync-2.3.3/exec/coroparse.c
--- old/corosync-2.3.2/exec/coroparse.c 2013-11-26 15:39:34.0 +0100
+++ new/corosync-2.3.3/exec/coroparse.c 2014-01-14 11:24:31.0 +0100
@@ -507,6 +507,7 @@
}
 
if ((strcmp(path, quorum.two_node) == 0) ||
+   (strcmp(path, quorum.expected_votes_tracking) == 
0) ||
(strcmp(path, quorum.allow_downscale) == 0) ||
(strcmp(path, quorum.wait_for_all) == 0) ||
(strcmp(path, quorum.auto_tie_breaker) == 0) ||
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/corosync-2.3.2/exec/main.c 
new/corosync-2.3.3/exec/main.c
--- old/corosync-2.3.2/exec/main.c  2013-11-26 15:39:34.0 +0100
+++ new/corosync-2.3.3/exec/main.c  

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2014-01-07 16:15:29

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2013-12-05 
06:51:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2014-01-07 
16:15:31.0 +0100
@@ -1,0 +2,14 @@
+Thu Dec 12 06:35:17 UTC 2013 - x...@suse.com
+
+- Update to corosync 2.3.2 
+- cfgtool: return error on reload failure
+- man pages: Note that votequorum's allow_downscale is unsupported
+- logsys: Make logging of totem work again
+- totemsrp: Show English message when memb_state_gather_enter is called
+- totemiba: Check if configured MTU is allowed by HW
+- totemiba: Fix parameters position for poll_add
+- totemiba: Del channel fd from poll before destroy
+- totemiba: Properly allocate RDMA buffers
+- Upsteam version cs: 7014f10123a634cf026491edc9a09d6044106116
+
+---

Old:

  corosync-2.3.1.tar.gz

New:

  corosync-2.3.2.tar.gz



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.8BjKbf/_old  2014-01-07 16:15:31.0 +0100
+++ /var/tmp/diff_new_pack.8BjKbf/_new  2014-01-07 16:15:32.0 +0100
@@ -44,7 +44,7 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:2.3.1
+Version:2.3.2
 Release:0
 Url:http://www.corosync.org
 Source0:%{name}-%{version}.tar.gz

++ corosync-2.3.1.tar.gz - corosync-2.3.2.tar.gz ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/corosync-2.3.1/exec/logsys.c 
new/corosync-2.3.2/exec/logsys.c
--- old/corosync-2.3.1/exec/logsys.c2013-09-12 17:10:35.0 +0200
+++ new/corosync-2.3.2/exec/logsys.c2013-11-26 15:39:34.0 +0100
@@ -301,39 +301,20 @@
(strlen(mainsystem) = LOGSYS_MAX_SUBSYS_NAMELEN)) {
return -1;
}
+
/*
 * Setup libqb as a subsys
 */
-   i = _logsys_subsys_create (QB, array.c);
+   i = _logsys_subsys_create (QB, 
array.c,log.c,log_syslog.c,log_blackbox.c,log_format.c,
+   
log_file.c,log_dcs.c,log_thread.c,ipc_shm.c,ipcs.c,ipc_us.c,loop.c,
+   
loop_poll_epoll.c,loop_job.c,loop_poll_poll.c,loop_poll_kqueue.c,
+   
loop_timerlist.c,loop_poll.c,ringbuffer.c,ringbuffer_helper.c,trie.c,
+   
map.c,skiplist.c,rpl_sem.c,hdb.c,unix.c,hashtable.c,strlcpy.c,ipc_socket.c,
+   strchrnul.c,ipc_setup.c,strlcat.c);
if (i  0) {
return -1;
}
 
-   _logsys_subsys_filename_add (i, log.c);
-   _logsys_subsys_filename_add (i, log_syslog.c);
-   _logsys_subsys_filename_add (i, log_blackbox.c);
-   _logsys_subsys_filename_add (i, log_format.c);
-   _logsys_subsys_filename_add (i, log_file.c);
-   _logsys_subsys_filename_add (i, log_dcs.c);
-   _logsys_subsys_filename_add (i, log_thread.c);
-   _logsys_subsys_filename_add (i, ipc_shm.c);
-   _logsys_subsys_filename_add (i, ipcs.c);
-   _logsys_subsys_filename_add (i, ipc_us.c);
-   _logsys_subsys_filename_add (i, loop.c);
-   _logsys_subsys_filename_add (i, loop_poll_epoll.c);
-   _logsys_subsys_filename_add (i, loop_job.c);
-   _logsys_subsys_filename_add (i, loop_poll_poll.c);
-   _logsys_subsys_filename_add (i, loop_poll_kqueue.c);
-   _logsys_subsys_filename_add (i, loop_timerlist.c);
-   _logsys_subsys_filename_add (i, loop_poll.c);
-   _logsys_subsys_filename_add (i, ringbuffer.c);
-   _logsys_subsys_filename_add (i, ringbuffer_helper.c);
-   _logsys_subsys_filename_add (i, trie.c);
-   _logsys_subsys_filename_add (i, map.c);
-   _logsys_subsys_filename_add (i, skiplist.c);
-   _logsys_subsys_filename_add (i, rpl_sem.c);
-   _logsys_subsys_filename_add (i, hdb.c);
-   _logsys_subsys_filename_add (i, unix.c);
/*
 * name clash
 * _logsys_subsys_filename_add (i, util.c);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/corosync-2.3.1/exec/main.c 
new/corosync-2.3.2/exec/main.c
--- old/corosync-2.3.1/exec/main.c  2013-09-12 17:10:35.0 +0200
+++ new/corosync-2.3.2/exec/main.c  2013-11-26 15:39:34.0 +0100
@@ -1218,7 +1218,10 @@
ip_version = totem_config.ip_version;
 
totem_config.totem_logging_configuration = 

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2013-12-05 06:51:12

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2013-09-25 
17:07:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2013-12-05 
06:51:13.0 +0100
@@ -1,0 +2,6 @@
+Fri Nov 29 21:49:07 UTC 2013 - l...@suse.com
+
+- Obsolete openais so that updates work automatically and uninstall the
+  openais package.
+
+---



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.MfVUDL/_old  2013-12-05 06:51:14.0 +0100
+++ /var/tmp/diff_new_pack.MfVUDL/_new  2013-12-05 06:51:14.0 +0100
@@ -51,6 +51,10 @@
 Source2:baselibs.conf
 Patch1: corosync-init-lockfile-path-error.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.
+Obsoletes:  openais
+Conflicts:  openais
 # Runtime bits
 Requires:   libcorosync4 = %{version}-%{release}
 #Requires(pre): /usr/sbin/useradd

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2013-09-25 17:07:37

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2013-05-27 
09:43:40.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2013-09-25 
17:07:38.0 +0200
@@ -1,0 +2,42 @@
+Fri Sep 13 03:26:31 UTC 2013 - x...@suse.com
+
+- Upstream version cs: c6688c6e11a35d13293f9b610faca5c7beb7e5cb 
+- Reload: document config.reload_in_progress in man page
+- Reload: Add atomic reload to log config
+- Reload: Add atomic reload to totemconfig
+- Reload: Add reload code to cfg
+- Reload: Make coroparse use a designated icmap hash table
+- icmap: Add func to test equality of two key values
+- [PATCH] Replace freopen with open/dup2 when daemonizing
+- Add log message to exit signal handler
+- icmap: Add map copy function
+- icmap: Add function to return item data pointer
+- icmap: Fix value len checking for strings
+- icmap: Add function to return global icmap
+- icmap: Allow multiple icmap instances
+- Fix scheduler pause-detection timeout 
+
+---
+Fri Sep  6 05:47:16 UTC 2013 - x...@suse.com
+
+- Update corosync-2.3.1.tar.gz for cts file missing 
+
+---
+Thu Jul 25 02:17:50 UTC 2013 - x...@suse.com
+
+- Fix corosync start failed issue
+  + corosync-init-lockfile-path-error.patch
+
+---
+Tue Jul 23 09:44:07 UTC 2013 - x...@suse.com
+
+- Update to corosync 2.3.1 stable release
+- Remove patches for all merged in the upstream or obsoleted 
+  - corosync-confexample-timestamp.patch
+  - corosync-cpg-procdown.patch
+  - corosync-revert-cs2429.patch
+  - corosync.conf.example.patch
+  - corosync_reduce_RR_priority.patch
+  - fix-nodeid-conflicting.patch
+
+---

Old:

  corosync-1.4.5.tar.gz
  corosync-confexample-timestamp.patch
  corosync-cpg-procdown.patch
  corosync-revert-cs2429.patch
  corosync.conf.example.patch
  corosync_reduce_RR_priority.patch
  fix-nodeid-conflicting.patch

New:

  corosync-2.3.1.tar.gz
  corosync-init-lockfile-path-error.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.qhA59R/_old  2013-09-25 17:07:40.0 +0200
+++ /var/tmp/diff_new_pack.qhA59R/_new  2013-09-25 17:07:40.0 +0200
@@ -16,6 +16,21 @@
 #
 
 
+# Conditionals
+# Invoke rpmbuild --without feature or rpmbuild --with feature
+# to disable or enable specific features
+%bcond_with testagents
+%define with_testagents1
+%bcond_with watchdog
+%bcond_with monitoring
+%bcond_with snmp
+%bcond_with rdma
+%define with_systemd 1
+%bcond_with upstart
+%bcond_with xmlconf
+%bcond_with runautogen
+%define with_runautogen 1
+
 %if 0%{?sles_version} == 11 
 %ifnarch s390 s390x 
 %define buildib 1
@@ -29,84 +44,132 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:1.4.5
+Version:2.3.1
 Release:0
 Url:http://www.corosync.org
-Source0:
http://build.clusterlabs.org/%{name}/releases/%{name}-%{version}.tar.gz
+Source0:%{name}-%{version}.tar.gz
 Source2:baselibs.conf
-Patch1: corosync-confexample-timestamp.patch
-Patch2: corosync-revert-cs2429.patch
-Patch4: corosync.conf.example.patch
-Patch5: corosync-cpg-procdown.patch
-Patch6: corosync_reduce_RR_priority.patch
-Patch7: fix-nodeid-conflicting.patch
+Patch1: corosync-init-lockfile-path-error.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # Runtime bits
 Requires:   libcorosync4 = %{version}-%{release}
-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 1
-%{?_with_buildtrunk: %define buildtrunk 1}
-%if 0%{?buildtrunk} == 1
+#Requires(pre): /usr/sbin/useradd
+#Requires(post): /sbin/chkconfig
+#Requires(preun): /sbin/chkconfig
+#Conflicts:  openais = 0.89, openais-devel = 0.89
+
+BuildRequires:  libqb-devel
+BuildRequires:  mozilla-nss
+BuildRequires:  mozilla-nss-devel
+%if %{with_runautogen}
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  libtool
 %endif
-BuildRequires:  mozilla-nss
-BuildRequires:  mozilla-nss-devel
-%if 

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2013-05-27 09:43:39

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2013-04-26 
13:25:11.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2013-05-27 
09:43:40.0 +0200
@@ -1,0 +2,36 @@
+Fri May 10 13:18:25 UTC 2013 - tser...@suse.com
+
+- Update to corosync 1.4.5 stable release (bnc#799031)
+- coroipc: Handle pfd.revents as bit-field
+- Check socket_recv error code in ipc_dispatch_get
+- On places with POLLERR check also POLLNVAL
+- coroipc: Don't spin when waiting on semaphore
+- log: Handle race in printf_to_logs and format_set
+- objdb: Don't read uninitialized memory in inc/dec
+- Add waiting_trans_ack also to fragmentation layer
+- Handle segfault in backlog_get
+- Fix problem with sync operations under very rare circumstances
+- manpages: Add confdb_key_get man page
+- manpages: Add links for referenced confdb calls
+- manpages: Fix typo in evs* manpages
+- If failed_to_recv is set, consensus can be empty
+- Ignore sync barrier msgs if sync doesn't started
+- Make service_build contain correct number of msgs
+- Handle sync and service unload correctly
+- Don't call sync_* funcs for unloaded services
+- Return back Totem is unable to form... message
+- Move Totem is unable to form... message to main
+- Use unix socket for local multicast loop
+- cpg: Enhance downlist selection algorithm
+- cpg: Process join list after downlists
+- cpg: Never choose downlist with localnode
+- Fix cpg_membership_get()
+- Don't access invalid mem in totemconfig
+- Move some totem and cpg messages to trace level
+- flatiron: Free outq items list on conn exit
+- Fix nodeid conflicting issue (bnc#806634)
+  + Added fix-nodeid-conflicting.patch
+- change the default priority to RR(1) same as pacemaker(bnc#804707)
+  + Added corosync_reduce_RR_priority.patch
+
+---

Old:

  corosync-1.4.3.tar.gz

New:

  corosync-1.4.5.tar.gz
  corosync_reduce_RR_priority.patch
  fix-nodeid-conflicting.patch



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.HgLFwW/_old  2013-05-27 09:43:41.0 +0200
+++ /var/tmp/diff_new_pack.HgLFwW/_new  2013-05-27 09:43:41.0 +0200
@@ -29,7 +29,7 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:1.4.3
+Version:1.4.5
 Release:0
 Url:http://www.corosync.org
 Source0:
http://build.clusterlabs.org/%{name}/releases/%{name}-%{version}.tar.gz
@@ -38,6 +38,8 @@
 Patch2: corosync-revert-cs2429.patch
 Patch4: corosync.conf.example.patch
 Patch5: corosync-cpg-procdown.patch
+Patch6: corosync_reduce_RR_priority.patch
+Patch7: fix-nodeid-conflicting.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-build
 # Runtime bits
 Requires:   libcorosync4 = %{version}-%{release}
@@ -65,6 +67,8 @@
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 %if 0%{?buildtrunk} == 1
@@ -144,6 +148,7 @@
 %{_libexecdir}/lcrso/vsf_ykd.lcrso
 %dir %{_localstatedir}/lib/corosync
 %dir %{_localstatedir}/log/cluster
+%{_mandir}/man8/confdb_keys.8*
 %{_mandir}/man8/corosync_overview.8*
 %{_mandir}/man8/corosync.8*
 %{_mandir}/man8/corosync-blackbox.8*

++ corosync-1.4.3.tar.gz - corosync-1.4.5.tar.gz ++
 13421 lines of diff (skipped)

++ corosync_reduce_RR_priority.patch ++
Index: corosync-1.4.4/exec/main.c
===
--- corosync-1.4.4.orig/exec/main.c
+++ corosync-1.4.4/exec/main.c
@@ -1268,7 +1268,8 @@ static void corosync_setscheduler (void)
 #if defined(HAVE_PTHREAD_SETSCHEDPARAM)  
defined(HAVE_SCHED_GET_PRIORITY_MAX)  defined(HAVE_SCHED_SETSCHEDULER)
int res;
 
-   sched_priority = sched_get_priority_max (SCHED_RR);
+   /*use the minimal priority same as pacemaker */
+   sched_priority = sched_get_priority_min (SCHED_RR);
if (sched_priority != -1) {
global_sched_param.sched_priority = sched_priority;
res = sched_setscheduler (0, SCHED_RR, global_sched_param);
++ fix-nodeid-conflicting.patch ++
Index: corosync-1.4.5/conf/corosync.conf.example
===
--- corosync-1.4.5.orig/conf/corosync.conf.example
+++ corosync-1.4.5/conf/corosync.conf.example
@@ -41,7 +41,10 

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2013-04-26 13:25:08

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync, Maintainer is jjzh...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2012-06-15 
19:39:02.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2013-04-26 
13:25:11.0 +0200
@@ -1,0 +2,6 @@
+Thu Mar 21 11:59:58 UTC 2013 - mmeis...@suse.com
+
+- Added url as source.
+  Please see http://en.opensuse.org/SourceUrls
+
+---

Old:

  corosync-1.4.3.tar.bz2

New:

  corosync-1.4.3.tar.gz



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.z0nmug/_old  2013-04-26 13:25:14.0 +0200
+++ /var/tmp/diff_new_pack.z0nmug/_new  2013-04-26 13:25:14.0 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package corosync
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -32,9 +32,7 @@
 Version:1.4.3
 Release:0
 Url:http://www.corosync.org
-# Source from tar.gz, recompressed to bz2.
-# 
ftp://ftp:downlo...@ftp.corosync.org/downloads/corosync-1.4.3/corosync-1.4.3.tar.gz
-Source0:%{name}-%{version}.tar.bz2
+Source0:
http://build.clusterlabs.org/%{name}/releases/%{name}-%{version}.tar.gz
 Source2:baselibs.conf
 Patch1: corosync-confexample-timestamp.patch
 Patch2: corosync-revert-cs2429.patch

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2012-06-15 19:38:53

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync, Maintainer is jjzh...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2012-02-16 
12:19:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2012-06-15 
19:39:02.0 +0200
@@ -1,0 +2,24 @@
+Fri Jun  8 07:46:10 UTC 2012 - tser...@suse.com
+
+- Update to corosync 1.4.3 stable release.
+- Add calls to missing object_find_destroy() to fix mem leaks
+- Free mem allocated by getaddrinfo
+- corosync.conf.example: change bindnetaddr, mcastaddr, add comments
+- Store error str if can't open logfile
+- Wait for corosync-notifyd exit in init script
+- iba: Use configured node id
+- Unlink shm buffers if init fails
+- Fix memory leaks when nss fails
+- Madvise NOSYNC flag only if available
+- Include net/if_var.h header only when needed
+- Include stdint.h because funcs uses int16_t
+- Use install instead of cp
+- Don't unlock mutex in different threads
+- Revert Use install instead of cp
+- Add support for per OS CP flags 
+- Remove cloned lines in main of main.c 
+- Fixed bug when corosync receive JoinMSG in OPERATIONAL state
+- Correct nodeid of token when we retransmit it
+- Correct nodeid in memb_state_commit_token_send function 
+
+---

Old:

  corosync-1.4.1.tar.bz2

New:

  corosync-1.4.3.tar.bz2



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.I5a3bk/_old  2012-06-15 19:39:04.0 +0200
+++ /var/tmp/diff_new_pack.I5a3bk/_new  2012-06-15 19:39:04.0 +0200
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %if 0%{?sles_version} == 11 
 %ifnarch s390 s390x 
 %define buildib 1
@@ -28,10 +29,12 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
-Version:1.4.1
+Version:1.4.3
 Release:0
 Url:http://www.corosync.org
-Source0:
http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.bz2
+# Source from tar.gz, recompressed to bz2.
+# 
ftp://ftp:downlo...@ftp.corosync.org/downloads/corosync-1.4.3/corosync-1.4.3.tar.gz
+Source0:%{name}-%{version}.tar.bz2
 Source2:baselibs.conf
 Patch1: corosync-confexample-timestamp.patch
 Patch2: corosync-revert-cs2429.patch
@@ -102,6 +105,9 @@
 # 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
@@ -112,6 +118,7 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE SECURITY
+%{_bindir}/corosync-blackbox
 %{_sbindir}/corosync
 %{_sbindir}/corosync-keygen
 %{_sbindir}/corosync-objctl
@@ -120,10 +127,9 @@
 %{_sbindir}/corosync-pload
 %{_sbindir}/corosync-cpgtool
 %{_sbindir}/corosync-quorumtool
-%{_bindir}/corosync-blackbox
 %dir %{_sysconfdir}/corosync
-%dir %{_sysconfdir}/corosync/uidgid.d
 %dir %{_sysconfdir}/corosync/service.d
+%dir %{_sysconfdir}/corosync/uidgid.d
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
 %config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
 %dir %{_libexecdir}/lcrso

++ corosync-1.4.1.tar.bz2 - corosync-1.4.3.tar.bz2 ++
 46265 lines of diff (skipped)

++ corosync-confexample-timestamp.patch ++
--- /var/tmp/diff_new_pack.I5a3bk/_old  2012-06-15 19:39:04.0 +0200
+++ /var/tmp/diff_new_pack.I5a3bk/_new  2012-06-15 19:39:04.0 +0200
@@ -1,11 +1,11 @@
-Index: corosync-1.4.1/conf/corosync.conf.example
+Index: corosync-1.4.3/conf/corosync.conf.example
 ===
 corosync-1.4.1.orig/conf/corosync.conf.example
-+++ corosync-1.4.1/conf/corosync.conf.example
-@@ -21,7 +21,7 @@ logging {
-   to_syslog: yes
-   logfile: /var/log/cluster/corosync.log
-   debug: off
+--- corosync-1.4.3.orig/conf/corosync.conf.example
 corosync-1.4.3/conf/corosync.conf.example
+@@ -69,7 +69,7 @@ logging {
+   # Log messages with time stamps. When in doubt, set to on
+   # (unless you are only logging to syslog, where double
+   # timestamps can be annoying).
 -  timestamp: on
 +  timestamp: off
logger_subsys {

++ corosync.conf.example.patch ++
--- 

commit corosync for openSUSE:Factory

[h_root]

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 jjzh...@suse.com

Changes:

--- /work/SRC/openSUSE:Factory/corosync/corosync.changes2011-09-23 
01:54:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.corosync.new/corosync.changes   2012-02-16 
12:19:13.0 +0100
@@ -1,0 +2,5 @@
+Sun Feb  5 11:44:40 UTC 2012 - jjzh...@suse.com
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.9EZYs6/_new  2012-02-16 12:19:15.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory 
checked in at 2011-12-06 18:04:14

Comparing /work/SRC/openSUSE:Factory/corosync (Old)
 and  /work/SRC/openSUSE:Factory/.corosync.new (New)


Package is corosync, Maintainer is jjzh...@suse.com

Changes:




Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.0A25ua/_old  2011-12-06 18:06:38.0 +0100
+++ /var/tmp/diff_new_pack.0A25ua/_new  2011-12-06 18:06:38.0 +0100
@@ -29,7 +29,7 @@
 Summary:The Corosync Cluster Engine and Application Programming 
Interfaces
 Version:1.4.1
 Release:0
-License:BSD3c
+License:BSD-3-Clause
 Group:  Productivity/Clustering/HA
 Url:http://www.corosync.org
 Source0:
http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.bz2
@@ -149,7 +149,7 @@
 %{_mandir}/man5/corosync.conf.5*
 
 %package -n libcorosync4
-License:BSD3c
+License:BSD-3-Clause
 Summary:The Corosync Cluster Engine Libraries
 Group:  Productivity/Clustering/HA
 Conflicts:  corosync  0.92-7
@@ -181,7 +181,7 @@
 %postun -n libcorosync4 -p /sbin/ldconfig
 
 %package -n libcorosync-devel
-License:BSD3c
+License:BSD-3-Clause
 Summary:The Corosync Cluster Engine Development Kit
 Group:  Productivity/Clustering/HA
 Requires:   libcorosync4 = %{version}-%{release}

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

commit corosync for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package corosync for openSUSE:Factory
checked in at Wed Sep 21 16:58:45 CEST 2011.




--- corosync/corosync.changes   2011-02-08 14:42:20.0 +0100
+++ /mounts/work_src_done/STABLE/corosync/corosync.changes  2011-09-20 
15:51:21.0 +0200
@@ -1,0 +2,57 @@
+Tue Sep 20 13:15:22 UTC 2011 - tser...@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#69)
+
+---
+Sat Sep 17 23:53:47 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Add baselibs configuration
+
+---

calling whatdependson for head-i586


Old:

  corosync-1.3.0.tar.gz
  corosync-trunk-reset-pause-timestamp-on-events.patch

New:

  baselibs.conf
  corosync-1.4.1.tar.bz2



Other differences:
--
++ corosync.spec ++
--- /var/tmp/diff_new_pack.eZARAO/_old  2011-09-21 16:58:39.0 +0200
+++ /var/tmp/diff_new_pack.eZARAO/_new  2011-09-21 16:58:39.0 +0200
@@ -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
-Release:1
+Version:1.4.1
+Release:0
 License:BSD3c
-Group:  System Environment/Base
-Url:http://www.openais.org
-Source0:
http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.gz
+Group:  Productivity/Clustering/HA
+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
-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(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