rpms/numactl/F-11 numactl-2.0.3-rc3-distance_parsing.patch, NONE, 1.1 numactl-2.0.3-rc3-no-nodes-warning.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 numactl.spec, 1.57, 1.58 sources, 1.7, 1.8 numactl-1.0.2-alpha-syscall.patch, 1.1, NONE numactl-1.0.2-cpumask.patch, 1.1, NONE numactl-1.0.2-get_mempolicy-const.patch, 1.2, NONE numactl-2.0.2-clearcache-fix.patch, 1.1, NONE numactl-2.0.2-remove-warning.patch, 1.1, NONE

[Neil Horman]

Author: nhorman

Update of /cvs/extras/rpms/numactl/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7654

Modified Files:
	.cvsignore numactl.spec sources 
Added Files:
	numactl-2.0.3-rc3-distance_parsing.patch 
	numactl-2.0.3-rc3-no-nodes-warning.patch 
Removed Files:
	numactl-1.0.2-alpha-syscall.patch numactl-1.0.2-cpumask.patch 
	numactl-1.0.2-get_mempolicy-const.patch 
	numactl-2.0.2-clearcache-fix.patch 
	numactl-2.0.2-remove-warning.patch 
Log Message:
Resolves: bz 506795

numactl-2.0.3-rc3-distance_parsing.patch:

--- NEW FILE numactl-2.0.3-rc3-distance_parsing.patch ---
diff -up numactl-2.0.3-rc3/distance.c.orig numactl-2.0.3-rc3/distance.c
--- numactl-2.0.3-rc3/distance.c.orig	2009-05-08 10:10:06.000000000 -0400
+++ numactl-2.0.3-rc3/distance.c	2009-05-08 10:13:01.000000000 -0400
@@ -50,6 +50,7 @@ static int read_distance_table(void) 
 	int numnodes = 0; 
 	int *table = NULL; 
 	int err = -1;
+	int found_nodes = 0;
 	
 	for (nd = 0;; nd++) { 
 		char fn[100]; 
@@ -57,7 +58,7 @@ static int read_distance_table(void) 
 		sprintf(fn, "/sys/devices/system/node/node%d/distance", nd);
 		dfh = fopen(fn, "r"); 
 		if (!dfh) { 
-			if (errno == ENOENT && nd > 0)
+			if (errno == ENOENT)
 				err = 0;
 			if (!err && nd<numa_num_configured_nodes())
 				continue;
@@ -79,14 +80,15 @@ static int read_distance_table(void) 
 		} 
 
 		parse_numbers(line, table + nd * numnodes, numnodes);
+		found_nodes++;
 	}
 	free(line); 
