diff --git a/sysstat-8.0.4-cpu.patch b/sysstat-8.0.4-cpu.patch new file mode 100644 index 0000000..9ee1737 --- /dev/null +++ b/sysstat-8.0.4-cpu.patch @@ -0,0 +1,13 @@ +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) diff --git a/sysstat.spec b/sysstat.spec index 7696eef..2e6d2fd 100644 --- a/sysstat.spec +++ b/sysstat.spec @@ -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 @@ URL: http://perso.orange.fr/sebastien.godard/ 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 @@ activity. %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 @@ rm -rf %{buildroot} %{_localstatedir}/log/sa %changelog +* Wed Apr 23 2008 Ivana Varekova - 8.0.4-4 +- Resolves: #442801 mpstat shows one extra cpu + thanks Chris Wright + * Thu Mar 6 2008 Ivana Varekova - 8.0.4-3 - add nfs extended statistic to iostat command