Author: arekm Date: Thu Sep 15 10:39:47 2011 GMT Module: packages Tag: HEAD ---- Log message: - up to 20110915
---- Files affected: packages/procps: procps-FILLBUG_backport.patch (1.4 -> 1.5) , procps.spec (1.141 -> 1.142) , procps-global.patch (1.3 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/procps/procps-FILLBUG_backport.patch diff -u packages/procps/procps-FILLBUG_backport.patch:1.4 packages/procps/procps-FILLBUG_backport.patch:1.5 --- packages/procps/procps-FILLBUG_backport.patch:1.4 Fri Mar 4 19:52:12 2011 +++ packages/procps/procps-FILLBUG_backport.patch Thu Sep 15 12:39:41 2011 @@ -1,13 +1,12 @@ ---- procps-3.2.2/proc/readproc.h.orig 2004-04-17 02:30:18.000000000 +0200 -+++ procps-3.2.2/proc/readproc.h 2004-07-24 21:24:36.488559056 +0200 -@@ -239,6 +239,9 @@ - #define PROC_FILLARG 0x0100 // alloc and fill in `cmdline' - #define PROC_FILLCGROUP 0x0200 // alloc and fill in `cgroup` +--- procps-procps/proc/readproc.h~ 2011-09-12 14:18:23.000000000 +0200 ++++ procps-procps/proc/readproc.h 2011-09-15 12:38:14.976931632 +0200 +@@ -250,6 +250,9 @@ + // argument is the length of the list (currently only used for lists of user + // id's since uid_t supports no convenient termination sentinel.) +// for compatibility with procps 2.0.7 +#define PROC_FILLBUG 0x007f /* No idea what we need */ + - #define PROC_LOOSE_TASKS 0x2000 // threat threads as if they were processes - - // Obsolete, consider only processes with one of the passed: - + #define PROC_FILLMEM 0x0001 // read statm + #define PROC_FILLCOM 0x0002 // alloc and fill in `cmdline' + #define PROC_FILLENV 0x0004 // alloc and fill in `environ' ================================================================ Index: packages/procps/procps.spec diff -u packages/procps/procps.spec:1.141 packages/procps/procps.spec:1.142 --- packages/procps/procps.spec:1.141 Mon Sep 12 19:10:10 2011 +++ packages/procps/procps.spec Thu Sep 15 12:39:41 2011 @@ -1,6 +1,6 @@ # $Revision$, $Date$ -%define snap 20110715 -%define rel 5 +%define snap 20110915 +%define rel 1 Summary: Utilities for monitoring your system and processes on your system Summary(de.UTF-8): Utilities zum Ueberwachen Ihres Systems und der Prozesse Summary(es.UTF-8): Utilitarios de monitoración de procesos @@ -15,14 +15,13 @@ License: GPL Group: Applications/System Source0: http://gitorious.org/procps/procps/archive-tarball/master#/%{name}-%{snap}.tar.gz -# Source0-md5: 82e2f9d0ee507ad6b43dfe74f40a6a83 +# Source0-md5: ba165eebdbeb4ea2dd43acd0d8d3e696 Source1: http://atos.wmid.amu.edu.pl/~undefine/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: 60d24720b76c10553ed4abf68b76e079 Source2: top.desktop Source3: top.png Source4: XConsole.sh Patch0: %{name}-make.patch -Patch1: %{name}-global.patch Patch2: %{name}-FILLBUG_backport.patch # http://www.nsa.gov/selinux/patches/procps-selinux.patch.gz Patch3: %{name}-selinux.patch @@ -125,7 +124,7 @@ %prep %setup -q -n %{name}-%{name} %patch0 -p1 -%patch1 -p1 + %patch2 -p1 %patch3 -p1 %patch4 -p1 @@ -217,6 +216,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.142 2011/09/15 10:39:41 arekm +- up to 20110915 + Revision 1.141 2011/09/12 17:10:10 lisu - back epoch to 1, rel 5 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/procps/procps-FILLBUG_backport.patch?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/procps/procps.spec?r1=1.141&r2=1.142&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
