Accepting request 1329427 from network:ha-clustering:Factory

OBS-URL: https://build.opensuse.org/request/show/1329427
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/drbd-utils?expand=0&rev=71

bsc-1233273-1252991_drbd.ocf-update-for-OCF-1.1.patch

@@ -1,7 +1,7 @@
 From 8c53c6777e4336f1d4e50279dc539ed70aa04f33 Mon Sep 17 00:00:00 2001
 From: Su Yue <glass.su@suse.com>
 Date: Sun, 7 Jul 2024 16:52:18 +0800
-Subject: [PATCH] update for OCF 1.1
+Subject: [PATCH] drbd.ocf: update for OCF 1.1
 
 According to [1], the commit
 1. bumps drbd ocf version to 1.5

bsc-1256961_drbdmon-remove-unused-variables-to-fix-gcc16-errors.patch

@@ -0,0 +1,54 @@
+From e826915c83bf93cb13aebf0ff61477787ccbf55b Mon Sep 17 00:00:00 2001
+From: Su Yue <glass.su@suse.com>
+Date: Tue, 27 Jan 2026 12:41:06 +0800
+Subject: [PATCH] drbdmon: remove unused variables to fix gcc16 errors
+
+drbd-utils doesn't build with GCC 16:
+
+[   38s] terminal/MDspTaskDetail.cpp: In member function virtual void MDspTaskDetail::display_content():
+[   38s] terminal/MDspTaskDetail.cpp:263:22: error: variable skip_ctr set but not used [-Werror=unused-but-set-variable=]
+[   38s]   263 |             uint32_t skip_ctr = 0;
+[   38s]       |                      ^~~~~~~~
+[   38s] terminal/MDspTaskDetail.cpp:277:22: error: variable print_ctr set but not used [-Werror=unused-but-set-variable=]
+[   38s]   277 |             uint32_t print_ctr = 0;
+[   38s]       |                      ^~~~~~~~~
+[   38s] cc1plus: all warnings being treated as errors
+
+Starting with GCC 16, var pre/postincrements and var @= expr no longer count as uses at some warning levels.
+
+skip_ctr and print_ctr are set but not used so remove them to fix errors.
+
+Signed-off-by: Su Yue <glass.su@suse.com>
+---
+ user/drbdmon/terminal/MDspTaskDetail.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/user/drbdmon/terminal/MDspTaskDetail.cpp b/user/drbdmon/terminal/MDspTaskDetail.cpp
+index bab08eae6775..edfcf981f7a2 100644
+--- a/user/drbdmon/terminal/MDspTaskDetail.cpp
++++ b/user/drbdmon/terminal/MDspTaskDetail.cpp
+@@ -260,10 +260,8 @@ void MDspTaskDetail::display_content()
+             uint32_t page_ctr = 1;
+             uint32_t page_line_ctr = first_page_lines;
+             format_text.restart();
+-            uint32_t skip_ctr = 0;
+             while (page_ctr < page_nr && format_text.skip_line())
+             {
+-                ++skip_ctr;
+                 ++page_line_ctr;
+                 if (page_line_ctr >= lines_per_page)
+                 {
+@@ -274,10 +272,8 @@ void MDspTaskDetail::display_content()
+ 
+             std::string line;
+             uint32_t line_ctr = page_nr == 1 ? line_offset : 0;
+-            uint32_t print_ctr = 0;
+             while (format_text.next_line(line, dsp_comp_hub.active_color_table->rst) && line_ctr < lines_per_page)
+             {
+-                ++print_ctr;
+                 dsp_comp_hub.dsp_io->cursor_xy(1, current_line);
+                 dsp_comp_hub.dsp_io->write_text(line.c_str());
+                 ++current_line;
+-- 
+2.50.1 (Apple Git-155)
+

drbd-utils.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Jan 27 04:52:30 UTC 2026 - Glass Su <glass.su@suse.com>
+
+- Package drbd-utils doesn't build with GCC 16 (bsc#1256961)
+  * Add patch
+    + bsc-1256961_drbdmon-remove-unused-variables-to-fix-gcc16-errors.patch
+
+-------------------------------------------------------------------
+Tue Jan 13 11:47:08 UTC 2026 - heming zhao <heming.zhao@suse.com>
+
+- drbd-selinux: change arch from x86_64 to noarch
+  * Update drbd-utils.spec:  add "BuildArch: noarch"
+
+-------------------------------------------------------------------
+Thu Nov 19 08:32:12 UTC 2025 - Zdenek Kubala <zkubala@suse.com>
+
+- Update SELinux module dir as macro to allow root path move from /var/lib/selinux
+  to /etc/selinux (bsc#1221342)
+
 -------------------------------------------------------------------
 Tue Nov 18 08:43:39 UTC 2025 - Glass Su <glass.su@suse.com>
 

drbd-utils.spec

@@ -1,6 +1,7 @@
 #
 # spec file for package drbd-utils
 #
+# Copyright (c) 2026 SUSE LLC
 # Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
@@ -75,6 +76,7 @@ Patch1007:      bsc-1233273-1252991_drbd.ocf-update-for-OCF-1.1.patch
 Patch1008:      rpmlint-build-error.patch
 Patch1009:      bsc-1247534_drbd-didnt-start-due-to-drbd_rules-returning-err.patch
 Patch1010:      1252991-selinux-domtrans-from-kernel.patch
+Patch1011:      bsc-1256961_drbdmon-remove-unused-variables-to-fix-gcc16-errors.patch
 #############################################
 
 Provides:       drbd-bash-completion = %{version}
@@ -170,6 +172,7 @@ rm -rf %{buildroot}%{libdir}/drbd/crm-*fence-peer.sh     # bsc#1204276
 
 %package -n drbd-selinux
 Summary:        SElinux policy for DRBD
+BuildArch:      noarch
 BuildRequires:  checkpolicy
 BuildRequires:  selinux-policy
 BuildRequires:  selinux-policy-%{selinuxtype}
@@ -183,7 +186,7 @@ drbd-selinux contains the SELinux policy meant to be used with this version of D
 
 %files -n drbd-selinux
 %attr(0644,root,root) %{_datadir}/selinux/packages/%{selinuxmodulename}.pp.bz2
-%ghost %{_sharedstatedir}/selinux/%{selinuxtype}/active/modules/200/%{selinuxmodulename}
+%ghost %{_selinux_store_path}/%{selinuxtype}/active/modules/200/%{selinuxmodulename}
 
 %pre -n drbd-selinux
 %selinux_relabel_pre -s %{selinuxtype}