rpms/procps/FC-6 procps-3.2.7-ps-plussort.patch, NONE, 1.1 procps-3.2.7-ps-stime.patch, 1.1, 1.2 procps.spec, 1.61, 1.62

[fedora-cvs-commits at redhat.com]

Author: tsmetana

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

Modified Files:
	procps-3.2.7-ps-stime.patch procps.spec 
Added Files:
	procps-3.2.7-ps-plussort.patch 
Log Message:
fix #208217 ps and + in sort

procps-3.2.7-ps-plussort.patch:
 sortformat.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE procps-3.2.7-ps-plussort.patch ---
--- procps-3.2.7/ps/sortformat.c.old	2007-05-04 10:39:58.000000000 +0200
+++ procps-3.2.7/ps/sortformat.c	2007-05-04 10:40:46.000000000 +0200
@@ -325,7 +325,7 @@
   if(*spec == '-'){
     reverse = 1;
     spec++;
-  }
+  }else if (*spec == '+') spec++;
   fs = search_format_array(spec);
   if(fs){
     sort_node *thisnode;

procps-3.2.7-ps-stime.patch:
 common.h |    1 +
 global.c |   20 ++++++++++++++++++--
 output.c |    2 --
 3 files changed, 19 insertions(+), 4 deletions(-)

Index: procps-3.2.7-ps-stime.patch
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-6/procps-3.2.7-ps-stime.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- procps-3.2.7-ps-stime.patch	26 Apr 2007 11:59:06 -0000	1.1
+++ procps-3.2.7-ps-stime.patch	4 May 2007 11:44:47 -0000	1.2
@@ -42,7 +42,7 @@
    set_personality();
 -  
 +  int fd;
-+  char *buf[BUFFSIZE];
++  char buf[BUFFSIZE];
 +  const char *b;
 +
 +  /* get boot time from /proc/stat */


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-6/procps.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- procps.spec	26 Apr 2007 11:59:06 -0000	1.61
+++ procps.spec	4 May 2007 11:44:47 -0000	1.62
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -54,6 +54,8 @@
 Patch25: procps-3.2.7-sysctl-tmpname.patch
 # 222251 - STIME can jitter by one second
 Patch26: procps-3.2.7-ps-stime.patch
+#208217 - command "ps jax --sort=uid,-ppid,+pid" fails
+Patch27: procps-3.2.7-ps-plussort.patch
 
 BuildRequires: ncurses-devel
 
@@ -105,6 +107,7 @@
 %patch24 -p1
 %patch25 -p1
 %patch26 -p1
+%patch27 -p1
 
 cp %SOURCE1 .
 
@@ -142,6 +145,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Fri May 04 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-10
+- fix #208217 - ps does not accept '+' in sort specifier
+
 * Thu Apr 26 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-9
 - fix #183029 - watch ignores multibyte characters
 - fix #222251 - STIME column can jitter