Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package drbd-utils for openSUSE:Factory
checked in at 2023-09-07 21:13:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/drbd-utils (Old)
and /work/SRC/openSUSE:Factory/.drbd-utils.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "drbd-utils"
Thu Sep 7 21:13:07 2023 rev:57 rq:1109378 version:9.25.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/drbd-utils/drbd-utils.changes 2023-05-31
21:55:18.737294363 +0200
+++ /work/SRC/openSUSE:Factory/.drbd-utils.new.1766/drbd-utils.changes
2023-09-07 21:14:16.508595810 +0200
@@ -1,0 +2,71 @@
+Mon Aug 28 12:40:00 UTC 2023 - Heming Zhao <heming.z...@suse.com>
+
+- Update to 9.25.0 (PED-5842)
+ * drbdsetup,v9,show: fix meta disk format for json
+ * drbdmeta: {hex,}dump superblock
+ * drbdmon: major rewrite
+ * build: gcc v12 cleanups
+ * misc: put locks into separate dir
+ * selinux: add fowner fsetsid, they dropped a global noaudit rule
+ * v9: Support user-defined block-size
+ * doc,v9: improvements all over the place
+ * drbdadm,v9: implement drbdadm role <res:peer>
+ * drbdadm,v9: pass --verbose/--statistics to drbdsetup status
+ * drbd{adm,meta}: add repair-md subcommand
+ * drbdadm,v9,resync-after: fix too strict check
+ * drbdadm,v9,floating: fixup fake uname for 9.2.x strict_names=1
+ * drbdadm,v9,parser: fixup globs, also rm GNU libc specific extensions
+ * drbdadm,v9,parser: allow via outside-address for NATed peers
+ * parser,v9: deprecate named connections
+ * drbd-selinux: add sub package, minor packaging/spec changes
+ * drbdadm: allow files from expanded glob to vanish
+ * drbdadm,v9: fix potential segfault in postparse
+ * drbdadm,v9: fix sh-ip when set on connection/path
+ * drbdmeta: fix apply-al for bitmap sizes > 4GiB
+ * drbd-service-shim.sh: add secondary --force
+ * ocf: fix for dropped --peer option
+ * drbdsetup,v9: show susupend reason in json output
+ * drbdsetup,v9: add secondary --force
+ * drbdsetup,v9: fix *susp_str() for events2 diff mode
+ * drdbdadm,v9: fix sh-resource
+ * drdbdadm,v9: rm --peer=connect_to_host
+ * ocf: deal with situation where PM node name and actual node name do not
+ match
+ * notify.sh: deal with unset DRBD_PEER env variable
+ * crm-fence-peer: fix timeout with Pacemaker 2.0.5
+ * drbdmeta: don't wait for confirmation if not a TTY
+ * drbdadm,v9: Pass '--force' to certain drbdmeta commands
+ * drbdmeta: do init in chunks; allow different methods
+ * build: various minor fixes (udev detection, POSIX,
+ compiler flags, allow doc building with asciidoctor,...)
+ * drbd.ocf: fix type (relevant for certain pcs versions)
+ * crm-fence-peer: fix timeout with Pacemaker 2.1
+ * v9,proxy: allow multiple sharing a proxy node
+ * v9,drbdsetup: quote resource name in "show"
+ * build: allow building for RHEL9.0, minor cleanups
+ * reactor/systemd: allow proper actions (e.g., reboot) if
+ demotion fails.
+
+- introduce new systemd service:
+ drbd-demote-or-escalate@.service
+
+- remove v83 v84 binaries (incompatible with kmp)
+
+- drop patches which are already included in latest code:
+ - 0001-crm-fence-peer-fix-timeout-with-Pacemaker-2.1-milli-.patch
+ - 0002-crm-fence-peer-fix-timeout-with-Pacemaker-2.0.5-mill.patch
+
+- add upstream patch:
+ + 0001-drbdadm-v9-do-not-segfault-when-re-configuring-proxy.patch
+ + 0002-user-drbrdmon-add-missing-stdint.h-includes.patch
+ + 0003-Introduce-default_types.h-header.patch
+
+- change patch name:
+ - 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
+ + bsc-1032142_Disable-quorum-in-default-configuration.patch
+
+- rebase patch:
+ + pie-fix.patch
+ + rpmlint-build-error.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
0001-crm-fence-peer-fix-timeout-with-Pacemaker-2.1-milli-.patch
0002-crm-fence-peer-fix-timeout-with-Pacemaker-2.0.5-mill.patch
drbd-utils-9.19.0.tar.gz
New:
----
0001-drbdadm-v9-do-not-segfault-when-re-configuring-proxy.patch
0002-user-drbrdmon-add-missing-stdint.h-includes.patch
0003-Introduce-default_types.h-header.patch
bsc-1032142_Disable-quorum-in-default-configuration.patch
drbd-utils-9.25.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ drbd-utils.spec ++++++
--- /var/tmp/diff_new_pack.R3VZFS/_old 2023-09-07 21:14:18.248658014 +0200
+++ /var/tmp/diff_new_pack.R3VZFS/_new 2023-09-07 21:14:18.252658156 +0200
@@ -16,7 +16,7 @@
#
-%define services drbd.service drbd-lvchange@.service drbd-promote@.service
drbd-reconfigure-suspend-or-error@.service drbd-services@.target
drbd-wait-promotable@.service drbd@.service drbd@.target ocf.ra@.service
+%define services drbd.service drbd-lvchange@.service drbd-promote@.service
drbd-demote-or-escalate@.service drbd-reconfigure-suspend-or-error@.service
drbd-services@.target drbd-wait-promotable@.service drbd@.service drbd@.target
ocf.ra@.service
%if 0%{?suse_version} < 1550
# for SLEs
%define sbindir /sbin
@@ -32,26 +32,30 @@
# Only need po4a to build man from git source code
%bcond_without prebuiltman
Name: drbd-utils
-Version: 9.19.0
+Version: 9.25.0
Release: 0
Summary: Distributed Replicated Block Device
License: GPL-2.0-or-later
Group: Productivity/Clustering/HA
URL:
https://linbit.com/linbit-software-download-page-for-linstor-and-drbd-linux-driver/
-# tarball might be available at
https://pkg.linbit.com/downloads/drbd/utils/drbd-utils-%{name}.tar.gz
-Source: %{name}-%{version}.tar.gz
+Source:
https://pkg.linbit.com//downloads/drbd/utils/%{name}-%{version}.tar.gz
Source100: %{name}.rpmlintrc
-# PATCH-MISSING-TAG -- See
http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines
-Patch1: init-script-fixes.diff
-Patch2: usrmerge_move_lib_to_prefix_lib.patch
-Patch3: fence-after-pacemaker-down.patch
-# PATCH-SUSE-FIX: Disable quorum in default configuration (bsc#1032142)
-Patch4: 0001-Disable-quorum-in-default-configuration-bsc-1032142.patch
-Patch5: move_fencing_from_disk_to_net_in_example.patch
-Patch6: pie-fix.patch
-Patch7: 0001-crm-fence-peer-fix-timeout-with-Pacemaker-2.1-milli-.patch
-Patch8: 0002-crm-fence-peer-fix-timeout-with-Pacemaker-2.0.5-mill.patch
-Patch99: rpmlint-build-error.patch
+
+#############################################
+# Upstream patches
+Patch0001: 0001-drbdadm-v9-do-not-segfault-when-re-configuring-proxy.patch
+Patch0002: 0002-user-drbrdmon-add-missing-stdint.h-includes.patch
+Patch0003: 0003-Introduce-default_types.h-header.patch
+
+# SUSE specific patches
+Patch1001: init-script-fixes.diff
+Patch1002: usrmerge_move_lib_to_prefix_lib.patch
+Patch1003: fence-after-pacemaker-down.patch
+Patch1004: bsc-1032142_Disable-quorum-in-default-configuration.patch
+Patch1005: move_fencing_from_disk_to_net_in_example.patch
+Patch1006: pie-fix.patch
+Patch1099: rpmlint-build-error.patch
+#############################################
Provides: drbd-bash-completion = %{version}
Provides: drbd-pacemaker = %{version}
@@ -59,7 +63,7 @@
Obsoletes: drbd-bash-completion < %{version}
Obsoletes: drbd-pacemaker < %{version}
Obsoletes: drbd-udev < %{version}
-# drbd-utils first splict from drbd-8.4.5(only driver)
+# drbd-utils first split from drbd-8.4.5(only driver)
# and suse let drbd driver goes in-kernel
# Provides: drbd = 8.4.5
# Obsoletes: drbd < 8.4.5
@@ -96,15 +100,16 @@
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch99 -p1
+%patch0001 -p1
+%patch0002 -p1
+%patch0003 -p1
+%patch1001 -p1
+%patch1002 -p1
+%patch1003 -p1
+%patch1004 -p1
+%patch1005 -p1
+%patch1006 -p1
+%patch1099 -p1
%build
export WANT_DRBD_REPRODUCIBLE_BUILD=1
@@ -133,7 +138,9 @@
--exec_prefix=%{_prefix}/lib \
%{?with_drbdmon: --with-drbdmon} \
%{?with_prebuiltman: --with-prebuiltman} \
- --with-tmpfilesdir=%{_tmpfilesdir}
+ --with-tmpfilesdir=%{_tmpfilesdir} \
+ --without-83support \
+ --without-84support
%make_build OPTFLAGS="%{optflags}"
@@ -225,6 +232,7 @@
%{_unitdir}/drbd.service
%{_unitdir}/drbd-lvchange@.service
%{_unitdir}/drbd-promote@.service
+%{_unitdir}/drbd-demote-or-escalate@.service
%{_unitdir}/drbd-reconfigure-suspend-or-error@.service
%{_unitdir}/drbd-services@.target
%{_unitdir}/drbd-wait-promotable@.service
++++++ 0001-drbdadm-v9-do-not-segfault-when-re-configuring-proxy.patch ++++++
>From e64b8b13435f99ba21a74caeebeb996f76dfd43c Mon Sep 17 00:00:00 2001
From: Joel Colledge <joel.colle...@linbit.com>
Date: Wed, 26 Jul 2023 10:14:54 +0200
Subject: [PATCH] drbdadm,v9: do not segfault when re-configuring proxy with no
path
This prevents a segfault when a resource has a connection with no path,
and "adjust" attempts to re-configure proxy.
This could occur as follows, when drbd-proxy-ctl is not on $PATH:
* Bring resource and connection up without proxy.
* Add proxy configuration to res file.
* "drbdadm adjust <res>" - this causes the existing path to be deleted,
but no new path is created because drbd-proxy-ctl cannot be executed.
* "drbdadm adjust <res>" - segfault.
---
user/v9/drbdadm_adjust.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/user/v9/drbdadm_adjust.c b/user/v9/drbdadm_adjust.c
index 83df624c4e46..f3d321b9ec65 100644
--- a/user/v9/drbdadm_adjust.c
+++ b/user/v9/drbdadm_adjust.c
@@ -390,7 +390,7 @@ static int proxy_reconf(const struct cfg_ctx *ctx, struct
connection *running_co
goto redo_whole_conn;
running_path = STAILQ_FIRST(&running_conn->paths); /* multiple paths
via proxy, later! */
- if (!running_path->my_proxy)
+ if (!running_path || !running_path->my_proxy)
goto redo_whole_conn;
if (running_path->proxy_conn_is_down)
--
2.35.3
++++++ 0002-user-drbrdmon-add-missing-stdint.h-includes.patch ++++++
>From feebd378195cf18b06f9fa209586af0c6d32ddb8 Mon Sep 17 00:00:00 2001
From: Sam James <s...@gentoo.org>
Date: Thu, 27 Jul 2023 06:30:25 +0100
Subject: [PATCH] user: drbrdmon: add missing <stdint.h> includes
GCC 13 drops some transitive includes within libstdc++.
Explicitly include <stdint.h> for uint32_t etc.
Note that using <stdint.h> deliberately because we're not using std::-prefixed
types.
Signed-off-by: Sam James <s...@gentoo.org>
---
user/drbdmon/DrbdMonConsts.h | 1 +
user/drbdmon/terminal/DisplayId.h | 1 +
2 files changed, 2 insertions(+)
diff --git a/user/drbdmon/DrbdMonConsts.h b/user/drbdmon/DrbdMonConsts.h
index 73d25f28fbeb..f962d0d38a6d 100644
--- a/user/drbdmon/DrbdMonConsts.h
+++ b/user/drbdmon/DrbdMonConsts.h
@@ -1,6 +1,7 @@
#ifndef DRBDMONCONSTS_H
#define DRBDMONCONSTS_H
+#include <stdint.h>
#include <string>
class DrbdMonConsts
diff --git a/user/drbdmon/terminal/DisplayId.h
b/user/drbdmon/terminal/DisplayId.h
index 40d3de488fd9..fa4b744438d4 100644
--- a/user/drbdmon/terminal/DisplayId.h
+++ b/user/drbdmon/terminal/DisplayId.h
@@ -1,6 +1,7 @@
#ifndef DISPLAYID_H
#define DISPLAYID_H
+#include <stdint.h>
#include <string>
class DisplayId
--
2.35.3
++++++ 0003-Introduce-default_types.h-header.patch ++++++
++++ 1694 lines (skipped)
++++++ bsc-1032142_Disable-quorum-in-default-configuration.patch ++++++
diff -Naur drbd-utils-9.0.0+git.98b6340c.orig/scripts/global_common.conf
drbd-utils-9.0.0+git.98b6340c/scripts/global_common.conf
--- drbd-utils-9.0.0+git.98b6340c.orig/scripts/global_common.conf
2017-06-07 16:04:14.063680274 +0800
+++ drbd-utils-9.0.0+git.98b6340c/scripts/global_common.conf 2017-06-07
16:04:45.519644428 +0800
@@ -42,6 +42,7 @@
# RECOMMENDED for three or more storage nodes with DRBD 9:
# quorum majority;
+ quorum off;
# on-no-quorum suspend-io | io-error;
}
++++++ drbd-utils-9.19.0.tar.gz -> drbd-utils-9.25.0.tar.gz ++++++
++++ 56802 lines of diff (skipped)
++++++ pie-fix.patch ++++++
--- /var/tmp/diff_new_pack.R3VZFS/_old 2023-09-07 21:14:18.604670740 +0200
+++ /var/tmp/diff_new_pack.R3VZFS/_new 2023-09-07 21:14:18.608670883 +0200
@@ -3,7 +3,7 @@
--- drbd-utils-9.14.0.orig/user/drbdmon/Makefile.in
+++ drbd-utils-9.14.0/user/drbdmon/Makefile.in
@@ -1,6 +1,7 @@
- CXXFLAGS=-std=c++11 -I. -I../shared -Icppdsaext/src -Wall -Werror
--pedantic-errors -fPIC -O2 \
+ CXXFLAGS=-std=c++11 -I. -I../shared -Icppdsaext/src -Wall -Werror
-pedantic-errors -fPIC -O2 \
-Wsign-compare -Wpointer-arith -Wswitch-default -Wswitch-enum -Wtype-limits \
--Wmissing-declarations -Wshadow
+-Wmissing-declarations -Wshadow \
++++++ rpmlint-build-error.patch ++++++
--- /var/tmp/diff_new_pack.R3VZFS/_old 2023-09-07 21:14:18.616671169 +0200
+++ /var/tmp/diff_new_pack.R3VZFS/_new 2023-09-07 21:14:18.620671312 +0200
@@ -45,26 +45,4 @@
! test -L $(DESTDIR)/sbin/rcdrbd || rm $(DESTDIR)/sbin/rcdrbd
.PHONY: install uninstall clean distclean
-diff -Naur drbd-utils-9.19.0.orig/user/v84/Makefile.in
drbd-utils-9.19.0/user/v84/Makefile.in
---- drbd-utils-9.19.0.orig/user/v84/Makefile.in 2021-10-11
18:44:02.918467657 +0800
-+++ drbd-utils-9.19.0/user/v84/Makefile.in 2021-10-13 11:39:05.662316197
+0800
-@@ -108,7 +108,6 @@
- install:
- ifeq ($(WITH_84_SUPPORT),yes)
- install -d $(DESTDIR)$(localstatedir)/lib/drbd
-- install -d $(DESTDIR)$(localstatedir)/run/drbd
- install -d $(DESTDIR)$(localstatedir)/lock
- install -d $(DESTDIR)/lib/drbd/
- if getent group haclient > /dev/null 2> /dev/null ; then \
-diff -Naur drbd-utils-9.19.0.orig/user/v9/Makefile.in
drbd-utils-9.19.0/user/v9/Makefile.in
---- drbd-utils-9.19.0.orig/user/v9/Makefile.in 2021-10-11 18:44:02.918467657
+0800
-+++ drbd-utils-9.19.0/user/v9/Makefile.in 2021-10-13 11:38:48.462390954
+0800
-@@ -143,7 +143,6 @@
- install:
- install -d $(DESTDIR)$(sbindir)
- install -d $(DESTDIR)$(localstatedir)/lib/drbd
-- install -d $(DESTDIR)$(localstatedir)/run/drbd
- install -d $(DESTDIR)$(localstatedir)/lock
- if getent group haclient > /dev/null 2> /dev/null ; then \
- install -g haclient -m 4750 drbdsetup $(DESTDIR)$(sbindir) ;
\
