rpms/procps/FC-4 procps-3.2.5-sysctl-writeonly.patch, 1.1, 1.2 procps.spec, 1.39, 1.40

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/procps/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17264

Modified Files:
	procps-3.2.5-sysctl-writeonly.patch procps.spec 
Log Message:
- improved sysctl-writeonly patch by patch from bz#162881

procps-3.2.5-sysctl-writeonly.patch:
 sysctl.c |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

Index: procps-3.2.5-sysctl-writeonly.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-4/procps-3.2.5-sysctl-writeonly.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.5-sysctl-writeonly.patch	26 Apr 2005 09:53:43 -0000	1.1
+++ procps-3.2.5-sysctl-writeonly.patch	11 Jul 2005 08:06:41 -0000	1.2
@@ -1,5 +1,5 @@
---- procps-3.2.5/sysctl.c.writeonly	2005-04-26 10:20:57.617343016 +0200
-+++ procps-3.2.5/sysctl.c	2005-04-26 10:34:26.545367264 +0200
+--- procps-3.2.5/sysctl.c.writeonly	2005-01-05 22:00:47.000000000 +0100
++++ procps-3.2.5/sysctl.c	2005-07-11 10:05:12.000000000 +0200
 @@ -127,7 +127,8 @@
     char *restrict tmpname;
     char *restrict outname;
@@ -25,3 +25,13 @@
  
     if (!fp) {
        switch(errno) {
+@@ -158,6 +165,9 @@
+          fprintf(stderr, ERR_PERMISSION_DENIED, outname);
+          rc = -1;
+          break;
++      case EINVAL:  /* fopen()/stat() invalid argument */
++      case ENOTTY:  /* inappropriate ioctl for device */
++	 break;
+       default:
+          fprintf(stderr, ERR_UNKNOWN_READING, strerror(errno), outname);
+          rc = -1;


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-4/procps.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- procps.spec	8 Jul 2005 10:05:48 -0000	1.39
+++ procps.spec	11 Jul 2005 08:06:41 -0000	1.40
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.5
-Release: 6.2
+Release: 6.3
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -100,6 +100,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Jul 11 2005 Karel Zak <kzak at redhat.com> 3.2.5-6.3
+- imporoved procps-3.2.5-sysctl-writeonly.patch
+
 * Fri Jul  8 2005 Karel Zak <kzak at redhat.com> 3.2.5-6.2
 - fix #161449 - "top" ignores user and system toprc
 - fix #161559 - top segfaults when resizing konsole