Hello community, here is the log from the commit of package drbd-utils for openSUSE:Factory checked in at 2019-09-23 12:37:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old) and /work/SRC/openSUSE:Factory/.drbd-utils.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils" Mon Sep 23 12:37:47 2019 rev:33 rq:732101 version:9.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2019-09-11 10:41:58.715203114 +0200 +++ /work/SRC/openSUSE:Factory/.drbd-utils.new.7948/drbd-utils.changes 2019-09-23 12:38:40.897597482 +0200 @@ -1,0 +2,6 @@ +Fri Sep 20 06:18:33 UTC 2019 - nick wang <[email protected]> + +- bsc#1145296, fix the wrong return code with cib_apply_diff + Add patch cibadmin-return-code-convert.patch + +------------------------------------------------------------------- New: ---- cibadmin-return-code-convert.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ drbd-utils.spec ++++++ --- /var/tmp/diff_new_pack.bQPz4U/_old 2019-09-23 12:38:41.313597414 +0200 +++ /var/tmp/diff_new_pack.bQPz4U/_new 2019-09-23 12:38:41.313597414 +0200 @@ -1,7 +1,7 @@ # # spec file for package drbd-utils # -# 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/ # @@ -25,7 +25,7 @@ Version: 9.10.0 Release: 0 Summary: Distributed Replicated Block Device -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Clustering/HA Url: http://www.drbd.org/ Source: http://www.linbit.com/downloads/drbd/utils/%{name}-%{version}.tar.gz @@ -40,6 +40,7 @@ # Bach port patch for kernel v5.2 Patch6: netlink-prepare-for-kernel-v5.2.patch Patch7: netlink-Add-NLA_F_NESTED-flag-to-nested-attribute.patch +Patch8: cibadmin-return-code-convert.patch Provides: drbd-bash-completion = %{version} Provides: drbd-pacemaker = %{version} @@ -66,8 +67,8 @@ BuildRequires: libxslt BuildRequires: make BuildRequires: pkgconfig -BuildRequires: pkgconfig(systemd) BuildRequires: udev +BuildRequires: pkgconfig(systemd) %if %{with drbdmon} BuildRequires: gcc-c++ %endif @@ -92,6 +93,7 @@ %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build export WANT_DRBD_REPRODUCIBLE_BUILD=1 ++++++ cibadmin-return-code-convert.patch ++++++ diff -Naur drbd-utils-9.6.0.orig/scripts/crm-fence-peer.9.sh drbd-utils-9.6.0/scripts/crm-fence-peer.9.sh --- drbd-utils-9.6.0.orig/scripts/crm-fence-peer.9.sh 2019-09-03 14:13:56.861585246 +0800 +++ drbd-utils-9.6.0/scripts/crm-fence-peer.9.sh 2019-09-03 14:17:42.478881632 +0800 @@ -146,7 +146,7 @@ break ;; - 205) : "205 aka pcmk_err_old_data ==> going to retry in a bit" + 103) : "103 CRM_EX_OLD, aka 205 pcmk_err_old_data in cib_apply_diff ==> going to retry in a bit" (( $SECONDS >= $timeout )) && break sleep 1 continue
