packages: psmisc/psmisc-fakerootpid.patch, psmisc/psmisc.spec - rel 4; more...

[arekm]

Author: arekm                        Date: Wed Mar 21 18:38:27 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; more fakerootpid fixes

---- Files affected:
packages/psmisc:
   psmisc-fakerootpid.patch (1.2 -> 1.3) , psmisc.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: packages/psmisc/psmisc-fakerootpid.patch
diff -u packages/psmisc/psmisc-fakerootpid.patch:1.2 packages/psmisc/psmisc-fakerootpid.patch:1.3
--- packages/psmisc/psmisc-fakerootpid.patch:1.2	Wed Mar 21 18:19:27 2012
+++ packages/psmisc/psmisc-fakerootpid.patch	Wed Mar 21 19:38:22 2012
@@ -1,13 +1,12 @@
 diff -urN psmisc-22.16.org/src/pstree.c psmisc-22.16/src/pstree.c
 --- psmisc-22.16.org/src/pstree.c	2012-02-20 00:07:14.000000000 +0100
-+++ psmisc-22.16/src/pstree.c	2012-03-21 18:07:44.000000000 +0100
-@@ -363,12 +363,25 @@
++++ psmisc-22.16/src/pstree.c	2012-03-21 19:37:30.000000000 +0100
+@@ -363,12 +363,27 @@
          ppid = 0;
      if (isthread)
        this->flags |= PFLAG_THREAD;
 -    if (!(parent = find_proc(ppid)))
 +    if (!(parent = find_proc(ppid))) {
-+	PROC *root;
  #ifdef WITH_SELINUX
          parent = new_proc("?", ppid, 0, scontext);
  #else                                /*WITH_SELINUX */
@@ -15,12 +14,15 @@
  #endif                                /*WITH_SELINUX */
 +	/* When using kernel 3.3 with hidepid feature enabled on /proc
 +	 * then we need fake root pid */
-+	if (!(root = find_proc(1))) {
++	if (!isthread && pid != 1) {
++		PROC *root;
++		if (!(root = find_proc(1))) {
 +#ifdef WITH_SELINUX
-+		root = new_proc("?", 1, 0, scontext);
++			root = new_proc("?", 1, 0, scontext);
 +#else                                /*WITH_SELINUX */
-+		root = new_proc("?", 1, 0);
++			root = new_proc("?", 1, 0);
 +#endif
++		}
 +		add_child(root, parent);
 +		parent->parent = root;
 +	}

================================================================
Index: packages/psmisc/psmisc.spec
diff -u packages/psmisc/psmisc.spec:1.110 packages/psmisc/psmisc.spec:1.111
--- packages/psmisc/psmisc.spec:1.110	Wed Mar 21 18:19:27 2012
+++ packages/psmisc/psmisc.spec	Wed Mar 21 19:38:22 2012
@@ -15,7 +15,7 @@
 Summary(uk.UTF-8):	Утиліти роботи з процесами
 Name:		psmisc
 Version:	22.16
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://downloads.sourceforge.net/psmisc/%{name}-%{version}.tar.gz
@@ -149,6 +149,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2012/03/21 18:38:22  arekm
+- rel 4; more fakerootpid fixes
+
 Revision 1.110  2012/03/21 17:19:27  arekm
 - rel 3; small fix to fakerootpid patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/psmisc/psmisc-fakerootpid.patch?r1=1.2&r2=1.3
    http://cvs.pld-linux.org/packages/psmisc/psmisc.spec?r1=1.110&r2=1.111