- rel 4; more fakerootpid fixes

Changed files:
    psmisc-fakerootpid.patch -> 1.3
    psmisc.spec -> 1.111

diff --git a/psmisc-fakerootpid.patch b/psmisc-fakerootpid.patch
index 4743ae8a6e434db611049456d08529104732e81e..02a8ecd092d5b133b254074d97a0cab92f130857 100644 (file)
--- a/psmisc-fakerootpid.patch
+++ b/psmisc-fakerootpid.patch
@@ -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 @@ diff -urN psmisc-22.16.org/src/pstree.c psmisc-22.16/src/pstree.c
  #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;
 +      }

diff --git a/psmisc.spec b/psmisc.spec
index 49bd25f00a8f1e34ab7b6bc47e1006a550ad3e8a..f1d67256ebfe9d2ccfdd3c93f0f42c6399737214 100644 (file)
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -14,7 +14,7 @@ Summary(tr.UTF-8):    /proc dosya sistemi için ps tipi araçlar
 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