rpms/sysstat/devel sysstat-8.0.4-cpu.patch, NONE, 1.1 sysstat.spec, 1.63, 1.64

[Ivana Varekova (varekova)]

Author: varekova

Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24656

Modified Files:
	sysstat.spec 
Added Files:
	sysstat-8.0.4-cpu.patch 
Log Message:
- Resolves: #442801 mpstat shows one extra cpu
  thanks Chris Wright


sysstat-8.0.4-cpu.patch:

--- NEW FILE sysstat-8.0.4-cpu.patch ---
diff -up sysstat-8.0.4/common.c.pom sysstat-8.0.4/common.c
--- sysstat-8.0.4/common.c.pom	2008-01-01 10:26:31.000000000 +0100
+++ sysstat-8.0.4/common.c	2008-04-23 10:23:46.000000000 +0200
@@ -129,6 +129,9 @@ int get_sys_cpu_nr(void)
    while ((drd = readdir(dir)) != NULL) {
 
       if (!strncmp(drd->d_name, "cpu", 3)) {
+	 /* filter out entries like cpuidle/ */
+	 if (!isdigit(drd->d_name[3]))
+	    continue;
 	 snprintf(line, MAX_PF_NAME, "%s/%s", SYSFS_DEVCPU, drd->d_name);
 	 line[MAX_PF_NAME - 1] = '\0';
 	 if (stat(line, &buf) < 0)


Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sysstat.spec	6 Mar 2008 11:34:34 -0000	1.63
+++ sysstat.spec	23 Apr 2008 08:53:48 -0000	1.64
@@ -1,6 +1,6 @@
 Name: sysstat
 Version: 8.0.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: The sar and iostat system monitoring commands
 License: GPLv2+
 Group: Applications/System
@@ -8,6 +8,7 @@
 Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2
 Patch0: sysstat-8.0.4-write.patch
 Patch1: sysstat-8.0.4-nfs_ext.patch
+Patch2: sysstat-8.0.4-cpu.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
@@ -25,6 +26,7 @@
 %setup -q
 %patch -p1 -b .ret
 %patch1 -p1 -b .nfse
+%patch2 -p1 -b .cpu
 iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
 mv CREDITS.aux CREDITS
 
@@ -76,6 +78,10 @@
 %{_localstatedir}/log/sa
 
 %changelog
+* Wed Apr 23 2008 Ivana Varekova <varekova at redhat.com> - 8.0.4-4 
+- Resolves: #442801 mpstat shows one extra cpu
+  thanks Chris Wright
+
 * Thu Mar  6 2008 Ivana Varekova <varekova at redhat.com> - 8.0.4-3
 - add nfs extended statistic to iostat command