diff --git a/0003-fix-the-using-of-the-uninitialized-value.patch b/0001-fix-the-using-of-the-uninitialized-value.patch similarity index 100% rename from 0003-fix-the-using-of-the-uninitialized-value.patch rename to 0001-fix-the-using-of-the-uninitialized-value.patch diff --git a/0001-libnuma-Fix-unexpected-output.patch b/0001-libnuma-Fix-unexpected-output.patch deleted file mode 100644 index 1cd1794399acf25c63c34eb1b19a249ab89da2fe..0000000000000000000000000000000000000000 --- a/0001-libnuma-Fix-unexpected-output.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e763e8c86d9f10761a75c2be8510a79f25d63831 Mon Sep 17 00:00:00 2001 -From: Chunsheng Luo -Date: Thu, 25 Jan 2024 23:54:56 +0800 -Subject: [PATCH] libnuma: Fix unexpected output - -When errno is 0, numa_error(__FILE__) will print "xx: Success", -which is not as expected - -Signed-off-by: Chunsheng Luo -Reported-by: Ajay Panyala - -Conflict: NA -Reference:https://github.com/numactl/numactl/commit/e763e8c86d9f10761a75c2be8510a79f25d63831 ---- - libnuma.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/libnuma.c b/libnuma.c -index 8b07ab0..e898297 100644 ---- a/libnuma.c -+++ b/libnuma.c -@@ -1882,8 +1882,10 @@ static struct bitmask *__numa_preferred(void) - policy != MPOL_BIND) - return bmp; - -- if (numa_bitmask_weight(bmp) > 1) -+ if (numa_bitmask_weight(bmp) > 1) { -+ errno = EINVAL; - numa_error(__FILE__); -+ } - - return bmp; - } -@@ -1903,8 +1905,11 @@ int numa_preferred(void) - static void __numa_set_preferred(struct bitmask *bmp) - { - int nodes = numa_bitmask_weight(bmp); -- if (nodes > 1) -+ if (nodes > 1) { -+ errno = EINVAL; - numa_error(__FILE__); -+ } -+ - setpol(nodes ? MPOL_PREFERRED : MPOL_LOCAL, bmp); - } - --- -2.27.0 - diff --git a/0002-libnuma-Fix-incorrect-print-and-exit-of-numa_preferr.patch b/0002-libnuma-Fix-incorrect-print-and-exit-of-numa_preferr.patch deleted file mode 100644 index 1468697b1bfb8230ae6de3fbbc546066a6d2a295..0000000000000000000000000000000000000000 --- a/0002-libnuma-Fix-incorrect-print-and-exit-of-numa_preferr.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 00dd4c32240694ae8619ed5445e4ffbc463f8eb0 Mon Sep 17 00:00:00 2001 -From: Chunsheng Luo -Date: Fri, 26 Jan 2024 00:30:13 +0800 -Subject: [PATCH] libnuma: Fix incorrect print and exit of numa_preferred/_many - APIs - -Only when policy is preferred, numa_bitmask_weight will be judged, -because mbind and preferred_many support multiple nodes. - -fixes: 87c6834("libnuma: Convert preferred node into a mask") - -Signed-off-by: Chunsheng Luo - -Conflict: NA -Reference: https://github.com/numactl/numactl/commit/00dd4c32240694ae8619ed5445e4ffbc463f8eb0 ---- - libnuma.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libnuma.c b/libnuma.c -index e898297..ef93558 100644 ---- a/libnuma.c -+++ b/libnuma.c -@@ -1882,7 +1882,7 @@ static struct bitmask *__numa_preferred(void) - policy != MPOL_BIND) - return bmp; - -- if (numa_bitmask_weight(bmp) > 1) { -+ if (policy == MPOL_PREFERRED && numa_bitmask_weight(bmp) > 1) { - errno = EINVAL; - numa_error(__FILE__); - } --- -2.27.0 - diff --git a/numactl-2.0.17.tar.gz b/numactl-2.0.17.tar.gz deleted file mode 100644 index fb235c12cb63e3e09ae5b80ab2407f98b18b00be..0000000000000000000000000000000000000000 Binary files a/numactl-2.0.17.tar.gz and /dev/null differ diff --git a/numactl-2.0.18.tar.gz b/numactl-2.0.18.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..04ba6094bdeca8384e38753b9081d4997d8bd256 Binary files /dev/null and b/numactl-2.0.18.tar.gz differ diff --git a/numactl.spec b/numactl.spec index b194d0a3e7e085f9f9f01578469637e01cce9e7e..ad836975fc641f3cb9665abef58bdb0d64275b58 100644 --- a/numactl.spec +++ b/numactl.spec @@ -1,15 +1,13 @@ Name: numactl -Version: 2.0.17 -Release: 3 +Version: 2.0.18 +Release: 1 Summary: Library for tuning for Non Uniform Memory Access machines License: GPLv2 URL: https://github.com/numactl/numactl Source0: https://github.com/numactl/numactl/releases/download/v%{version}/numactl-%{version}.tar.gz BuildRequires: libtool automake autoconf -Patch0001: 0001-libnuma-Fix-unexpected-output.patch -Patch0002: 0002-libnuma-Fix-incorrect-print-and-exit-of-numa_preferr.patch -Patch0003: 0003-fix-the-using-of-the-uninitialized-value.patch +Patch0001: 0001-fix-the-using-of-the-uninitialized-value.patch %description Simple NUMA policy support. It consists of a numactl program to run other @@ -78,6 +76,13 @@ LD_LIBRARY_PATH=$(pwd)/.libs make check %{_mandir}/man3/*.3* %changelog +* Wed Aug 14 2024 wangxiaomeng - 2.0.18-1 +- Upgrade to version 2.0.18 + - numastat: Print package version number instead of own. + - Fix CodeQl Warn: Wrong type of arguments to formatting function + - libnuma: add numa_set_mempolicy_home_node API + - man pages: fix table include preprocessor + * Wed May 22 2024 zhangyaqi - 2.0.17-3 - numademo: Fix the using of the uninitialized value