From d10fbd1b7b8bb1b02dad88bceca7f00b2c84b865 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Tue, 22 Jul 2025 14:29:22 +0800 Subject: [PATCH] tests: fix build with cmocka 1.1.8 with adding missing includes (cherry picked from commit 1f4e1381c8fa6db3f9b266c6993b3e39d977d05c) --- 0025-add-missing-include-for-cmocka.patch | 21 +++++++++++++++++++++ multipath-tools.spec | 14 +++++++------- 2 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 0025-add-missing-include-for-cmocka.patch diff --git a/0025-add-missing-include-for-cmocka.patch b/0025-add-missing-include-for-cmocka.patch new file mode 100644 index 0000000..fe7b745 --- /dev/null +++ b/0025-add-missing-include-for-cmocka.patch @@ -0,0 +1,21 @@ +From 10e1010bfc7f683ddac6680f33491c6b59a1841f Mon Sep 17 00:00:00 2001 +From: Funda Wang +Date: Mon, 21 Jul 2025 11:26:08 +0800 +Subject: [PATCH] multipath-tools test: add missing include for stdint.h + +--- + tests/test-log.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test-log.c b/tests/test-log.c +index 635169994..4f6699568 100644 +--- a/tests/test-log.c ++++ b/tests/test-log.c +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include + #include + #include "log.h" diff --git a/multipath-tools.spec b/multipath-tools.spec index f6f820b..2f6a299 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: multipath-tools Version: 0.9.5 -Release: 10 +Release: 11 Summary: Tools to manage multipath devices with the device-mapper License: GPL-2.0-or-later and LGPL-2.0-only URL: http://christophe.varoqui.free.fr/ @@ -33,6 +33,7 @@ Patch21: 0021-multipath.conf.5-fix-the-description-of-prio_args-fo.patch Patch22: 0022-multipath-display-the-correct-configuration-when-dum.patch Patch23: 0023-multipathd-Stop-double-counting-map-failures-for-no_.patch Patch24: 0024-libmultipath-set-clear-handled-flag-only-in-coalesce.patch +Patch25: 0025-add-missing-include-for-cmocka.patch BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 @@ -40,9 +41,7 @@ BuildRequires: libselinux-devel, libsepol-devel, readline-devel, ncurses-deve BuildRequires: systemd-units, systemd-devel, json-c-devel, perl-interpreter, pkgconfig Requires: userspace-rcu, json-c, device-mapper >= 1.02.96 Requires: kpartx = %{version}-%{release}, libmount -Requires(post): systemd-units -Requires(preun): systemd-units -Requires(postun): systemd-units +%{?systemd_requires} Conflicts: mdadm < 4.1-rc2.0.2 Conflicts: udisks2 < 2.8.0-2 Provides: device-mapper-multipath @@ -117,9 +116,6 @@ rm -rf %{buildroot}/%{_initrddir} %check make test -%post -/sbin/ldconfig - %preun %systemd_preun multipathd.service @@ -187,6 +183,10 @@ fi %changelog +* Mon Jul 21 2025 Funda Wang - 0.9.5-11 +- tests: fix build with cmocka 1.1.8 with adding missing includes +- drop useless ldconfig + * Mon Jul 14 2025 wangxiao - 0.9.5-10 - delete macros in changelog -- Gitee