From eba6cf4accf05d41d9a7dcdf070fa986bca6f6fc Mon Sep 17 00:00:00 2001 From: wguanghao Date: Tue, 28 Nov 2023 19:19:05 +0800 Subject: [PATCH] fix build error --- ...fix-build-failure-caused-by-new-comp.patch | 28 +++++++++++++++++++ multipath-tools.spec | 6 +++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 0040-fix-build-failure-caused-by-new-comp.patch diff --git a/0040-fix-build-failure-caused-by-new-comp.patch b/0040-fix-build-failure-caused-by-new-comp.patch new file mode 100644 index 0000000..7af6907 --- /dev/null +++ b/0040-fix-build-failure-caused-by-new-comp.patch @@ -0,0 +1,28 @@ +From eb651847e8178eb2204da8b51ca2f928ccbdcbdc Mon Sep 17 00:00:00 2001 +From: wguanghao +Date: Tue, 28 Nov 2023 16:35:20 +0800 +Subject: [PATCH] fix build error + +Fix build failure caused by new compilation param. + +Signed-by-off Wu Guanghao +--- + libmultipath/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libmultipath/util.c b/libmultipath/util.c +index 2592cac..bbc2a06 100644 +--- a/libmultipath/util.c ++++ b/libmultipath/util.c +@@ -279,7 +279,7 @@ setup_thread_attr(pthread_attr_t *attr, size_t stacksize, int detached) + + ret = pthread_attr_init(attr); + assert(ret == 0); +- if (stacksize < PTHREAD_STACK_MIN) ++ if (stacksize < (unsigned long)PTHREAD_STACK_MIN) + stacksize = PTHREAD_STACK_MIN; + ret = pthread_attr_setstacksize(attr, stacksize); + assert(ret == 0); +-- +2.23.0 + diff --git a/multipath-tools.spec b/multipath-tools.spec index 8c45fb0..a4ceb95 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -2,7 +2,7 @@ Name: multipath-tools Version: 0.8.4 -Release: 18 +Release: 19 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/ @@ -49,6 +49,7 @@ Patch36: 0036-multipathd-make-all-cli_handlers-static.patch Patch37: 0037-multipathd-Fix-command-completion-in-interactive-mod.patch Patch38: 0038-multipathd-more-robust-command-parsing.patch Patch39: 0039-multipathd-Fixed-multipathd-parameter-invoking-seque.patch +Patch40: 0040-fix-build-failure-caused-by-new-comp.patch BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 @@ -196,6 +197,9 @@ fi %changelog +* Tue Nov 28 2023 wuguanghao - 0.8.4-19 +- fix build failure caused by new compliation parametes + * Mon Nov 28 2022 miaoguanqin - 0.8.4-18 - fix CVE-2022-41974 cause mpathpersist and multipathd execute error