-	if (err)  { 
+	if (!found_nodes)  { 
 		numa_warn(W_distance,
 			  "Cannot parse distance information in sysfs: %s",
 			  strerror(errno));
 		free(table); 
-		return err;
+		return -1;
 	}
 	/* Update the global table pointer.  Race window here with
 	   other threads, but in the worst case we leak one distance

numactl-2.0.3-rc3-no-nodes-warning.patch:

--- NEW FILE numactl-2.0.3-rc3-no-nodes-warning.patch ---
diff -up numactl-2.0.3-rc3/libnuma.c.orig numactl-2.0.3-rc3/libnuma.c
--- numactl-2.0.3-rc3/libnuma.c.orig	2009-06-17 13:13:28.000000000 -0400
+++ numactl-2.0.3-rc3/libnuma.c	2009-06-17 13:14:10.000000000 -0400
@@ -1209,9 +1209,10 @@ numa_node_to_cpus_v1(int node, unsigned 
 	sprintf(fn, "/sys/devices/system/node/node%d/cpumap", node);
 	f = fopen(fn, "r");
 	if (!f || getdelim(&line, &len, '\n', f) < 1) {
-		numa_warn(W_nosysfs2,
-		   "/sys not mounted or invalid. Assuming one node: %s",
-			  strerror(errno));
+		if (f)
+			numa_warn(W_nosysfs2,
+			   "/sys not mounted or invalid. Assuming one node: %s",
+				  strerror(errno));
 		bitmask.maskp = (unsigned long *)mask;
 		bitmask.size  = buflen_needed * 8;
 		numa_bitmask_setall(&bitmask);
@@ -1287,9 +1288,10 @@ numa_node_to_cpus_v2(int node, struct bi
 	sprintf(fn, "/sys/devices/system/node/node%d/cpumap", node); 
 	f = fopen(fn, "r"); 
 	if (!f || getdelim(&line, &len, '\n', f) < 1) { 
-		numa_warn(W_nosysfs2,
-		   "/sys not mounted or invalid. Assuming one node: %s",
-			  strerror(errno)); 
+		if (f)
+			numa_warn(W_nosysfs2,
+			   "/sys not mounted or invalid. Assuming one node: %s",
+				  strerror(errno)); 
 		numa_bitmask_setall(mask);
 		err = -1;
 	} 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numactl/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	29 Sep 2008 19:45:39 -0000	1.7
+++ .cvsignore	29 Jun 2009 16:46:07 -0000	1.8
@@ -1 +1,2 @@
 numactl-2.0.2.tar.gz
+numactl-2.0.3.tar.gz


Index: numactl.spec
===================================================================
RCS file: /cvs/extras/rpms/numactl/F-11/numactl.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- numactl.spec	25 Mar 2009 15:07:55 -0000	1.57
+++ numactl.spec	29 Jun 2009 16:46:08 -0000	1.58
@@ -1,15 +1,15 @@
 Name:		numactl
 Summary:	Library for tuning for Non Uniform Memory Access machines
-Version:	2.0.2
-Release:	4%{dist} 
+Version:	2.0.3
+Release:	1%{dist} 
 License:	LGPLv2/GPLv2
 Group: 		System Environment/Base
 URL:		ftp://oss.sgi.com/www/projects/libnuma/download
 Source0: 	ftp://oss.sgi.com/www/projects/libnuma/download/numactl-%{version}.tar.gz 
 Buildroot:	%{_tmppath}/%{name}-buildroot
 
-Patch0: numactl-2.0.2-clearcache-fix.patch
-Patch1: numactl-2.0.2-remove-warning.patch
+Patch0: numactl-2.0.3-rc3-distance_parsing.patch
+Patch1: numactl-2.0.3-rc3-no-nodes-warning.patch
 
 ExcludeArch: s390 s390x
 
@@ -32,7 +32,7 @@ Provides development headers for numa li
 %patch1 -p1
 
 %build
-make CFLAGS="$RPM_OPT_FLAGS -I. -fPIC"
+make CFLAGS="$RPM_OPT_FLAGS -I."
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,7 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/memhog
 %{_bindir}/migspeed
 %{_bindir}/migratepages
-%{_mandir}/man5/*.5*
 %{_mandir}/man8/*.8*
 
 %files devel
@@ -74,6 +73,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Jun 29 2009 Neil Horman <nhorman at redhat.com> - 2.0.3-1
+- Update to latest upstream version
+
 * Wed Mar 25 2009 Mark McLoughlin <markmc at redhat.com> - 2.0.2-4
 - Remove warning from libnuma (bz 484552)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numactl/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	29 Sep 2008 19:45:39 -0000	1.7
+++ sources	29 Jun 2009 16:46:08 -0000	1.8
@@ -1 +1 @@
-82fe5bba94368850c8f5ffd0752b500b  numactl-2.0.2.tar.gz
+8e4fb249e5f719c25d7f433964fb9220  numactl-2.0.3.tar.gz


--- numactl-1.0.2-alpha-syscall.patch DELETED ---


--- numactl-1.0.2-cpumask.patch DELETED ---


--- numactl-1.0.2-get_mempolicy-const.patch DELETED ---


--- numactl-2.0.2-clearcache-fix.patch DELETED ---


--- numactl-2.0.2-remove-warning.patch DELETED ---