diff --git a/numactl-2.0.4-rc2.tar.bz2 b/numactl-2.0.4-rc2.tar.bz2 index eeb89a4..304ca91 100644 --- a/numactl-2.0.4-rc2.tar.bz2 +++ b/numactl-2.0.4-rc2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc6f9630b58c56cfbe62f157d37be7c9c76d3bd7f1f6884d2af7b5f663a5b812 -size 78062 +oid sha256:2f4881223fb43a4c88eb761c3b171d41974e17fa3d141477b26260288db1d502 +size 66616 diff --git a/numactl.changes b/numactl.changes index 6acd286..c3c908c 100644 --- a/numactl.changes +++ b/numactl.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 9 09:32:15 UTC 2010 - trenn@novell.com + +- Fixed corrupt tar.bz2 and added a mem corruption fix from Jan. + ------------------------------------------------------------------- Thu May 20 12:07:19 UTC 2010 - trenn@novell.com diff --git a/numactl.spec b/numactl.spec index 3e7c959..98d2f1a 100644 --- a/numactl.spec +++ b/numactl.spec @@ -34,6 +34,7 @@ Obsoletes: numactl-64bit Source: numactl-%{origversion}.tar.bz2 Source2: baselibs.conf Patch0: numactl_install_all_manpages +Patch1: numactl_fix_mem_corrup_numa_init.patch Group: System/Management BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ia64 x86_64 ppc64 ppc %sparc @@ -88,6 +89,7 @@ Authors: %prep %setup -n %{name}-%{origversion} %patch0 -p1 +%patch1 -p1 %build make %{?jobs:-j%jobs} CFLAGS="${RPM_OPT_FLAGS}" diff --git a/numactl_fix_mem_corrup_numa_init.patch b/numactl_fix_mem_corrup_numa_init.patch new file mode 100644 index 0000000..21cf8cf --- /dev/null +++ b/numactl_fix_mem_corrup_numa_init.patch @@ -0,0 +1,28 @@ +From: Jan Beulich + +--- + libnuma.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +Index: numactl-2.0.4-rc2/libnuma.c +=================================================================== +--- numactl-2.0.4-rc2.orig/libnuma.c ++++ numactl-2.0.4-rc2/libnuma.c +@@ -461,10 +461,13 @@ set_task_constraints(void) + read_mask(mask, numa_all_nodes_ptr); + } + if (strncmp(buffer,"Mems_allowed_list:",18) == 0) { +- nodes_allowed_list = malloc(strlen(buffer)-18); +- strncpy(nodes_allowed_list, buffer + 19, +- strlen(buffer) - 19); +- nodes_allowed_list[strlen(nodes_allowed_list)-1] = '\0'; ++ size_t len = strlen(mask); ++ ++ nodes_allowed_list = malloc(len); ++ if (nodes_allowed_list) { ++ memcpy(nodes_allowed_list, mask, len-1); ++ nodes_allowed_list[len-1] = '\0'; ++ } + } + } + fclose(f);