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.changes        2018-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 <[email protected]>
+
+-  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:         0001-coroapi-Use-size_t-for-private_data_size.patch
-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
-Patch14:        0007-add-config-for-corosync-qnetd.patch
-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
-Patch19:        0012-cpg-Inform-clients-about-left-nodes-during-pause.patch
+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
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # openais is indeed gone and should be uninstalled. Yes, we do not
@@ -142,22 +126,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
 
 %build
 %if %{with runautogen}

++++++ 0001-disable-build-html-docs.patch ++++++
--- corosync-2.4.5/configure.ac 2019-07-30 20:26:27.000000000 +0800
+++ corosync-2.4.5-new/configure.ac     2019-08-02 18:06:00.703167465 +0800
@@ -737,7 +737,7 @@
 AM_CONDITIONAL(AUGTOOL, test -n "${AUGTOOL}")
 AC_SUBST([NSS_LDFLAGS])
 
-AM_CONDITIONAL(BUILD_HTML_DOCS, test -n "${GROFF}")
+AM_CONDITIONAL(BUILD_HTML_DOCS, false)
 
 AC_SUBST([LINT_FLAGS])
 
++++++ 0006-Fix-compile-warnings-with-GCC-7.2.1.patch -> 
0002-Fix-compile-warnings-with-GCC-7.2.1.patch ++++++
--- 
/work/SRC/openSUSE:Factory/corosync/0006-Fix-compile-warnings-with-GCC-7.2.1.patch
  2018-04-22 14:34:42.327681006 +0200
+++ 
/work/SRC/openSUSE:Factory/.corosync.new.9556/0002-Fix-compile-warnings-with-GCC-7.2.1.patch
        2019-08-15 15:42:20.775210071 +0200
@@ -1,16 +1,6 @@
-//cpg_test_agent: Fix snprintf compiler warnings
----
- 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 (
+--- corosync-2.4.5/cts/agents/cpg_test_agent.c 2019-07-30 20:26:27.000000000 
+0800
++++ corosync-2.4.5-new/cts/agents/cpg_test_agent.c     2019-08-05 
13:42:47.494088257 +0800
+@@ -211,8 +211,8 @@
                if (record_config_events_g > 0) {
                        log_pt = malloc (sizeof(log_entry_t));
                        list_init (&log_pt->list);
@@ -21,7 +11,7 @@
                        list_add_tail(&log_pt->list, &config_chg_log_head);
                        qb_log (LOG_INFO, "cpg event %s", log_pt->log);
                }
-@@ -221,8 +221,8 @@ static void config_change_callback (
+@@ -221,8 +221,8 @@
                if (record_config_events_g > 0) {
                        log_pt = malloc (sizeof(log_entry_t));
                        list_init (&log_pt->list);
@@ -32,6 +22,3 @@
                        list_add_tail (&log_pt->list, &config_chg_log_head);
                        qb_log (LOG_INFO, "cpg event %s", log_pt->log);
                }
--- 
-2.13.6
-

++++++ bsc#1083561-upgrade-from-1-x-y.patch ++++++
--- corosync-2.4.5/init/upgrade.sh      1970-01-01 08:00:00.000000000 +0800
+++ corosync-2.4.5-new/init/upgrade.sh  2019-08-02 17:15:38.224559371 +0800
@@ -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
++++++ corosync-2.4.4.tar.gz -> corosync-2.4.5.tar.gz ++++++
++++ 91187 lines of diff (skipped)


Reply via email to