rpms/sysstat/devel sysstat-9.0.6-nfs.patch, NONE, 1.1 sysstat.spec, 1.74, 1.75
Ivana Varekova
varekova at fedoraproject.org
Fri Dec 11 10:41:10 UTC 2009
- Previous message (by thread): rpms/hunspell-dsb/devel .cvsignore, 1.2, 1.3 hunspell-dsb.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/ppp/F-12 .cvsignore, 1.7, 1.8 ppp-2.4.2-pppoatm-make.patch, 1.2, 1.3 ppp-2.4.3-fix.patch, 1.1, 1.2 ppp-2.4.3-fix64.patch, 1.1, 1.2 ppp-2.4.3-make.patch, 1.1, 1.2 ppp-2.4.4-lib64.patch, 1.2, 1.3 ppp-2.4.4-no_strip.patch, 1.1, 1.2 ppp.spec, 1.51, 1.52 sources, 1.7, 1.8 ppp-2.4.1-pkgcheck.patch, 1.1, NONE ppp-2.4.2-bpf.patch, 1.1, NONE ppp-2.4.2-fix.patch, 1.1, NONE ppp-2.4.2-fix64.patch, 1.1, NONE ppp-2.4.2-lib64.patch, 1.1, NONE ppp-2.4.2-make.patch, 1.2, NONE ppp-2.4.2-no_strip.patch, 1.1, NONE ppp-2.4.2-pcap.patch, 1.1, NONE ppp-2.4.2-pppoatm-mtu.patch, 1.1, NONE ppp-2.4.2-pppoatm.patch, 1.3, NONE ppp-2.4.2-signal.patch, 1.1, NONE ppp-2.4.4-bogus_dns_addr.patch, 1.1, NONE ppp-2.4.4-closelog.patch, 1.1, NONE ppp-2.4.4-new_speeds.patch, 1.1, NONE ppp-2.4.4-response_len.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: varekova
Update of /cvs/pkgs/rpms/sysstat/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9295
Modified Files:
sysstat.spec
Added Files:
sysstat-9.0.6-nfs.patch
Log Message:
- fix the problem in get_nfs_mount_nr function
( iostat -n causes stack smashing)
sysstat-9.0.6-nfs.patch:
common.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
--- NEW FILE sysstat-9.0.6-nfs.patch ---
diff -up sysstat-9.0.6/common.c.pom sysstat-9.0.6/common.c
--- sysstat-9.0.6/common.c.pom 2009-09-12 20:59:04.000000000 +0200
+++ sysstat-9.0.6/common.c 2009-12-11 11:20:41.000000000 +0100
@@ -275,7 +275,6 @@ int get_nfs_mount_nr(void)
{
FILE *fp;
char line[8192];
- char type_name[10];
unsigned int nfs = 0;
if ((fp = fopen(NFSMOUNTSTATS, "r")) == NULL)
@@ -285,12 +284,9 @@ int get_nfs_mount_nr(void)
while (fgets(line, 8192, fp) != NULL) {
if ((strstr(line, "mounted")) && (strstr(line, "on")) &&
- (strstr(line, "with")) && (strstr(line, "fstype"))) {
-
- sscanf(strstr(line, "fstype") + 6, "%10s", type_name);
- if ((!strncmp(type_name, "nfs", 3)) && (strncmp(type_name, "nfsd", 4))) {
- nfs ++;
- }
+ (strstr(line, "with fstype nfs")) &&
+ !(strstr(line, "with fstype nfsd"))) {
+ nfs++;
}
}
Index: sysstat.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sysstat/devel/sysstat.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- sysstat.spec 2 Dec 2009 07:46:45 -0000 1.74
+++ sysstat.spec 11 Dec 2009 10:41:10 -0000 1.75
@@ -1,12 +1,13 @@
Name: sysstat
Version: 9.0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The sar and iostat system monitoring commands
License: GPLv2+
Group: Applications/System
URL: http://perso.orange.fr/sebastien.godard/
Source: http://perso.orange.fr/sebastien.godard/%{name}-%{version}.tar.bz2
Patch0: sysstat-9.0.4-init_script.patch
+Patch1: sysstat-9.0.6-nfs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -23,6 +24,7 @@ activity.
%prep
%setup -q
%patch0 -p1 -b .ii
+%patch1 -p1 -b .nfs
iconv -f windows-1252 -t utf8 CREDITS > CREDITS.aux
mv CREDITS.aux CREDITS
@@ -74,6 +76,10 @@ rm -rf %{buildroot}
%{_localstatedir}/log/sa
%changelog
+* Fri Dec 11 2009 Ivana Hutarova Varekova <varekova at redhat.com> - 9.0.6-2
+- fix the problem in get_nfs_mount_nr function
+ ( iostat -n causes stack smashing)
+
* Wed Dec 2 2009 Ivana Hutarva Varekova <varekova at redhat.com> - 9.0.6-1
- update to 9.0.6
- Previous message (by thread): rpms/hunspell-dsb/devel .cvsignore, 1.2, 1.3 hunspell-dsb.spec, 1.2, 1.3 sources, 1.2, 1.3
- Next message (by thread): rpms/ppp/F-12 .cvsignore, 1.7, 1.8 ppp-2.4.2-pppoatm-make.patch, 1.2, 1.3 ppp-2.4.3-fix.patch, 1.1, 1.2 ppp-2.4.3-fix64.patch, 1.1, 1.2 ppp-2.4.3-make.patch, 1.1, 1.2 ppp-2.4.4-lib64.patch, 1.2, 1.3 ppp-2.4.4-no_strip.patch, 1.1, 1.2 ppp.spec, 1.51, 1.52 sources, 1.7, 1.8 ppp-2.4.1-pkgcheck.patch, 1.1, NONE ppp-2.4.2-bpf.patch, 1.1, NONE ppp-2.4.2-fix.patch, 1.1, NONE ppp-2.4.2-fix64.patch, 1.1, NONE ppp-2.4.2-lib64.patch, 1.1, NONE ppp-2.4.2-make.patch, 1.2, NONE ppp-2.4.2-no_strip.patch, 1.1, NONE ppp-2.4.2-pcap.patch, 1.1, NONE ppp-2.4.2-pppoatm-mtu.patch, 1.1, NONE ppp-2.4.2-pppoatm.patch, 1.3, NONE ppp-2.4.2-signal.patch, 1.1, NONE ppp-2.4.4-bogus_dns_addr.patch, 1.1, NONE ppp-2.4.4-closelog.patch, 1.1, NONE ppp-2.4.4-new_speeds.patch, 1.1, NONE ppp-2.4.4-response_len.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list