From 117210913886c355c7892f98beefa176ef6227704975d0ba744e609c16543adc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez@opensuse.org>
Date: Sun, 3 Oct 2010 13:25:38 +0000
Subject: [PATCH] Accepting request 49677 from
 home:a_jaeger:branches:openSUSE:Factory

OBS-URL: https://build.opensuse.org/request/show/49677
OBS-URL: https://build.opensuse.org/package/show/Base:System/numactl?expand=0&rev=21
---
 numactl-2.0.4-rc2.tar.bz2              |  3 ---
 numactl-2.0.5.tar.bz2                  |  3 +++
 numactl.changes                        |  7 +++++++
 numactl.spec                           |  8 +++-----
 numactl_fix_mem_corrup_numa_init.patch | 28 --------------------------
 5 files changed, 13 insertions(+), 36 deletions(-)
 delete mode 100644 numactl-2.0.4-rc2.tar.bz2
 create mode 100644 numactl-2.0.5.tar.bz2
 delete mode 100644 numactl_fix_mem_corrup_numa_init.patch

diff --git a/numactl-2.0.4-rc2.tar.bz2 b/numactl-2.0.4-rc2.tar.bz2
deleted file mode 100644
index 304ca91..0000000
--- a/numactl-2.0.4-rc2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f4881223fb43a4c88eb761c3b171d41974e17fa3d141477b26260288db1d502
-size 66616
diff --git a/numactl-2.0.5.tar.bz2 b/numactl-2.0.5.tar.bz2
new file mode 100644
index 0000000..fb235b1
--- /dev/null
+++ b/numactl-2.0.5.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bd23b99026cc03cfb454ae7ff5ce270d46d675928d7a596de0b0d2292e4f9a09
+size 67085
diff --git a/numactl.changes b/numactl.changes
index a394bb9..d6b1216 100644
--- a/numactl.changes
+++ b/numactl.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sun Oct  3 07:47:48 UTC 2010 - aj@suse.de
+
+- Update to 2.0.5:
+  * Remove merged patch numactl_fix_mem_corrup_numa_init.patch
+  * Various bug fixes.
+
 -------------------------------------------------------------------
 Mon Jun 21 17:17:17 UTC 2010 - trenn@novell.com
 
diff --git a/numactl.spec b/numactl.spec
index a643d2e..4a30613 100644
--- a/numactl.spec
+++ b/numactl.spec
@@ -22,9 +22,9 @@ Url:            http://oss.sgi.com/projects/libnuma/
 Name:           numactl
 License:        GPLv2+
 Summary:        NUMA Policy Control
-Version:        2.0.4.rc2
+Version:        2.0.5
 Release:        1
-%define origversion 2.0.4-rc2
+%define origversion 2.0.5
 AutoReqProv:    on
 # bug437293
 %ifarch ppc64
@@ -34,7 +34,6 @@ 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
@@ -66,9 +65,8 @@ Control NUMA policy for individual processes. Offer libnuma for
 individual NUMA policy in applications.
 
 %prep
-%setup -n %{name}-%{origversion}
+%setup -q -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
deleted file mode 100644
index 21cf8cf..0000000
--- a/numactl_fix_mem_corrup_numa_init.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Jan Beulich <jbeulich@suse.de>
-
----
- 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);